diff --git a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js
index 7a36670b..058572db 100644
--- a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js
+++ b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js
@@ -6,6 +6,8 @@
 Ox.ListCalendar <f> ListCalendar object
 @*/
 
+// FIXME: should be Ox.CalendarEditor
+
 Ox.ListCalendar = function(options, self) {
 
     self = self || {};
diff --git a/source/Ox.UI/js/Code/Ox.ExamplePanel.js b/source/Ox.UI/js/Code/Ox.ExamplePanel.js
index 2ca575a6..213f5d6f 100644
--- a/source/Ox.UI/js/Code/Ox.ExamplePanel.js
+++ b/source/Ox.UI/js/Code/Ox.ExamplePanel.js
@@ -5,6 +5,7 @@ Ox.ExamplePanel = function(options, self) {
     self = self || {};
     var that = Ox.Element({}, self)
         .defaults({
+            element: '',
             examples: [],
             keywords: null,
             path: '',
@@ -16,7 +17,7 @@ Ox.ExamplePanel = function(options, self) {
         .options(options || {})
 
     self.$list = Ox.Element();
-    self.$page = Ox.Element();
+    self.$page = Ox.Element().append(self.options.element);
 
     that.setElement(
         self.$panel = Ox.SplitPanel({
diff --git a/source/Ox.UI/js/Map/Ox.ListMap.js b/source/Ox.UI/js/Map/Ox.ListMap.js
index 505bb852..2544c753 100644
--- a/source/Ox.UI/js/Map/Ox.ListMap.js
+++ b/source/Ox.UI/js/Map/Ox.ListMap.js
@@ -17,6 +17,8 @@ Ox.ListMap <f:Ox.Element> ListMap object
     self <o> Shared private variable
 @*/
 
+// FIXME: Should be Ox.MapEditor
+
 Ox.ListMap = function(options, self) {
 
     self = self || {};
diff --git a/source/Ox.UI/themes/classic/css/classic.css b/source/Ox.UI/themes/classic/css/classic.css
index 16237522..ec4cf949 100644
--- a/source/Ox.UI/themes/classic/css/classic.css
+++ b/source/Ox.UI/themes/classic/css/classic.css
@@ -228,7 +228,7 @@ Document
     //background: rgb(255, 255, 255);
 }
 .OxThemeClassic .OxDocument div {
-    border-color: rgb(192, 192, 192);
+    border-color: rgb(208, 208, 208);
 }
 
 /*
diff --git a/source/Ox.UI/themes/classic/png/icon16.png b/source/Ox.UI/themes/classic/png/icon16.png
index fac297c1..478c426e 100644
Binary files a/source/Ox.UI/themes/classic/png/icon16.png and b/source/Ox.UI/themes/classic/png/icon16.png differ
diff --git a/source/Ox.UI/themes/classic/png/logo128.png b/source/Ox.UI/themes/classic/png/logo128.png
index 504b404a..97813900 100644
Binary files a/source/Ox.UI/themes/classic/png/logo128.png and b/source/Ox.UI/themes/classic/png/logo128.png differ
diff --git a/source/Ox.UI/themes/classic/png/logo16.png b/source/Ox.UI/themes/classic/png/logo16.png
deleted file mode 100644
index 19c8b022..00000000
Binary files a/source/Ox.UI/themes/classic/png/logo16.png and /dev/null differ
diff --git a/source/Ox.UI/themes/modern/png/icon16.png b/source/Ox.UI/themes/modern/png/icon16.png
index 10aa244e..5e3d9a57 100644
Binary files a/source/Ox.UI/themes/modern/png/icon16.png and b/source/Ox.UI/themes/modern/png/icon16.png differ
diff --git a/source/Ox.UI/themes/modern/png/logo128.png b/source/Ox.UI/themes/modern/png/logo128.png
index 0c997f8f..40095209 100644
Binary files a/source/Ox.UI/themes/modern/png/logo128.png and b/source/Ox.UI/themes/modern/png/logo128.png differ
diff --git a/source/Ox.UI/themes/modern/png/logo16.png b/source/Ox.UI/themes/modern/png/logo16.png
deleted file mode 100644
index 933551a0..00000000
Binary files a/source/Ox.UI/themes/modern/png/logo16.png and /dev/null differ
diff --git a/source/Ox/js/Core.js b/source/Ox/js/Core.js
index c0825e7c..d18b1366 100644
--- a/source/Ox/js/Core.js
+++ b/source/Ox/js/Core.js
@@ -123,10 +123,13 @@ Ox.load = function() {
 
 /*@
 Ox.localStorage <o> localStorage wrapper
-    () -> <o> key:value pairs
-    (key) -> <*> value
-    (key, val) -> <f> localStorage object
-    ({key, val}) -> <f> localStorage object
+    (namespace) -> <f> localStorage object for a given namespace
+        FIXME: there is a bug in Ox.doc here, 
+        will use "(namespace)" as function name
+        () -> <o> returns all key:value pairs
+        (key) -> <*> returns one value
+        (key, val) -> <f> sets one value, returns localStorage object
+        ({key: val, ...}) -> <f> sets values, returns localStorage object
 @*/
 Ox.localStorage = function(namespace) {
     if (!window.localStorage) {
@@ -161,6 +164,7 @@ Ox.localStorage = function(namespace) {
         keys.forEach(function(key) {
             delete localStorage[namespace + '.' + key];
         });
+        return storage;
     };
     return storage;
 };