diff --git a/Nasal/gui.nas b/Nasal/gui.nas
index 3175a53d3..77d00b08b 100644
--- a/Nasal/gui.nas
+++ b/Nasal/gui.nas
@@ -140,12 +140,12 @@ Widget = {
 ########################################################################
 
 nextStyle = func {
-    numStyles = size(props.globals.getNode("/sim").getChildren("gui"));
-    curr = getprop("/sim/current-gui") + 1;
+    numStyles = size(props.globals.getNode("/sim/gui").getChildren("style"));
+    curr = getprop("/sim/gui/current-style") + 1;
     if (curr >= numStyles) {
         curr = 0;
     }
-    setprop("/sim/current-gui", curr);
+    setprop("/sim/gui/current-style", curr);
     fgcommand("gui-redraw", props.Node.new());
 }
 
diff --git a/Nasal/screen.nas b/Nasal/screen.nas
index ebf7e14df..5a7911baa 100644
--- a/Nasal/screen.nas
+++ b/Nasal/screen.nas
@@ -147,9 +147,9 @@ window = {
 log = nil;
 
 settimer(func {
-	setlistener("/sim/current-gui", func {
-		var theme = getprop("/sim/current-gui");
-		theme_font = getprop("/sim/gui[" ~ theme ~ "]/fonts/message-display/name");
+	setlistener("/sim/gui/current-style", func {
+		var theme = getprop("/sim/gui/current-style");
+		theme_font = getprop("/sim/gui/style[" ~ theme ~ "]/fonts/message-display/name");
 	}, 1);
 
 	log = window.new(nil, -30, 10, 10);
diff --git a/preferences.xml b/preferences.xml
index c71052ccc..ac80d4947 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -349,9 +349,11 @@ Started September 2000 by David Megginson, david@megginson.com
    <default include="gui/menubar.xml"/>
   </menubar>
 
-  <current-gui type="int" userarchive="y">0</current-gui>
-  <gui n="0" include="gui/styles/default.xml"/>
-  <gui n="1" include="gui/styles/anthrax.xml"/>
+  <gui>
+   <current-style type="int" userarchive="y">0</current-style>
+   <style n="0" include="gui/styles/default.xml"/>
+   <style n="1" include="gui/styles/anthrax.xml"/>
+  </gui>
 
   <mouse>
     <hide-cursor>true</hide-cursor>