diff --git a/lilo b/lilo
index 88130d9a..3c9a3b98 100755
--- a/lilo
+++ b/lilo
@@ -333,68 +333,49 @@ choose_aurhelper(){
   print_title "AUR HELPER - https://wiki.archlinux.org/index.php/AUR_Helpers"
   print_info "AUR Helpers are written to make using the Arch User Repository more comfortable."
   print_warning "\tNone of these tools are officially supported by Arch devs."
-  aurhelper=("yaourt" "apacman" "pacaur" "trizen")
+  aurhelper=("aurutils" "trizen" "yay")
   PS3="$prompt1"
   echo -e "Choose your default AUR helper to install\n"
   select OPT in "${aurhelper[@]}"; do
     case "$REPLY" in
       1)
-        print_title "YAOURT - https://wiki.archlinux.org/index.php/Yaourt"
-        print_info "Yaourt (Yet AnOther User Repository Tool) is a community-contributed wrapper for pacman which adds seamless access to the AUR, allowing and automating package compilation and installation from your choice of the thousands of PKGBUILDs in the AUR, in addition to the many thousands of available Arch Linux binary packages."
-        if ! is_package_installed "yaourt" ; then
-          package_install "base-devel yajl namcap"
-          pacman -D --asdeps yajl namcap
-          aui_download_packages "package-query yaourt"
-          pacman -D --asdeps package-query
-          if ! is_package_installed "yaourt" ; then
-            echo "Yaourt not installed. EXIT now"
+        if ! is_package_installed "aurutils" ; then
+          package_install "base-devel git jq pacutils"
+          pacman -D --asdeps jq pacutils
+	        aui_download_packages "aurutils"
+          if ! is_package_installed "aurutils" ; then
+            echo "aurutils not installed. EXIT now"
             pause_function
             exit 0
           fi
         fi
-        AUR_PKG_MANAGER="yaourt --tmp /var/tmp/"
+        AUR_PKG_MANAGER="aurutils"
         ;;
       2)
-        if ! is_package_installed "apacman" ; then
-          package_install "base-devel git jshon"
-          pacman -D --asdeps jshon
-          aui_download_packages "apacman"
-          if ! is_package_installed "apacman" ; then
-            echo "Apacman not installed. EXIT now"
+        if ! is_package_installed "trizen" ; then
+          package_install "base-devel git perl"
+          pacman -D --asdeps perl
+	        aui_download_packages "trizen"
+          if ! is_package_installed "trizen" ; then
+            echo "trizen not installed. EXIT now"
             pause_function
             exit 0
           fi
         fi
-        AUR_PKG_MANAGER="apacman"
+        AUR_PKG_MANAGER="trizen"
         ;;
       3)
-        if ! is_package_installed "pacaur" ; then
-          package_install "base-devel yajl expac"
-          pacman -D --asdeps yajl expac
-          add_key_user "hkp://pgp.mit.edu 1EB2638FF56C0C53"
-	  aui_download_packages "cower pacaur"
-          pacman -D --asdeps cower
-          if ! is_package_installed "pacaur" ; then
-            echo "Pacaur not installed. EXIT now"
+        if ! is_package_installed "yay" ; then
+          package_install "base-devel git go"
+          pacman -D --asdeps go
+          aui_download_packages "yay"
+          if ! is_package_installed "yay" ; then
+            echo "yay not installed. EXIT now"
             pause_function
             exit 0
           fi
         fi
-        AUR_PKG_MANAGER="pacaur"
-        ;;
-      4)
-        if ! is_package_installed "trizen" ; then
-          package_install "base-devel git perl"
-          pacman -D --asdeps git perl
-	  aui_download_packages "trizen"
-          pacman -D --asdeps trizen
-          if ! is_package_installed "trizen" ; then
-            echo "trizen not installed. EXIT now"
-            pause_function
-            exit 0
-          fi
-        fi
-        AUR_PKG_MANAGER="trizen"
+        AUR_PKG_MANAGER="yay"
         ;;
       *)
         invalid_option
@@ -476,6 +457,10 @@ install_basic_setup(){
   print_info "A file system (or filesystem) is a means to organize data expected to be retained after a program terminates by providing procedures to store, retrieve and update data, as well as manage the available space on the device(s) which contain it. A file system organizes data in an efficient manner and is tuned to the specific characteristics of the device."
   package_install "ntfs-3g dosfstools exfat-utils f2fs-tools fuse fuse-exfat autofs mtpfs"
   pause_function
+  print_title "SYSTEMD-TIMESYNCD - https://wiki.archlinux.org/index.php/Systemd-timesyncd"
+  print_info "A file system (or filesystem) is a means to organize data expected to be retained after a program terminates by providing procedures to store, retrieve and update data, as well as manage the available space on the device(s) which contain it. A file system organizes data in an efficient manner and is tuned to the specific characteristics of the device."
+  timedatectl set-ntp true
+  pause_function
 }
 #}}}
 #SSH {{{
