diff --git a/install.sh b/install.sh
index 8ce5bba..d0a213b 100755
--- a/install.sh
+++ b/install.sh
@@ -77,12 +77,10 @@ EOF
 
 generate() {
   if [[ "${install_boot}" == 'true' ]]; then
-    if [[ -d "/boot/efi/EFI/fedora" ]]; then
-      THEME_DIR='/boot/efi/EFI/fedora/themes'
-    fi
     if [[ -d "/boot/grub" ]]; then
       THEME_DIR='/boot/grub/themes'
-    elif [[ -d "/boot/grub2" ]]; then
+    fi
+    if [[ -d "/boot/grub2" ]]; then
       THEME_DIR='/boot/grub2/themes'
     fi
   fi
@@ -162,14 +160,6 @@ install() {
           #Append GRUB_FONT
           echo "GRUB_FONT=/boot/grub2/fonts/unicode.pf2" >> /etc/default/grub
         fi
-      elif [[ -f "/boot/efi/EFI/fedora/fonts/unicode.pf2" ]]; then
-        if grep "GRUB_FONT=" /etc/default/grub 2>&1 >/dev/null; then
-          #Replace GRUB_FONT
-          sed -i "s|.*GRUB_FONT=.*|GRUB_FONT=/boot/efi/EFI/fedora/fonts/unicode.pf2|" /etc/default/grub
-        else
-          #Append GRUB_FONT
-          echo "GRUB_FONT=/boot/efi/EFI/fedora/fonts/unicode.pf2" >> /etc/default/grub
-        fi
       fi
     fi
 
@@ -356,13 +346,8 @@ updating_grub() {
   elif has_command zypper || has_command transactional-update; then
     grub2-mkconfig -o /boot/grub2/grub.cfg
   # Check for Fedora (regular or Atomic)
-  elif has_command dnf || has_command rpm-ostree; then
-    # check for UEFI
-    if [[ -f /boot/efi/EFI/fedora/grub.cfg ]]; then
-      prompt -s "Find config file on /boot/efi/EFI/fedora/grub.cfg ...\n"
-      grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
-    fi
-    # Check for Bios
+  elif has_command dnf || has_command rpm-ostree; then 
+    #Check for BIOS
     if [[ -f /boot/grub2/grub.cfg ]]; then
       prompt -s "Find config file on /boot/grub2/grub.cfg ...\n"
       grub2-mkconfig -o /boot/grub2/grub.cfg