diff --git a/demos/demo-01.geo b/demos/demo-01.geo
index 9663be2a71a7572edf00847caed3ce1634863e62..ff74df0178092d3821392fd23977c42eacb07acf 100644
--- a/demos/demo-01.geo
+++ b/demos/demo-01.geo
@@ -54,25 +54,6 @@ Physical Line(2222) = {3};
 Physical Line(3333) = {2,4};
 Physical Surface(9999) = {6};
 
-/* README: You can also specify options in the file. For example, this
-   redefines the color of geometry points. See ex03.geo for a more
-   complete example. */
-
-Options{
-  General{
-    Rotation0 = 10;
-    Color{
-      Background = Red;
-    }
-  }
-  Geometry{
-    Color{
-      Points = Orange;
-      Lines = Blue;
-    }
-  }
-}
-
 /* README: You can merge files with File->Merge. This is most useful
    for post-processing purposes. Try for example to merge view1.pos
    together with this file.  Post-processing options are available by
diff --git a/demos/demo-02.geo b/demos/demo-02.geo
index a1de32eb0b53dd90a6bce5edba4ed48d0799c852..b4fc600243beb30ef580dd572fbc72b1470e8a2c 100644
--- a/demos/demo-02.geo
+++ b/demos/demo-02.geo
@@ -36,3 +36,23 @@ Volume(10023) = {10022};
 
 Physical Volume (1) = {41} ;
 
+/* README: You can also specify options in the file. For example, this
+   redefines the color of geometry points. Click on the '?' button in the
+   main window, print the file in 'geo' format, or add '-0' on the command
+   line to get the full list of available options. */
+
+Options{
+  General{
+    Rotation0 = 10;
+    Color{
+      Background = Red;
+    }
+  }
+  Geometry{
+    Color{
+      Points = Orange;
+      Lines = Blue;
+    }
+  }
+}
+
diff --git a/demos/demo-06.geo b/demos/demo-06.geo
index c3b52a785260fc22184e61738d4b230c4479268c..a026f4ac98d71b9ee8b1c6bea9f47a36fee374a3 100644
--- a/demos/demo-06.geo
+++ b/demos/demo-06.geo
@@ -160,39 +160,44 @@ Physical Surface (711) = {66} ;
    widget). GUI colors and fonts can be changed in a standard X
    resource file (.gmshrc in your home directory). */
 
-Color{
+Options{
   General{
-    Background = {39, 64, 139} ;
-    Axes =  OrangeRed1; // Color names are the classical X11 names
-    SmallAxes = LightGray;
-    Text = Gray88 ;
+    Color{
+      Background = {39, 64, 139} ;
+      Axes =  OrangeRed1; // Color names are the classical X11 names
+      SmallAxes = LightGray;
+      Text = Gray88 ;
+    }
   }
   Geometry{
-    Points = Yellow;
-    Lines = {255, 255, 255, 128} ; // semi-transparent white
-    Surfaces = {Orange, 60} ; // almost transparent orange
-    Volumes = Green ;
-    PointsSelect = White ;
-    LinesSelect = White ;
-    SurfacesSelect = White ;
+    Color{
+      Points = Yellow;
+      Lines = {255, 255, 255, 128} ; // semi-transparent white
+      Surfaces = {Orange, 60} ; // almost transparent orange
+      Volumes = Green ;
+      PointsSelect = White ;
+      LinesSelect = White ;
+      SurfacesSelect = White ;
+    }
   }
   Mesh{
-    Points = Black;
-    PointsSupp = Orchid;
-    Lines = Black;
-    // Color cycle for volume mesh
-    One = Gray10 ;
-    Two = Gray20 ;
-    Three = Gray30 ;
-    Four = Gray40 ;
-    Five = Gray50 ;
-    Six = Gray60 ;
-    Seven = Gray70 ;
-    Eight = Gray80 ;
-    Nine = Gray90 ;
-    Ten = Black ;
+    Color{
+      Points = Black;
+      PointsSupp = Orchid;
+      Lines = Black;
+      // Color cycle for volume mesh
+      One = Gray10 ;
+      Two = Gray20 ;
+      Three = Gray30 ;
+      Four = Gray40 ;
+      Five = Gray50 ;
+      Six = Gray60 ;
+      Seven = Gray70 ;
+      Eight = Gray80 ;
+      Nine = Gray90 ;
+      Ten = Black ;
+    }
   }
-
 }
 
 /* README: X resources can be specified in a '.gmshrc' in your home