@@ -681,7 +666,6 @@ install_video_cards(){
     fi
     add_module "vboxguest vboxsf vboxvideo" "virtualbox-guest"
     add_user_to_group ${username} vboxsf
-    system_ctl disable ntpd
     system_ctl enable vboxservice
     create_ramdisk_environment
   #}}}
@@ -694,7 +678,6 @@ install_video_cards(){
       package_install "open-vm-tools"
     fi
     cat /proc/version > /etc/arch-release
-    system_ctl disable ntpd
     system_ctl enable vmtoolsd
     create_ramdisk_environment
   #}}}
@@ -737,16 +720,18 @@ install_video_cards(){
   #}}}
   #ATI {{{
   elif [[ ${VIDEO_DRIVER} == ati ]]; then
-    is_package_installed "catalyst-total" && pacman -Rdds --noconfirm catalyst-total
     [[ -f /etc/X11/xorg.conf.d/20-radeon.conf ]] && rm /etc/X11/xorg.conf.d/20-radeon.conf
-    [[ -f /etc/modules-load.d/catalyst.conf ]] && rm /etc/modules-load.d/catalyst.conf
     [[ -f /etc/X11/xorg.conf ]] && rm /etc/X11/xorg.conf
-    if [ "$(ls /boot | grep hardened -c)" -gt "0" ] || [ "$(ls /boot | grep lts -c)" -gt "0" ]; then
-      aur_package_install "catalyst-total"
-     else
-       package_install "xf86-video-${VIDEO_DRIVER} mesa-libgl mesa-vdpau libvdpau-va-gl"
-      add_module "radeon" "ati"
-    fi
+    package_install "xf86-video-${VIDEO_DRIVER} mesa-libgl mesa-vdpau libvdpau-va-gl"
+    add_module "radeon" "ati"
+    create_ramdisk_environment
+  #}}}
+  #AMDGPU {{{
+  elif [[ ${VIDEO_DRIVER} == amdgpu ]]; then
+    [[ -f /etc/X11/xorg.conf.d/20-radeon.conf ]] && rm /etc/X11/xorg.conf.d/20-radeon.conf
+    [[ -f /etc/X11/xorg.conf ]] && rm /etc/X11/xorg.conf
+    package_install "xf86-video-${VIDEO_DRIVER} vulkan-radeon mesa-libgl mesa-vdpau libvdpau-va-gl"
+    add_module "amdgpu radeon" "ati"
     create_ramdisk_environment
   #}}}
   #Intel {{{
@@ -774,8 +759,8 @@ install_cups(){
   print_info "CUPS is the standards-based, open source printing system developed by Apple Inc. for Mac OS X and other UNIX-like operating systems."
   read_input_text "Install CUPS (aka Common Unix Printing System)" $CUPS
   if [[ $OPTION == y ]]; then
-    package_install "cups cups-filters ghostscript gsfonts"
-    package_install "gutenprint foomatic-db foomatic-db-engine foomatic-db-nonfree foomatic-db-ppds foomatic-db-nonfree-ppds hplip splix cups-pdf foomatic-db-gutenprint-ppds"
+    package_install "cups cups-pdf"
+    package_install "gutenprint ghostscript gsfonts foomatic-db foomatic-db-engine foomatic-db-nonfree foomatic-db-ppds foomatic-db-nonfree-ppds foomatic-db-gutenprint-ppds"
     system_ctl enable org.cups.cupsd.service
     pause_function
   fi
@@ -1123,7 +1108,7 @@ install_desktop_environment(){
       #}}}
     2)
       #DEEPIN {{{
-      print_title "DEEPIN - http://www.linuxdeepin.com"
+      print_title "DEEPIN - https://wiki.archlinux.org/index.php/Deepin_Desktop_Environment"
       print_info "The desktop interface and apps feature an intuitive and elegant design. Moving around, sharing and searching etc. has become simply a joyful experience."
       package_install "deepin deepin-extra lightdm-gtk-greeter"
       # config xinitrc
@@ -1231,7 +1216,7 @@ install_desktop_environment(){
       #LXQT {{{
       print_title "LXQT - http://wiki.archlinux.org/index.php/lxqt"
       print_info "LXQt is the Qt port and the upcoming version of LXDE, the Lightweight Desktop Environment. It is the product of the merge between the LXDE-Qt and the Razor-qt projects: A lightweight, modular, blazing-fast and user-friendly desktop environment."
-      package_install "lxqt openbox oxygen-icons qtcurve"
+      package_install "lxqt openbox breeze-icons"
       package_install "leafpad epdfview"
       mkdir -p /home/${username}/.config/lxqt
       cp /etc/xdg/lxqt/* /home/${username}/.config/lxqt
@@ -1419,11 +1404,6 @@ install_nm_wicd(){
       fi
       # vpn support
       package_install "networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc"
-      # auto update datetime from network
-      if is_package_installed "ntp"; then
-        package_install "networkmanager-dispatcher-ntpd"
-        system_ctl enable NetworkManager-dispatcher.service
-      fi
       # power manager support
       is_package_installed "tlp" && package_install "tlp-rdw"
       # network management daemon
@@ -1477,18 +1457,16 @@ install_accessories_apps(){
   while true
   do
     print_title "ACCESSORIES APPS"
-    echo " 1) $(menu_item "catfish")"
-    echo " 2) $(menu_item "conky-lua") $AUR"
-    echo " 3) $(menu_item "docky") $AUR"
-    echo " 4) $(menu_item "galculator") $AUR"
-    echo " 5) $(menu_item "pamac-aur" "Pamac") $AUR"
-    echo " 6) $(menu_item "pyrenamer") $AUR"
-    echo " 7) $(menu_item "enpass-bin") $AUR"
-    echo " 8) $(menu_item "shutter hotshots" "$([[ ${KDE} -eq 1 ]] && echo "Hotshots" || echo "Shutter";)")"
-    echo " 9) $(menu_item "synapse")"
+    echo " 1) $(menu_item "albert")"
+    echo " 2) $(menu_item "catfish")"
+    echo " 3) $(menu_item "conky-lua") $AUR"
+    echo " 4) $(menu_item "enpass-bin") $AUR"
+    echo " 5) $(menu_item "keepass")"
+    echo " 6) $(menu_item "pamac-aur" "Pamac") $AUR"
+    echo " 7) $(menu_item "shutter hotshots" "$([[ ${KDE} -eq 1 ]] && echo "Hotshots" || echo "Shutter";)")"
+    echo " 8) $(menu_item "synapse")"
+    echo " 9) $(menu_item "terminator")"
     echo "10) $(menu_item "tilix-bin") $AUR"
-    echo "11) $(menu_item "terminator")"
-    echo "12) $(menu_item "unified-remote-server" "Unified Remote")"
     echo ""
     echo " b) BACK"
     echo ""
@@ -1497,48 +1475,40 @@ install_accessories_apps(){
     for OPT in ${OPTIONS[@]}; do
       case "$OPT" in
         1)
-          package_install "catfish"
+          package_install "albert"
           ;;
         2)
+          package_install "catfish"
+          ;;
+        3)
           aur_package_install "conky-lua"
           package_install "lm_sensors"
           sensors-detect --auto
           ;;
-        3)
-          package_install "docky"
-          aur_package_install "dockmanager"
-          ;;
         4)
-          package_install "galculator"
+          aur_package_install "enpass-bin"
           ;;
         5)
-          aur_package_install "pamac-aur"
+          package_install "keepass"
           ;;
         6)
-          aur_package_install "pyrenamer"
+          aur_package_install "pamac-aur"
           ;;
         7)
-          aur_package_install "enpass-bin"
-          ;;
-        8)
           if [[ ${KDE} -eq 1 ]]; then
             aur_package_install "hotshots"
           else
             aur_package_install "shutter"
           fi
           ;;
-        9)
+        8)
           package_install "synapse"
           ;;
-        10)
-          aur_package_install "tilix-bin"
-          ;;
-        11)
+        9)
           package_install "terminator"
           ;;
-        12)
-          aur_package_install "unified-remote-server"
-          system_ctl enable urserver
+        10)
+          aur_package_install "tilix-bin"
           ;;
         "b")
           break
@@ -1562,11 +1532,11 @@ install_development_apps(){
     echo " 3) $(menu_item "gvim")"
     echo " 4) $(menu_item "meld")"
     echo " 5) $(menu_item "sublime-text2" "Sublime Text 2") $AUR"
-    echo " 6) $(menu_item "sublime-text-dev" "Sublime Text Dev") $AUR"
-    echo " 7) $(menu_item "android-studio" "Android Studio")"
+    echo " 6) $(menu_item "sublime-text-dev" "Sublime Text 3") $AUR"
+    echo " 7) $(menu_item "android-studio" "Android Studio") $AUR"
     echo " 8) $(menu_item "jetbrains-toolbox" "Jetbrains Toolbox") $AUR"
     echo " 9) $(menu_item "intellij-idea-community-edition" "IntelliJ IDEA Community Edition")"
-    echo "10) $(menu_item "intellij-idea-ultimate-edition" "IntelliJ IDEA Ultimate Edition (Commercial)")"
+    echo "10) $(menu_item "intellij-idea-ultimate-edition" "IntelliJ IDEA Ultimate Edition") $AUR"
     echo "11) $(menu_item "monodevelop")"
     echo "12) $(menu_item "qtcreator")"
     echo "13) $(menu_item "mysql-workbench" "MySQL Workbench") $AUR"
@@ -1575,10 +1545,10 @@ install_development_apps(){
     echo "16) $(menu_item "jdk10-openjdk" "OpenJDK 10")"
     echo "17) $(menu_item "jdk" "Oracle JDK") $AUR"
     echo "18) $(menu_item "nodejs")"
-    echo "19) $(menu_item "visual-studio-code-bin") $AUR"
-    echo "20) $(menu_item "gitg" "Git GUI-s")"
-    echo "21) $(menu_item "kdiff3" "Visual diff tools")"
-    echo "22) $(menu_item "regexxer" "regexxer - Find and replace GUI tools")"
+    echo "19) $(menu_item "visual-studio-code-bin" "Visual Studio Code") $AUR"
+    echo "20) $(menu_item "gitg")"
+    echo "21) $(menu_item "kdiff3")"
+    echo "22) $(menu_item "regexxer")"
     echo "23) $(menu_item "postman-bin" "Postman") $AUR"
     echo "24) $(menu_item "gitkraken" "Gitkraken") $AUR"
     echo ""
@@ -1622,7 +1592,7 @@ install_development_apps(){
           package_install "intellij-idea-community-edition"
           ;;
         10)
-          package_install "intellij-idea-ultimate-edition"
+          aur_package_install "intellij-idea-ultimate-edition"
           ;;
         11)
           package_install "monodevelop monodevelop-debugger-gdb"
@@ -1691,23 +1661,22 @@ install_office_apps(){
     print_title "OFFICE APPS"
     echo " 1) $(menu_item "goffice calligra-libs" "$([[ ${KDE} -eq 1 ]] && echo "Caligra" || echo "Abiword + Gnumeric";)")"
     echo " 2) $(menu_item "calibre")"
-    echo " 3) $(menu_item "gcstar")"
-    echo " 4) $(menu_item "geeknote-git") $AUR"
-    echo " 5) $(menu_item "haroopad") $AUR"
-    echo " 6) $(menu_item "homebank")"
-    echo " 7) $(menu_item "impressive")"
-    echo " 8) $(menu_item "texlive-core" "latex")"
-    echo " 9) $(menu_item "libreoffice-fresh" "LibreOffice")"
-    echo "10) $(menu_item "ocrfeeder")"
+    echo " 3) $(menu_item "goldendict")"
+    echo " 4) $(menu_item "homebank")"
+    echo " 5) $(menu_item "texlive-core" "latex")"
+    echo " 6) $(menu_item "libreoffice-fresh" "LibreOffice")"
+    echo " 7) $(menu_item "lyx")"
+    echo " 8) $(menu_item "ocrfeeder")"
+    echo " 9) $(menu_item "tellico")"
+    echo "10) $(menu_item "typora")"
     echo "11) $(menu_item "xmind")"
-    echo "12) $(menu_item "goldendict")"
     echo ""
     echo " b) BACK"
     echo ""
     OFFICE_OPTIONS+=" b"
     read_input_options "$OFFICE_OPTIONS"
     for OPT in ${OPTIONS[@]}; do
-      case "$OPT" in
+      case "$OPT" in      
         1)
           if [[ ${KDE} -eq 1 ]]; then
             package_install "calligra"
@@ -1721,46 +1690,40 @@ install_office_apps(){
           package_install "calibre"
           ;;
         3)
-          package_install "gcstar"
+          package_install "goldendict"
           ;;
         4)
-          aur_package_install "geeknote-git"
-          ;;
-        5)
-          aur_package_install "haroopad"
-          ;;
-        6)
           package_install "homebank"
           ;;
-        7)
-          package_install "impressive"
-          ;;
-        8)
+        5)
           package_install "texlive-most"
           if [[ $LOCALE == pt_BR ]]; then
             aur_package_install "abntex"
           fi
-          if [[ ${KDE} -eq 0 ]]; then
-            package_install "gummi"
-          fi
           ;;
-        9)
+        6)
           print_title "LIBREOFFICE - https://wiki.archlinux.org/index.php/LibreOffice"
           package_install "libreoffice-fresh"
           [[ $LOCALE != en_US ]] && package_install "libreoffice-fresh-$LOCALE_LO"
           package_install "hunspell hunspell-$LOCALE_HS"
           package_install "aspell aspell-$LOCALE_AS"
           ;;
-        10)
+        7)
+          package_install "lyx"
+          ;;
+        8)
           package_install "ocrfeeder tesseract gocr"
           package_install "aspell aspell-$LOCALE_AS"
           ;;
+        9)
+          package_install "tellico"
+          ;;
+        10)
+          package_install "typora"
+          ;;
         11)
           package_install "xmind"
           ;;
-        12)
-          package_install "goldendict"
-          ;;
         "b")
           break
           ;;
@@ -1778,24 +1741,21 @@ install_system_apps(){
   while true
   do
     print_title "SYSTEM TOOLS APPS"
-    echo " 1) $(menu_item "clamav" "clamav antivirus")"
-    echo " 2) $(menu_item "cockpit" "cockpit- A web system administration tool") $AUR"
-    echo " 3) $(menu_item "webmin" "webmin- A web system administration tool") $AUR"
+    echo " 1) $(menu_item "clamav" "Clamav Antivirus")"
+    echo " 2) $(menu_item "cockpit") $AUR"
+    echo " 3) $(menu_item "webmin") $AUR"
     echo " 4) $(menu_item "docker")"
     echo " 5) $(menu_item "firewalld")"
     echo " 6) $(menu_item "gparted")"
-    echo " 7) $(menu_item "grsync" "grsync- Sync files")"
-    echo " 8) $(menu_item "hosts-update" "hosts-update Injects the mvps blocklist to /etc/hosts to prevent thousands of parasites, hijackers and unwanted adware/spyware/privacy websites from working.") $AUR"
-    echo " 9) $(menu_item "htop" "htop- Interactive text-mode process viewer")"
-    echo "10) $(menu_item "plex-media-server" "Plex") $AUR"
-    echo "11) $(menu_item "ufw") $AUR"
-    echo "12) $(menu_item "unified-remote-server" "Unified Remote") $AUR"
-    echo "13) $(menu_item "virtualbox")"
-    echo "14) $(menu_item "wine")"
-    echo "15) $(menu_item "netdata")"
-    echo "16) $(menu_item "nload")"
-    echo "17) $(menu_item "gnome-logs" "Assorted Graphical log viewers")"
-    echo "18) $(menu_item "seahorse" "seahorse Password keyring management GUI")"
+    echo " 7) $(menu_item "grsync")"
+    echo " 8) $(menu_item "hosts-update") $AUR"
+    echo " 9) $(menu_item "htop")"
+    echo "10) $(menu_item "ufw") $AUR"
+    echo "11) $(menu_item "unified-remote-server" "Unified Remote") $AUR"
+    echo "12) $(menu_item "virtualbox")"
+    echo "13) $(menu_item "wine")"
+    echo "14) $(menu_item "netdata")"
+    echo "15) $(menu_item "nload")"
     echo ""
     echo " b) BACK"
     echo ""
@@ -1842,21 +1802,17 @@ install_system_apps(){
           package_install "htop"
           ;;
         10)
-          aur_package_install "plex-media-server"
-          system_ctl enable plexmediaserver.service
-          ;;
-        11)
           print_title "UFW - https://wiki.archlinux.org/index.php/Ufw"
           print_info "Ufw stands for Uncomplicated Firewall, and is a program for managing a netfilter firewall. It provides a command line interface and aims to be uncomplicated and easy to use."
           is_package_installed "firewalld" && package_remove "firewalld"
           aur_package_install "ufw gufw"
           system_ctl enable ufw.service
           ;;
-        12)
+        11)
           aur_package_install "unified-remote-server"
           system_ctl enable urserver.service
           ;;
-        13)
+        12)
           #Make sure we are not a VirtualBox Guest
           VIRTUALBOX_GUEST=`dmidecode --type 1 | grep VirtualBox`
           if [[ -z ${VIRTUALBOX_GUEST} ]]; then
@@ -1868,24 +1824,16 @@ install_system_apps(){
             cecho "${BBlue}[${Reset}${Bold}!${BBlue}]${Reset} VirtualBox was not installed as we are a VirtualBox guest."
           fi
           ;;
-        14)
+        13)
           package_install "icoutils wine wine_gecko wine-mono winetricks"
           ;;
-        15)
+        14)
           package_install "netdata"
           system_ctl enable netdata.service
           ;;
-        16)
+        15)
           package_install "nload"
           ;;
-        17)
-          package_install "gnome-logs"
-          package_install "qjournalctl"
-          package_install "pacmanlogviewer"
-          ;;
-        18)
-          package_install "seahorse"
-          ;;
         "b")
           break
           ;;
@@ -1913,6 +1861,7 @@ install_graphics_apps(){
     echo " 8) $(menu_item "scribus")"
     echo " 9) $(menu_item "shotwell")"
     echo "10) $(menu_item "simple-scan")"
+    echo "11) $(menu_item "yacreader")"
     echo ""
     echo " b) BACK"
     echo ""
@@ -1950,6 +1899,9 @@ install_graphics_apps(){
         10)
           package_install "simple-scan"
           ;;
+        11)
+          package_install "yacreader"
+          ;;
         "b")
           break
           ;;
@@ -2042,20 +1994,19 @@ install_internet_apps(){
           while true
           do
             print_title "DOWNLOAD|FILESHARE"
-            echo " 1) $(menu_item "aerofs") $AUR"
-            echo " 2) $(menu_item "rslsync" "Resilio Sync") $AUR"
-            echo " 3) $(menu_item "deluge")"
-            echo " 4) $(menu_item "dropbox") $AUR"
-            echo " 5) $(menu_item "flareget") $AUR"
-            echo " 6) $(menu_item "jdownloader") $AUR"
-            echo " 7) $(menu_item "qbittorrent")"
+            echo " 1) $(menu_item "deluge")"
+            echo " 2) $(menu_item "dropbox") $AUR"
+            echo " 3) $(menu_item "flareget") $AUR"
+    	      echo " 4) $(menu_item "google-drive-ocamlfuse", "Google Drive OCamlFuse") $AUR"           
+            echo " 5) $(menu_item "jdownloader") $AUR"
+            echo " 6) $(menu_item "qbittorrent")"
+            echo " 7) $(menu_item "rslsync" "Resilio Sync") $AUR"           
             echo " 8) $(menu_item "sparkleshare")"
-            echo " 9) $(menu_item "spideroak") $AUR"
-            echo "10) $(menu_item "transmission-qt transmission-gtk" "Transmission")"
-            echo "11) $(menu_item "uget")"
-            echo "12) $(menu_item "youtube-dl")"
-    	    echo "13) $(menu_item "tixati" "tixati p2p bittorrent client") $AUR"
-    	    echo "14) $(menu_item "google-drive-ocamlfuse" "google-drive-ocamlfuse") $AUR"
+            echo " 9) $(menu_item "spideroak-one") $AUR"
+    	      echo "10) $(menu_item "tixati") $AUR"
+            echo "11) $(menu_item "transmission-qt transmission-gtk" "Transmission")"
+            echo "12) $(menu_item "uget")"
+            echo "13) $(menu_item "youtube-dl")"
             echo ""
             echo " b) BACK"
             echo ""
@@ -2064,26 +2015,26 @@ install_internet_apps(){
             for OPT in ${OPTIONS[@]}; do
               case "$OPT" in
                 1)
-                  aur_package_install "aerofs"
+                  package_install "deluge"
                   ;;
                 2)
-                  aur_package_install "rslsync"
+                  aur_package_install "dropbox"
                   ;;
                 3)
-                  package_install "deluge"
+                  aur_package_install "flareget"
                   ;;
                 4)
-                  aur_package_install "dropbox"
+                  aur_package_install "google-drive-ocamlfuse"
                   ;;
                 5)
-                  aur_package_install "flareget"
-                  ;;
-                6)
                   aur_package_install "jdownloader"
                   ;;
-                7)
+                6)
                   package_install "qbittorrent"
                   ;;
+                7)
+                  aur_package_install "rslsync"
+                  ;;                  
                 8)
                   package_install "sparkleshare"
                   ;;
@@ -2091,6 +2042,9 @@ install_internet_apps(){
                   aur_package_install "spideroak"
                   ;;
                 10)
+                  aur_package_install "tixati"
+                  ;;
+                11)
                   if [[ ${KDE} -eq 1 ]]; then
                     package_install "transmission-qt"
                   else
@@ -2101,17 +2055,11 @@ install_internet_apps(){
                     replace_line "www\.example\.com\/blocklist" "list\.iblocklist\.com\/\?list=bt_level1&fileformat=p2p&archiveformat=gz" /home/${username}/.config/transmission/settings.json
                   fi
                   ;;
-                11)
-                  package_install "uget"
-                  ;;
                 12)
-                  package_install "youtube-dl"
+                  package_install "uget"
                   ;;
                 13)
-                  aur_package_install "tixati"
-                  ;;
-                14)
-                  aur_package_install "google-drive-ocamlfuse"
+                  package_install "youtube-dl"
                   ;;
                 "b")
                   break
@@ -2239,7 +2187,7 @@ install_internet_apps(){
           do
             print_title "MAPPING TOOLS"
             echo " 1) $(menu_item "google-earth") $AUR"
-            echo " 2) $(menu_item "worldwind" "NASA World Wind") $AUR"
+            echo " 2) $(menu_item "qgis" "QGIS") $AUR"
             echo ""
             echo " b) BACK"
             echo ""
@@ -2251,7 +2199,7 @@ install_internet_apps(){
                   aur_package_install "google-earth"
                   ;;
                 2)
-                  aur_package_install "worldwind"
+                  aur_package_install "qgis"
                   ;;
                 "b")
                   break
@@ -2333,19 +2281,15 @@ install_audio_apps(){
             print_title "AUDIO PLAYERS"
             echo " 1) $(menu_item "amarok")"
             echo " 2) $(menu_item "audacious")"
-            echo " 3) $(menu_item "banshee") $AUR"
-            echo " 4) $(menu_item "clementine")"
-            echo " 5) $(menu_item "deadbeef")"
-            echo " 6) $(menu_item "guayadeque") $AUR"
-            echo " 7) $(menu_item "musique") $AUR"
-            echo " 8) $(menu_item "nuvolaplayer-git") $AUR"
-            echo " 9) $(menu_item "pragha")"
-            echo "10) $(menu_item "radiotray") $AUR"
-            echo "11) $(menu_item "rhythmbox")"
-            echo "12) $(menu_item "spotify") $AUR"
-            echo "13) $(menu_item "timidity++") $AUR"
-            echo "14) $(menu_item "tomahawk") $AUR"
-            echo "15) $(menu_item "quodlibet")"
+            echo " 3) $(menu_item "clementine")"
+            echo " 4) $(menu_item "deadbeef")"
+            echo " 5) $(menu_item "guayadeque") $AUR"
+            echo " 6) $(menu_item "musique") $AUR"
+            echo " 7) $(menu_item "pragha")"
+            echo " 8) $(menu_item "rhythmbox")"
+            echo " 9) $(menu_item "spotify") $AUR"
+            echo "10) $(menu_item "timidity++") $AUR"
+            echo "11) $(menu_item "quodlibet")"
             echo ""
             echo " b) BACK"
             echo ""
@@ -2360,46 +2304,31 @@ install_audio_apps(){
                   package_install "audacious audacious-plugins"
                   ;;
                 3)
-                  aur_package_install "banshee"
-                  ;;
-                4)
                   package_install "clementine"
                   ;;
-                5)
+                4)
                   package_install "deadbeef"
                   ;;
-                6)
+                5)
                   aur_package_install "guayadeque"
                   ;;
-                7)
+                6)
                   aur_package_install "musique"
                   ;;
-                8)
-                  aur_package_install "nuvolaplayer-git"
-                  ;;
-                9)
+                7)
                   package_install "pragha"
                   ;;
-                10)
-                  aur_package_install "radiotray"
-                  ;;
-                11)
+                8)
                   package_install "rhythmbox grilo grilo-plugins libgpod libdmapsharing gnome-python python-mako"
-                  #aur_package_install "pywebkitgtk"
-                  # pywebkitgtk compile needed and take alot of time around 4-5H on i5-8gigram-ssd hdd
-                  # + only need when Cannot activate "context pane" plugin
                   ;;
-                12)
+                9)
                   aur_package_install "spotify"
                   ;;
-                13)
+                10)
                   aur_package_install "timidity++ fluidr3"
                   echo -e 'soundfont /usr/share/soundfonts/fluidr3/FluidR3GM.SF2' >> /etc/timidity++/timidity.cfg
                   ;;
-                14)
-                  aur_package_install "tomahawk"
-                  ;;
-                15)
+                11)
                   package_install "quodlibet"
                   ;;
                 "b")
@@ -2504,13 +2433,12 @@ install_video_apps(){
             echo " 1) $(menu_item "gnome-mplayer")"
             echo " 2) $(menu_item "livestreamer")"
             echo " 3) $(menu_item "minitube")"
-            echo " 4) $(menu_item "miro") $AUR"
-            echo " 5) $(menu_item "mpv")"
-            echo " 6) $(menu_item "parole")"
+            echo " 4) $(menu_item "mpv")"
+            echo " 5) $(menu_item "parole")"
+            echo " 6) $(menu_item "plex-media-server" "Plex") $AUR"
             echo " 7) $(menu_item "popcorntime-ce") $AUR"
             echo " 8) $(menu_item "vlc")"
             echo " 9) $(menu_item "kodi")"
-            echo "10) $(menu_item "obs-studio")"
             echo ""
             echo " b) BACK"
             echo ""
@@ -2528,13 +2456,14 @@ install_video_apps(){
                   package_install "minitube"
                   ;;
                 4)
-                  aur_package_install "miro"
+                  package_install "mpv"
                   ;;
                 5)
-                  package_install "mpv"
+                  package_install "parole"
                   ;;
                 6)
-                  package_install "parole"
+                  aur_package_install "plex-media-server"
+                  system_ctl enable plexmediaserver.service
                   ;;
                 7)
                   aur_package_install "popcorntime-ce"
@@ -2547,9 +2476,6 @@ install_video_apps(){
                   package_install "kodi"
                   add_user_to_group ${username} kodi
                   ;;
-                10)
-                  package_install "obs-studio-git"
-                  ;;
                 "b")
                   break
                   ;;
@@ -2572,12 +2498,11 @@ install_video_apps(){
             echo " 2) $(menu_item "avidemux-gtk avidemux-qt" "Avidemux")"
             echo " 3) $(menu_item "filebot") $AUR"
             echo " 4) $(menu_item "handbrake")"
-            echo " 5) $(menu_item "kazam") $AUR"
-            echo " 6) $(menu_item "kdenlive")"
-            echo " 7) $(menu_item "lwks" "Lightworks") $AUR"
-            echo " 8) $(menu_item "openshot")"
-            echo " 9) $(menu_item "pitivi")"
-            echo "10) $(menu_item "transmageddon")"
+            echo " 5) $(menu_item "kdenlive")"
+            echo " 6) $(menu_item "lwks" "Lightworks") $AUR"
+            echo " 7) $(menu_item "openshot")"
+            echo " 8) $(menu_item "pitivi")"
+            echo " 9) $(menu_item "transmageddon")"
             echo ""
             echo " b) BACK"
             echo ""
@@ -2602,21 +2527,18 @@ install_video_apps(){
                   package_install "handbrake"
                   ;;
                 5)
-                  aur_package_install "kazam"
-                  ;;
-                6)
                   package_install "kdenlive"
                   ;;
-                7)
+                6)
                   aur_package_install "lwks"
                   ;;
-                8)
+                7)
                   package_install "openshot"
                   ;;
-                9)
+                8)
                   package_install "pitivi frei0r-plugins"
                   ;;
-                10)
+                9)
                   package_install "transmageddon"
                   ;;
                 "b")
@@ -2989,8 +2911,7 @@ install_extra(){
   while true
   do
     print_title "EXTRA"
-    echo " 1) Global Menu $AUR"
-    echo " 2) $(menu_item "profile-sync-daemon") $AUR"
+    echo " 1) $(menu_item "profile-sync-daemon") $AUR"
     echo ""
     echo " b) BACK"
     echo ""
@@ -2999,18 +2920,6 @@ install_extra(){
     for OPT in ${OPTIONS[@]}; do
       case "$OPT" in
         1)
-          aur_package_install "gtk2-appmenu gtk3-appmenu"
-          if [[ ${KDE} -eq 1 ]]; then
-            aur_package_install "appmenu-qt appmenu-gtk"
-            aur_package_install "kdeplasma-applets-menubar"
-          fi
-          if [[ ! -f /home/${username}/.config/gtk-3.0/settings.ini ]]; then
-            run_as_user "echo -e \"[Settings]\ngtk-shell-shows-menubar = 1\" > /home/${username}/.config/gtk-3.0/settings.ini"
-          else
-            add_line "gtk-shell-shows-menubar = 1" "/home/${username}/.config/gtk-3.0/settings.ini"
-          fi
-          ;;
-        2)
           aur_package_install "profile-sync-daemon"
           run_as_user "psd"
           run_as_user "$EDITOR /home/${username}/.config/psd/psd.conf"
diff --git a/lilo.automode b/lilo.automode
index 72e0d7fe..00b912e3 100755
--- a/lilo.automode
+++ b/lilo.automode
@@ -44,9 +44,9 @@
   SSH="y"
   TLP="n"                # Laptop Power Manager
   ZRAM="y"
-  ZSH="y"
-  OH_MY_ZSH="y"
-  PROPRIETARY_DRIVER="n" # Proprietary (NVIDIA) driver
+  ZSH="n"
+  OH_MY_ZSH="n"
+  BETTER_VIDEO_DRIVER="n" # NVIDIA/AMDGPU
   FONTCONFIG="y"
   #}}}
   #ADDITIONAL FIRMWARE {{{
@@ -139,15 +139,14 @@
   # 1) Albert
   # 2) Catfish
   # 3) Conky
-  # 4) Docky
-  # 5) Galculator
+  # 4) Enpass
+  # 5) keepass
   # 6) Pamac
-  # 7) Pyrenamer
-  # 8) Enpass
-  # 9) Shutter|Hotshots
+  # 7) Shutter|Hotshots
+  # 8) Synapse
+  # 9) Terminator
   #10) Tilix
-  #11) Terminator
-  ACCESSORIES_OPTIONS="10"
+  ACCESSORIES_OPTIONS="4 10"
 #}}}
 #DEVELOPEMENT {{{
   # 1) Atom
@@ -170,8 +169,8 @@
   #18) NodeJS
   #19) Microsoft Visual Studio Code
   #20) Git GUI-s
-  #21) Diff GUI-s like kdiff3
-  #22) Search/ replace tools: regexxer
+  #21) kdiff3
+  #22) Regexxer
   #23) Postman
   #24) Gitkraken
   DEVELOPMENT_OPTIONS="15"
@@ -179,17 +178,16 @@
 #OFFICE {{{
   # 1) Abiword+Gnumeric|Calligra
   # 2) Calibre
-  # 3) GCStar
-  # 4) Geeknote
-  # 5) Haroopad
-  # 6) Homebank
-  # 7) Impressive
-  # 8) Latex
-  # 9) LibreOffice
-  #10) OCRFeeder
+  # 3) Goldendict
+  # 4) Homebank
+  # 5) Latex
+  # 6) LibreOffice
+  # 7) Lyx
+  # 8) OCRFeeder
+  # 9) Tellico
+  #10) Typora
   #11) Xmind
-  #12) goldendict
-  OFFICE_OPTIONS="9"
+  OFFICE_OPTIONS="6"
 #}}}
 #SYSTEM TOOLS {{{
   # 1) ClamAV
@@ -201,16 +199,13 @@
   # 7) Grsync
   # 8) Hosts Update
   # 9) Htop
-  #10) Plex
-  #11) UFW
-  #12) Unified Remote
-  #13) Virtualbox
-  #14) Wine
-  #15) netdata
-  #16) nload
-  #17) Assorted Graphical log viewers
-  #18) seahorse Password keyring management GUI
-  SYSTEMTOOLS_OPTIONS="11"
+  #10) UFW
+  #11) Unified Remote
+  #12) Virtualbox
+  #13) Wine
+  #14) netdata
+  #15) nload
+  SYSTEMTOOLS_OPTIONS="11 13"
 #}}}
 #GRAPHICS {{{
   # 1) Blender
@@ -223,7 +218,8 @@
   # 8) Scribus
   # 9) Shotwell
   #10) Simple Scan
-  GRAPHICS_OPTIONS="2-7 9"
+  #11) YACReader
+  GRAPHICS_OPTIONS="2-5 9"
 #}}}
 #INTERNET {{{
   # 1) Browser
@@ -244,21 +240,20 @@
     BROWSERS_OPTIONS="3"
   #}}}
   #DOWNLOAD|FILESHARE {{{
-    # 1) AeroFS
-    # 2) Resilio Sync
-    # 3) Deluge
-    # 4) Dropbox
-    # 5) FlareGet
-    # 6) Jdownloader
-    # 7) qBittorrent
-    # 8) Sparkleshare
-    # 9) Spider Oak
-    #10) Trasmission
-    #11) uGet
-    #12) youtube-dl
-    #13) tixati
-    #14) tixati
-    DOWNLOAD_OPTIONS=""
+    #  1) Deluge
+    #  2) Dropbox
+    #  3) Flareget
+    #  4) Google Drive OCamlFuse
+    #  5) Jdownloader
+    #  6) qBittorrent
+    #  7) Resilio Sync
+    #  8) Sparkleshare
+    #  9) Spideroak
+    # 10) Tixati
+    # 11) Transmission
+    # 12) uGet
+    # 13) Youtube-dl
+    DOWNLOAD_OPTIONS="11"
   #}}}
   #EMAIL|RSS {{{
     # 1) Liferea
@@ -281,7 +276,7 @@
   #}}}
   #MAPPING {{{
     # 1) Google Earth
-    # 2) NASA World Wind
+    # 2) QGIS
     MAPPING_OPTIONS=""
   #}}}
   #VNC|Desktop Share {{{
@@ -298,20 +293,16 @@
   #PLAYERS {{{
     # 1) Amarok
     # 2) Audacious
-    # 3) Banshee
-    # 4) Clementine
-    # 5) Deadbeef
-    # 6) Guayadeque
-    # 7) Musique
-    # 8) Nuvola
-    # 9) Pragha
-    #10) Radiotray
-    #11) Rhythmbox
-    #12) Spotify
-    #13) Timidity++
-    #14) Tomahawk
-    #15) quodlibet
-    AUDIO_PLAYER_OPTIONS="4"
+    # 3) Clementine
+    # 4) Deadbeef
+    # 5) Guayadeque
+    # 6) Musique
+    # 7) Pragha
+    # 8) Rhythmbox
+    # 9) Spotify
+    #10) Timidity++
+    #11) quodlibet
+    AUDIO_PLAYER_OPTIONS="8"
   #}}}
   #EDITORS|TOOLS {{{
     # 1) Audacity
@@ -330,13 +321,12 @@
     # 1) Gnome Mplayer
     # 2) LiveStreamer
     # 3) Minitube
-    # 4) Miro
-    # 5) MPV
-    # 6) Parole
+    # 4) MPV
+    # 5) Parole
+    # 6) Plex 
     # 7) Popcorn Time
     # 8) VLC
     # 9) Kodi
-    #10) obs-studio
     VIDEO_PLAYER_OPTIONS="8"
   #}}}
   #EDITORS|TOOLS {{{
@@ -344,13 +334,12 @@
     # 2) Avidemux
     # 3) Filebot
     # 4) Handbrake
-    # 5) Kazam
-    # 6) Kdenlive
-    # 7) Lightworks
-    # 8) Openshot
-    # 9) Pitivi
-    #10) Transmageddon
-    VIDEO_EDITOR_OPTIONS="1"
+    # 5) Kdenlive
+    # 6) Lightworks
+    # 7) Openshot
+    # 8) Pitivi
+    # 9) Transmageddon
+    VIDEO_EDITOR_OPTIONS="8"
   #}}}
 #}}}
 #GAMES {{{
@@ -379,7 +368,7 @@
   # 8) ttf-ms-fonts
   # 9) wqy-microhei
   #10) noto-fonts-cjk
-  FONTS_OPTIONS="1-10"
+  FONTS_OPTIONS="1-9"
 #}}}
 #IME INPUT TOOLS  {{{
   # 1) fcitx
@@ -387,7 +376,6 @@
   IME_OPTIONS=""
 #}}}
 #EXTRA {{{
-  # 1) Global Menu
-  # 2) Profile Sync
+  # 1) Profile Sync
   EXTRA_OPTIONS=""
 #}}}
diff --git a/sharedfuncs b/sharedfuncs
index a5bdb301..b8e232ec 100755
--- a/sharedfuncs
+++ b/sharedfuncs
@@ -260,7 +260,7 @@
       VIDEO_DRIVER="bumblebee"
     elif [[ -n $(echo ${_vga} | grep "nvidia") || -f /sys/kernel/debug/dri/0/vbios.rom ]]; then
       cecho Nvidia
-      read_input_text "Install NVIDIA proprietary driver" $PROPRIETARY_DRIVER
+      read_input_text "Install NVIDIA proprietary driver" $BETTER_VIDEO_DRIVER
       if [[ $OPTION == y ]]; then
         VIDEO_DRIVER="nvidia"
       else
@@ -268,7 +268,12 @@
       fi
     elif [[ -n $(echo ${_vga} | grep "advanced micro devices") || -f /sys/kernel/debug/dri/0/radeon_pm_info || -f /sys/kernel/debug/dri/0/radeon_sa_info ]]; then
       cecho AMD/ATI
-      VIDEO_DRIVER="ati"
+      read_input_text "Install AMDGPU driver" $BETTER_VIDEO_DRIVER
+      if [[ $OPTION == y ]]; then
+        VIDEO_DRIVER="amdgpu"
+      else
+        VIDEO_DRIVER="ati"
+      fi
     elif [[ -n $(echo ${_vga} | grep "intel corporation") || -f /sys/kernel/debug/dri/0/i915_capabilities ]]; then
       cecho Intel
       VIDEO_DRIVER="intel"