diff --git a/boot/core/boot/grub/grub.cfg b/boot/core/boot/grub/grub.cfg
index a101654..34806e6 100644
--- a/boot/core/boot/grub/grub.cfg
+++ b/boot/core/boot/grub/grub.cfg
@@ -19,18 +19,30 @@ fi
 
 if [ x$bootlang = x ]; then
    bootlang=en_US
+   export bootlang
 fi
 if [ x$bootkeymap = x ]; then
    bootkeymap=us
+   export bootkeymap
 fi
 
+if [ x$acpi_opt = x ]; then
+   acpi_opt=''
+   export acpi_opt
+fi
+if [ x$modeset_opt = x ]; then
+   modeset_opt=''
+   export modeset_opt
+fi
+
+
 menuentry "Start Sabayon __VERSION__ SpinBase" {
    set gfxpayload=keep
    echo "Starting $chosen"
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} --
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
    initrd /boot/sabayon.igz
 }
 
@@ -40,30 +52,48 @@ menuentry "Installation" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet installer-text console-setup/layoutcode=${bootkeymap} locale=${bootlang} --
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet installer-text console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
    initrd /boot/sabayon.igz
 }
 
-menuentry "Check disc for defects" {
-   set gfxpayload=keep
-   echo "Starting $chosen"
-   echo "Language: ${bootlang}"
-   echo "Keyboard: ${bootkeymap}"
-   echo "Please wait..."
-   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 checkdisc console-setup/layoutcode=${bootkeymap} locale=${bootlang} --
-   initrd /boot/sabayon.igz
-}
+submenu "Advanced Options" {
 
-menuentry "Debug mode" {
-   set gfxpayload=keep
-   echo "Starting $chosen"
-   echo "Language: ${bootlang}"
-   echo "Keyboard: ${bootkeymap}"
-   echo "Please wait..."
-   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} --
-   initrd /boot/sabayon.igz
-}
+   menuentry "Check disc for defects" {
+      set gfxpayload=keep
+      echo "Starting $chosen"
+      echo "Language: ${bootlang}"
+      echo "Keyboard: ${bootkeymap}"
+      echo "Please wait..."
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 checkdisc console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
+      initrd /boot/sabayon.igz
+   }
+
+   menuentry "Disable Kernel Mode Settings (for AMD Radeon GPUs with fglrx)" {
+      echo "Disabling Kernel Mode Setting..."
+      set modeset_opt="nomodeset"
+      export modeset_opt
+      configfile /boot/grub/grub.cfg
+   }
+
+   menuentry "Disable ACPI" {
+      echo "Disabling ACPI..."
+      set acpi_opt="nomodeset"
+      export acpi_opt
+      configfile /boot/grub/grub.cfg
+   }
+
+   menuentry "Debug mode" {
+      set gfxpayload=keep
+      echo "Starting $chosen"
+      echo "Language: ${bootlang}"
+      echo "Keyboard: ${bootkeymap}"
+      echo "Please wait..."
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
+      initrd /boot/sabayon.igz
+   }
+
+   menuentry "Memory test" {
+      linux16 /boot/memtest
+   }
 
-menuentry "Memory test" {
-   linux16 /boot/memtest
 }
\ No newline at end of file
diff --git a/remaster/hardenedserver_grub.cfg b/remaster/hardenedserver_grub.cfg
index 5f16562..ef76215 100644
--- a/remaster/hardenedserver_grub.cfg
+++ b/remaster/hardenedserver_grub.cfg
@@ -19,9 +19,20 @@ fi
 
 if [ x$bootlang = x ]; then
    bootlang=en_US
+   export bootlang
 fi
 if [ x$bootkeymap = x ]; then
    bootkeymap=us
+   export bootkeymap
+fi
+
+if [ x$acpi_opt = x ]; then
+   acpi_opt=''
+   export acpi_opt
+fi
+if [ x$modeset_opt = x ]; then
+   modeset_opt=''
+   export modeset_opt
 fi
 
 menuentry "Start Sabayon __VERSION__ HardenedServer" {
@@ -30,7 +41,7 @@ menuentry "Start Sabayon __VERSION__ HardenedServer" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} -- 
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon.igz
 }
 
@@ -40,7 +51,7 @@ menuentry "Installation" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} -- 
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon.igz
 }
 
@@ -53,7 +64,7 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} -- 
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
       initrd /boot/sabayon.igz
    }
 
@@ -63,17 +74,31 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} -- 
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
       initrd /boot/sabayon.igz
    }
 
+   menuentry "Disable Kernel Mode Settings (for AMD Radeon GPUs with fglrx)" {
+      echo "Disabling Kernel Mode Setting..."
+      set modeset_opt="nomodeset"
+      export modeset_opt
+      configfile /boot/grub/grub.cfg
+   }
+
+   menuentry "Disable ACPI" {
+      echo "Disabling ACPI..."
+      set acpi_opt="nomodeset"
+      export acpi_opt
+      configfile /boot/grub/grub.cfg
+   }
+
    menuentry "Debug mode" {
       set gfxpayload=keep
       echo "Starting $chosen"
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} --
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
       initrd /boot/sabayon.igz
    }
 
