diff --git a/common.inc b/common.inc
index 27e3838..f4f01f0 100644
--- a/common.inc
+++ b/common.inc
@@ -53,6 +53,7 @@
 %
 /is_live {
   % check only once
+  true return
   is_live.result .undef ne { is_live.result return } if
 
   /is_live.result "/casper/filesystem.manifest" filesize .undef ne def
diff --git a/dia_fulloptions.inc b/dia_fulloptions.inc
index cab6e07..c4ed5d5 100644
--- a/dia_fulloptions.inc
+++ b/dia_fulloptions.inc
@@ -15,6 +15,8 @@
 /.fulloptions.nodmraid 5 def
 /.fulloptions.nomodeset 6 def
 /.fulloptions.free 7 def
+/.fulloptions.nox 8 def
+/.fulloptions.docache 9 def
 
 % These strings are intentionally not translatable.
 /txt_acpi_off "acpi=off" def
@@ -23,6 +25,8 @@
 /txt_edd_on "edd=on" def
 /txt_nodmraid "nodmraid" def
 /txt_nomodeset "nomodeset" def
+/txt_nox "No-X" def
+/txt_docache "RAM" def
 
 
 % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -42,6 +46,8 @@
     /.fulloptions.nodmraid dec
     /.fulloptions.nomodeset dec
     /.fulloptions.free dec
+    /.fulloptions.nox dec
+    /.fulloptions.docache dec
     xmenu .xm_current .fulloptions.acpi_off put
   } {
     xmenu .xm_current .fulloptions.expert put
@@ -52,6 +58,8 @@
     /txt_acpi_off /txt_noapic /txt_nolapic /txt_edd_on /txt_nodmraid
     /txt_nomodeset
     /txt_option_free
+    /txt_nox
+    /txt_docache
   ] put
 
   xmenu .xm_title /txt_other_options put
@@ -86,6 +94,8 @@
       over .fulloptions.edd_on eq { pop "edd=on" } if
       over .fulloptions.nodmraid eq { pop "nodmraid" } if
       over .fulloptions.nomodeset eq { pop "nomodeset" } if
+      over .fulloptions.nox eq { pop "nox" } if
+      over .fulloptions.docache eq { pop "docache" } if
       over .fulloptions.free eq { pop "apt-setup/restricted=false apt-setup/multiverse=false" } if
       dup {
 	% append new option string
diff --git a/panel.inc b/panel.inc
index 5111ea1..6992089 100644
--- a/panel.inc
+++ b/panel.inc
@@ -44,11 +44,7 @@
       [ .panel.both [ keyF2 0 "F2" /panel.lang /panel.lang.width /panel.lang.update /lang.init ] ]
       [ .panel.both [ keyF3 0 "F3" /panel.keymap /panel.keymap.width /panel.keymap.update /keymap.init ] ]
       [ .panel.both [ keyF4 0 "F4" /panel.modes /panel.modes.width /panel.modes.update /modes.init ] ]
-      [ .panel.both [ keyF5 0 "F5" /panel.access /panel.access.width /panel.access.update /access.init ] ]
-
-      [ .panel.short [ keyF6 0 "F6" /panel.options /panel.fulloptions.width /panel.fulloptions.update .undef ] ]
-
-      [ .panel.full [ keyF6 0 "F6" /panel.fulloptions /panel.fulloptions.width /panel.fulloptions.update /fulloptions.init ] ]
+      [ .panel.both [ keyF5 0 "F5" /panel.fulloptions /panel.fulloptions.width /panel.fulloptions.update /fulloptions.init ] ]
 
       32+64bit_source {
 	64bit {