diff --git a/links/main.css b/links/main.css
index 4c3db31..f81a471 100644
--- a/links/main.css
+++ b/links/main.css
@@ -7,7 +7,7 @@ canvas:hover { cursor: crosshair;}
 #surface { width:50vw; height:50vh; overflow:hidden; position:fixed; left:50%; top:50%; background:none; border-radius:3px;}
 #surface .layer { position:absolute; top:0px; left:0px; width:100%; height:100%;}
 #overlay { position:absolute; z-index:1000;}
-#widget { color:#fff; position:absolute; font-size:10px; padding-top:10px; border-top:1px solid #333; background-image:url(../media/graphics/logo.svg); background-repeat:no-repeat; background-size:80px 80px; height:100px; background-position: -10px 10px; line-height:20px;}
+#widget { color:#fff; position:absolute; font-size:10px; padding-top:10px; border-top:1px solid #333; background-image:url(../media/graphics/logo.svg); background-repeat:no-repeat; background-size:80px 80px; height:100px; background-position: -10px 10px; line-height:20px;min-width: 300px}
 #widget .module:first-child { margin-left:80px; }
 #widget .module { float:left; margin-right:10px; margin-top:5px;}
 #widget .module .layer { color:#999; padding:2px 5px;}
diff --git a/scripts/core/init.js b/scripts/core/init.js
index d2e85f9..42a947d 100644
--- a/scripts/core/init.js
+++ b/scripts/core/init.js
@@ -34,9 +34,9 @@ starting_canvas.width = parseInt(starting_canvas.width/40) * 40;
 starting_canvas.height = parseInt(starting_canvas.height/40) * 40;
 
 commander.query("~ "+ronin.timestamp());
-commander.query("# "+starting_canvas.render());
-commander.query("# layer=Background");
-commander.query("# #a1a1a1");
-commander.query("# layer=Main");
+commander.query("@ "+starting_canvas.render());
+commander.query("@ layer=Background");
+commander.query("@ #a1a1a1");
+commander.query("@ layer=Main");
 commander.query("> 1 ; > 0,0 ; > 1,1 ; > #ffffff");
 commander.query("~ Ready.");
\ No newline at end of file
diff --git a/scripts/core/ronin.js b/scripts/core/ronin.js
index 34108bf..ce6c49e 100644
--- a/scripts/core/ronin.js
+++ b/scripts/core/ronin.js
@@ -4,7 +4,7 @@ function Ronin()
   this.element  = null;  
   this.widget   = new Widget();
   
-  this.surface  = new Surface("#");
+  this.surface  = new Surface("@");
   this.fileload = new FileLoad("/");
   this.filesave = new FileSave("$");
   this.history  = new History("^");
diff --git a/scripts/modules/help.js b/scripts/modules/help.js
index de5539a..faa0445 100644
--- a/scripts/modules/help.js
+++ b/scripts/modules/help.js
@@ -99,17 +99,17 @@ function Help(rune)
     html += pad("Angular brush",20)+"> 400x 1,1;> 400x 2,2;> 400x 3,3; > 1,1;> 2,2;> 3,3;\n";
 
     html += "\nGraphics\n";
-    html += pad("Watermark",20)+"# 1280x720 ; / ../assets/photo.jpg 1280x 0,0 ; / ../assets/logo.png 60x60 20,640\n";
+    html += pad("Watermark",20)+"@ 1280x720 ; / ../assets/photo.jpg 1280x 0,0 ; / ../assets/logo.png 60x60 20,640\n";
     html += pad("Ronin Logo",20)+"+ M150,53 A-96,97 0 0,0 246,150 M150,246 A97,-96 0 0,0 53,150 M53,101 A-48,-48 0 0,0 101,53 M246,101 A48,-48 0 0,1 198,53 M53,198 A-48,48 0 0,1 101,246 M246,198 A48,48 0 0,0 198,246 stroke_width=45 line_cap=square stroke_color=black\n";
     html += pad("Circle",20)+"+ M 100, 100 m -75, 0 a 75,75 0 1,0 150,0 a 75,75 0 1,0 -150,0\n";
     html += pad("Multiple Circles",20)+"+ M 64, 64 m -50, 0 a 50,50 0 1,0 100,0 a 50,50 0 1,0 -100,0;+ M 64, 64 m -45, 0 a 45,45 0 1,0 90,0 a 45,45 0 1,0 -90,0;+ M 64, 64 m -40, 0 a 40,40 0 1,0 80,0 a 40,40 0 1,0 -80,0;+ M 64, 64 m -35, 0 a 35,35 0 1,0 70,0 a 35,35 0 1,0 -70,0;+ M 64, 64 m -30, 0 a 30,30 0 1,0 60,0 a 30,30 0 1,0 -60,0;+ M 64, 64 m -25, 0 a 25,25 0 1,0 50,0 a 25,25 0 1,0 -50,0;+ M 64, 64 m -20, 0 a 20,20 0 1,0 40,0 a 20,20 0 1,0 -40,0;+ M 64, 64 m -15, 0 a 15,15 0 1,0 30,0 a 15,15 0 1,0 -30,0;+ M 64, 64 m -10, 0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0;+ M 64, 64 m -5, 0 a 5,5 0 1,0 10,0 a 5,5 0 1,0 -10,0\n";
 
     html += "\nFilters\n";
-    html += pad("Darken",20)+"# 640x360 ; / ../assets/photo.jpg 640x 0,0 ; % balance #333333\n";
-    html += pad("Desaturate",20)+"# 640x360 ; / ../assets/photo.jpg 640x 0,0 ; % saturation #333333\n";
+    html += pad("Darken",20)+"@ 640x360 ; / ../assets/photo.jpg 640x 0,0 ; % balance #333333\n";
+    html += pad("Desaturate",20)+"@ 640x360 ; / ../assets/photo.jpg 640x 0,0 ; % saturation #333333\n";
 
     html += "\nCanvas\n";
-    html += pad("Dot-Grid",20)+"# 300x300; # layer=background ; # #A1A1A1 ; . 15x15 4,4 ; # layer=main\n";
+    html += pad("Dot-Grid",20)+"@ 300x300; @ layer=background ; @ #A1A1A1 ; . 15x15 4,4 ; @ layer=main\n";
     
     html += "</div>";
     return html;
diff --git a/scripts/modules/surface.js b/scripts/modules/surface.js
index ad01f5c..88ca969 100644
--- a/scripts/modules/surface.js
+++ b/scripts/modules/surface.js
@@ -97,7 +97,7 @@ function Surface(rune)
     Object.keys(ronin.surface.layers).forEach(function (key) {
       s = ronin.surface.layers[key].widget()+s;
     });
-    return "# "+this.size.render()+"<br />"+s;
+    return this.rune+" "+this.size.render()+"<br />"+s;
   }
   
   this.widget_cursor = function()