diff --git a/remaster/minimal_amd64_x86_grub.cfg b/remaster/minimal_amd64_x86_grub.cfg
index 6a6b5d2..c602e79 100644
--- a/remaster/minimal_amd64_x86_grub.cfg
+++ b/remaster/minimal_amd64_x86_grub.cfg
@@ -19,9 +19,20 @@ fi
 
 if [ x$bootlang = x ]; then
    bootlang=en_US
+   export bootlang
 fi
 if [ x$bootkeymap = x ]; then
    bootkeymap=us
+   export bootkeymap
+fi
+
+if [ x$acpi_opt = x ]; then
+   acpi_opt=''
+   export acpi_opt
+fi
+if [ x$modeset_opt = x ]; then
+   modeset_opt=''
+   export modeset_opt
 fi
 
 menuentry "Start Sabayon __VERSION__ x86_64 __FLAVOUR__" {
@@ -30,7 +41,7 @@ menuentry "Start Sabayon __VERSION__ x86_64 __FLAVOUR__" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} -- 
+   linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon64.igz
 }
 
@@ -40,7 +51,7 @@ menuentry "Start Sabayon __VERSION__ i686 __FLAVOUR__" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} -- 
+   linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon32.igz
 }
 
@@ -50,7 +61,7 @@ menuentry "Start Sabayon __VERSION__ x86_64 Media Center" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} sabayonmce locale=${bootlang} -- 
+   linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon64.igz
 }
 
@@ -60,7 +71,7 @@ menuentry "Start Sabayon __VERSION__ i686 Media Center" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} sabayonmce locale=${bootlang} -- 
+   linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon32.igz
 }
 
@@ -70,7 +81,7 @@ menuentry "Installation (x86_64)" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} -- 
+   linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon64.igz
 }
 
@@ -80,7 +91,7 @@ menuentry "Installation (i686)" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} -- 
+   linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon32.igz
 }
 
@@ -93,7 +104,7 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} -- 
+      linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
       initrd /boot/sabayon64.igz
    }
 
@@ -103,7 +114,7 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} -- 
+      linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
       initrd /boot/sabayon32.igz
    }
 
@@ -113,7 +124,7 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} -- 
+      linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
       initrd /boot/sabayon64.igz
    }
 
@@ -123,17 +134,31 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} -- 
+      linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
       initrd /boot/sabayon32.igz
    }
 
+   menuentry "Disable Kernel Mode Settings (for AMD Radeon GPUs with fglrx)" {
+      echo "Disabling Kernel Mode Setting..."
+      set modeset_opt="nomodeset"
+      export modeset_opt
+      configfile /boot/grub/grub.cfg
+   }
+
+   menuentry "Disable ACPI" {
+      echo "Disabling ACPI..."
+      set acpi_opt="nomodeset"
+      export acpi_opt
+      configfile /boot/grub/grub.cfg
+   }
+
    menuentry "Debug mode (x86_64)" {
       set gfxpayload=keep
       echo "Starting $chosen"
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} --
+      linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
       initrd /boot/sabayon64.igz
    }
 
@@ -143,7 +168,7 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} --
+      linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
       initrd /boot/sabayon32.igz
    }
 
diff --git a/remaster/minimal_grub.cfg b/remaster/minimal_grub.cfg
index 342cff2..b23c7ef 100644
--- a/remaster/minimal_grub.cfg
+++ b/remaster/minimal_grub.cfg
@@ -19,18 +19,30 @@ fi
 
 if [ x$bootlang = x ]; then
    bootlang=en_US
+   export bootlang
 fi
 if [ x$bootkeymap = x ]; then
    bootkeymap=us
+   export bootkeymap
 fi
 
+if [ x$acpi_opt = x ]; then
+   acpi_opt=''
+   export acpi_opt
+fi
+if [ x$modeset_opt = x ]; then
+   modeset_opt=''
+   export modeset_opt
+fi
+
+
 menuentry "Start Sabayon __VERSION__ __FLAVOUR__" {
    set gfxpayload=keep
    echo "Starting $chosen"
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} -- 
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon.igz
 }
 
@@ -40,7 +52,7 @@ menuentry "Installation" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} -- 
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon.igz
 }
 
@@ -53,7 +65,7 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} -- 
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
       initrd /boot/sabayon.igz
    }
 
@@ -63,17 +75,31 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} -- 
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
       initrd /boot/sabayon.igz
    }
 
+   menuentry "Disable Kernel Mode Settings (for AMD Radeon GPUs with fglrx)" {
+      echo "Disabling Kernel Mode Setting..."
+      set modeset_opt="nomodeset"
+      export modeset_opt
+      configfile /boot/grub/grub.cfg
+   }
+
+   menuentry "Disable ACPI" {
+      echo "Disabling ACPI..."
+      set acpi_opt="nomodeset"
+      export acpi_opt
+      configfile /boot/grub/grub.cfg
+   }
+
    menuentry "Debug mode" {
       set gfxpayload=keep
       echo "Starting $chosen"
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang}--
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
       initrd /boot/sabayon.igz
    }
 
diff --git a/remaster/serverbase_grub.cfg b/remaster/serverbase_grub.cfg
index bde51be..cd6798e 100644
--- a/remaster/serverbase_grub.cfg
+++ b/remaster/serverbase_grub.cfg
@@ -19,9 +19,20 @@ fi
 
 if [ x$bootlang = x ]; then
    bootlang=en_US
+   export bootlang
 fi
 if [ x$bootkeymap = x ]; then
    bootkeymap=us
+   export bootkeymap
+fi
+
+if [ x$acpi_opt = x ]; then
+   acpi_opt=''
+   export acpi_opt
+fi
+if [ x$modeset_opt = x ]; then
+   modeset_opt=''
+   export modeset_opt
 fi
 
 menuentry "Start Sabayon __VERSION__ ServerBase" {
@@ -30,7 +41,7 @@ menuentry "Start Sabayon __VERSION__ ServerBase" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} -- 
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon.igz
 }
 
@@ -40,7 +51,7 @@ menuentry "Installation" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-text locale=${bootlang} -- 
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-text locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon.igz
 }
 
@@ -52,17 +63,31 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} -- 
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
       initrd /boot/sabayon.igz
    }
 
+   menuentry "Disable Kernel Mode Settings (for AMD Radeon GPUs with fglrx)" {
+      echo "Disabling Kernel Mode Setting..."
+      set modeset_opt="nomodeset"
+      export modeset_opt
+      configfile /boot/grub/grub.cfg
+   }
+
+   menuentry "Disable ACPI" {
+      echo "Disabling ACPI..."
+      set acpi_opt="nomodeset"
+      export acpi_opt
+      configfile /boot/grub/grub.cfg
+   }
+
    menuentry "Debug mode" {
       set gfxpayload=keep
       echo "Starting $chosen"
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} --
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
       initrd /boot/sabayon.igz
    }
 
diff --git a/remaster/standard_grub.cfg b/remaster/standard_grub.cfg
index c5545a8..04cd476 100644
--- a/remaster/standard_grub.cfg
+++ b/remaster/standard_grub.cfg
@@ -19,9 +19,20 @@ fi
 
 if [ x$bootlang = x ]; then
    bootlang=en_US
+   export bootlang
 fi
 if [ x$bootkeymap = x ]; then
    bootkeymap=us
+   export bootkeymap
+fi
+
+if [ x$acpi_opt = x ]; then
+   acpi_opt=''
+   export acpi_opt
+fi
+if [ x$modeset_opt = x ]; then
+   modeset_opt=''
+   export modeset_opt
 fi
 
 menuentry "Start Sabayon __VERSION__ __FLAVOUR__" {
@@ -30,7 +41,7 @@ menuentry "Start Sabayon __VERSION__ __FLAVOUR__" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} -- 
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon.igz
 }
 
@@ -40,7 +51,7 @@ menuentry "Start Sabayon __VERSION__ Media Center" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} sabayonmce locale=${bootlang} -- 
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon.igz
 }
 
@@ -50,7 +61,7 @@ menuentry "Installation" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} -- 
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon.igz
 }
 
@@ -60,7 +71,7 @@ menuentry "Installation (Media Center)" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui mceinstall locale=${bootlang} -- 
+   linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} installer-gui mceinstall locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/sabayon.igz
 }
 
@@ -72,7 +83,7 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} -- 
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
       initrd /boot/sabayon.igz
    }
 
@@ -82,17 +93,31 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} -- 
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
       initrd /boot/sabayon.igz
    }
 
+   menuentry "Disable Kernel Mode Settings (for AMD Radeon GPUs with fglrx)" {
+      echo "Disabling Kernel Mode Setting..."
+      set modeset_opt="nomodeset"
+      export modeset_opt
+      configfile /boot/grub/grub.cfg
+   }
+
+   menuentry "Disable ACPI" {
+      echo "Disabling ACPI..."
+      set acpi_opt="nomodeset"
+      export acpi_opt
+      configfile /boot/grub/grub.cfg
+   }
+
    menuentry "Debug mode" {
       set gfxpayload=keep
       echo "Starting $chosen"
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} --
+      linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug console-setup/layoutcode=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
       initrd /boot/sabayon.igz
    }