diff --git a/source/Ox.Geo/png/flags/32/AG.png b/source/Ox.Geo/png/flags/32/AG.png
index 5f27722d..952b7ed6 100644
Binary files a/source/Ox.Geo/png/flags/32/AG.png and b/source/Ox.Geo/png/flags/32/AG.png differ
diff --git a/source/Ox.Geo/png/flags/32/AR-AQ.png b/source/Ox.Geo/png/flags/32/AR-AQ.png
index 97a45010..7f125132 100644
Binary files a/source/Ox.Geo/png/flags/32/AR-AQ.png and b/source/Ox.Geo/png/flags/32/AR-AQ.png differ
diff --git a/source/Ox.Geo/png/flags/32/BF.png b/source/Ox.Geo/png/flags/32/BF.png
index 1aa11c4f..1dcf4067 100644
Binary files a/source/Ox.Geo/png/flags/32/BF.png and b/source/Ox.Geo/png/flags/32/BF.png differ
diff --git a/source/Ox.Geo/png/flags/32/BO.png b/source/Ox.Geo/png/flags/32/BO.png
index aca01d49..dcdf1e0c 100644
Binary files a/source/Ox.Geo/png/flags/32/BO.png and b/source/Ox.Geo/png/flags/32/BO.png differ
diff --git a/source/Ox.Geo/png/flags/32/FJ.png b/source/Ox.Geo/png/flags/32/FJ.png
index 2b98d399..62cec117 100644
Binary files a/source/Ox.Geo/png/flags/32/FJ.png and b/source/Ox.Geo/png/flags/32/FJ.png differ
diff --git a/source/Ox.Geo/png/flags/32/FQHH.png b/source/Ox.Geo/png/flags/32/FQHH.png
index efdc5e99..de0273b3 100644
Binary files a/source/Ox.Geo/png/flags/32/FQHH.png and b/source/Ox.Geo/png/flags/32/FQHH.png differ
diff --git a/source/Ox.Geo/png/flags/32/FR-AQ.png b/source/Ox.Geo/png/flags/32/FR-AQ.png
index efdc5e99..de0273b3 100644
Binary files a/source/Ox.Geo/png/flags/32/FR-AQ.png and b/source/Ox.Geo/png/flags/32/FR-AQ.png differ
diff --git a/source/Ox.Geo/png/flags/32/GE-AB.png b/source/Ox.Geo/png/flags/32/GE-AB.png
index aaa7f5d3..1950fed7 100644
Binary files a/source/Ox.Geo/png/flags/32/GE-AB.png and b/source/Ox.Geo/png/flags/32/GE-AB.png differ
diff --git a/source/Ox.Geo/png/flags/32/IC.png b/source/Ox.Geo/png/flags/32/IC.png
index 8361ac7e..0f95f966 100644
Binary files a/source/Ox.Geo/png/flags/32/IC.png and b/source/Ox.Geo/png/flags/32/IC.png differ
diff --git a/source/Ox.Geo/png/flags/32/LY.png b/source/Ox.Geo/png/flags/32/LY.png
index 48bf32eb..bd860b70 100644
Binary files a/source/Ox.Geo/png/flags/32/LY.png and b/source/Ox.Geo/png/flags/32/LY.png differ
diff --git a/source/Ox.Geo/png/flags/32/NC.png b/source/Ox.Geo/png/flags/32/NC.png
index c8c325e3..c5699cd0 100644
Binary files a/source/Ox.Geo/png/flags/32/NC.png and b/source/Ox.Geo/png/flags/32/NC.png differ
diff --git a/source/Ox.Geo/png/flags/32/RHZW.png b/source/Ox.Geo/png/flags/32/RHZW.png
index 266bd4a7..22095850 100644
Binary files a/source/Ox.Geo/png/flags/32/RHZW.png and b/source/Ox.Geo/png/flags/32/RHZW.png differ
diff --git a/source/Ox.Geo/png/flags/32/SI.png b/source/Ox.Geo/png/flags/32/SI.png
index ee16fa90..2ad4462b 100644
Binary files a/source/Ox.Geo/png/flags/32/SI.png and b/source/Ox.Geo/png/flags/32/SI.png differ
diff --git a/source/Ox.Geo/png/flags/32/TF.png b/source/Ox.Geo/png/flags/32/TF.png
index efdc5e99..de0273b3 100644
Binary files a/source/Ox.Geo/png/flags/32/TF.png and b/source/Ox.Geo/png/flags/32/TF.png differ
diff --git a/source/Ox.Geo/png/flags/32/UZ.png b/source/Ox.Geo/png/flags/32/UZ.png
index a253796b..1ca58cac 100644
Binary files a/source/Ox.Geo/png/flags/32/UZ.png and b/source/Ox.Geo/png/flags/32/UZ.png differ
diff --git a/source/Ox.Geo/png/icons/16/AG.png b/source/Ox.Geo/png/icons/16/AG.png
index 88b7b9a6..ad3742c0 100644
Binary files a/source/Ox.Geo/png/icons/16/AG.png and b/source/Ox.Geo/png/icons/16/AG.png differ
diff --git a/source/Ox.Geo/png/icons/16/AR-AQ.png b/source/Ox.Geo/png/icons/16/AR-AQ.png
index b5aa64fd..b1b7f024 100644
Binary files a/source/Ox.Geo/png/icons/16/AR-AQ.png and b/source/Ox.Geo/png/icons/16/AR-AQ.png differ
diff --git a/source/Ox.Geo/png/icons/16/BF.png b/source/Ox.Geo/png/icons/16/BF.png
index ae6f7f3f..dcacc54a 100644
Binary files a/source/Ox.Geo/png/icons/16/BF.png and b/source/Ox.Geo/png/icons/16/BF.png differ
diff --git a/source/Ox.Geo/png/icons/16/BO.png b/source/Ox.Geo/png/icons/16/BO.png
index 948bcc9e..c035a45f 100644
Binary files a/source/Ox.Geo/png/icons/16/BO.png and b/source/Ox.Geo/png/icons/16/BO.png differ
diff --git a/source/Ox.Geo/png/icons/16/FJ.png b/source/Ox.Geo/png/icons/16/FJ.png
index 5595604f..59084aed 100644
Binary files a/source/Ox.Geo/png/icons/16/FJ.png and b/source/Ox.Geo/png/icons/16/FJ.png differ
diff --git a/source/Ox.Geo/png/icons/16/FQHH.png b/source/Ox.Geo/png/icons/16/FQHH.png
index b4cf303e..6e84f7da 100644
Binary files a/source/Ox.Geo/png/icons/16/FQHH.png and b/source/Ox.Geo/png/icons/16/FQHH.png differ
diff --git a/source/Ox.Geo/png/icons/16/FR-AQ.png b/source/Ox.Geo/png/icons/16/FR-AQ.png
index b4cf303e..6e84f7da 100644
Binary files a/source/Ox.Geo/png/icons/16/FR-AQ.png and b/source/Ox.Geo/png/icons/16/FR-AQ.png differ
diff --git a/source/Ox.Geo/png/icons/16/GE-AB.png b/source/Ox.Geo/png/icons/16/GE-AB.png
index a4ae0d6c..10212034 100644
Binary files a/source/Ox.Geo/png/icons/16/GE-AB.png and b/source/Ox.Geo/png/icons/16/GE-AB.png differ
diff --git a/source/Ox.Geo/png/icons/16/IC.png b/source/Ox.Geo/png/icons/16/IC.png
index 7ade4608..8eb091ec 100644
Binary files a/source/Ox.Geo/png/icons/16/IC.png and b/source/Ox.Geo/png/icons/16/IC.png differ
diff --git a/source/Ox.Geo/png/icons/16/LY.png b/source/Ox.Geo/png/icons/16/LY.png
index 317850d6..793c967f 100644
Binary files a/source/Ox.Geo/png/icons/16/LY.png and b/source/Ox.Geo/png/icons/16/LY.png differ
diff --git a/source/Ox.Geo/png/icons/16/NC.png b/source/Ox.Geo/png/icons/16/NC.png
index 7e31eff8..e3ccff89 100644
Binary files a/source/Ox.Geo/png/icons/16/NC.png and b/source/Ox.Geo/png/icons/16/NC.png differ
diff --git a/source/Ox.Geo/png/icons/16/RHZW.png b/source/Ox.Geo/png/icons/16/RHZW.png
index 228d2465..32c64b73 100644
Binary files a/source/Ox.Geo/png/icons/16/RHZW.png and b/source/Ox.Geo/png/icons/16/RHZW.png differ
diff --git a/source/Ox.Geo/png/icons/16/SI.png b/source/Ox.Geo/png/icons/16/SI.png
index ade93af6..730d202d 100644
Binary files a/source/Ox.Geo/png/icons/16/SI.png and b/source/Ox.Geo/png/icons/16/SI.png differ
diff --git a/source/Ox.Geo/png/icons/16/TF.png b/source/Ox.Geo/png/icons/16/TF.png
index b4cf303e..6e84f7da 100644
Binary files a/source/Ox.Geo/png/icons/16/TF.png and b/source/Ox.Geo/png/icons/16/TF.png differ
diff --git a/source/Ox.Geo/png/icons/16/UZ.png b/source/Ox.Geo/png/icons/16/UZ.png
index c25d9a81..d0b64cad 100644
Binary files a/source/Ox.Geo/png/icons/16/UZ.png and b/source/Ox.Geo/png/icons/16/UZ.png differ
diff --git a/source/Ox.UI/js/Bar/Ox.Resizebar.js b/source/Ox.UI/js/Bar/Ox.Resizebar.js
index a3ca3876..f877c59d 100644
--- a/source/Ox.UI/js/Bar/Ox.Resizebar.js
+++ b/source/Ox.UI/js/Bar/Ox.Resizebar.js
@@ -14,11 +14,9 @@ Ox.Resizebar <f:Ox.Element> Resizebar
         resizeable  <b|true> can bar be resized
         resize      <a|[]> array with possible sizes
         size        <n|0> default size
-        tooltop     <b|s|false> tooltip or not
+        tooltip     <b|s|false> tooltip or not
     self    <o> Shared private variable
 @*/
-/**
-*/
 Ox.Resizebar = function(options, self) {
 
     self = self || {};
@@ -162,24 +160,6 @@ Ox.Resizebar = function(options, self) {
 			that.css({cursor: getCursor()});
 			self.$tooltip.options({title: getTitle()});
         }
-		/*
-        //Ox.print('toggle');
-        if (Ox.isUndefined(self.options.position)) {
-            self.options.position = parseInt(self.options.parent.css(self.options.edge)) +
-                    (self.options.collapsed ? self.options.size : 0);
-        }
-        var size = self.options.position -
-                    (self.options.collapsed ? 0 : self.options.size),
-            animate = {};
-        //Ox.print('s.o.e', self.options.edge);
-        animate[self.options.edge] = size;
-        self.options.parent.animate(animate, 200, function() {
-            var i = (self.options.edge == 'left' || self.options.edge == 'top') ? 0 : 1;
-            self.options.collapsed = !self.options.collapsed;
-			Ox.Event.trigger(self.ids[i], 'toggle', self.options.collapsed);
-            Ox.Event.trigger(self.ids[1 - i], 'resize', self.options.elements[1 - i][self.dimensions[1]]());
-        });
-		*/
     }
 
     function triggerEvents(event) {
@@ -195,6 +175,13 @@ Ox.Resizebar = function(options, self) {
         });            
     }
 
+    self.setOption = function(key, value) {
+        if (key == 'collapsed') {
+			that.css({cursor: getCursor()});
+			self.$tooltip.options({title: getTitle()});
+        }
+    }
+
     return that;
 
 };
diff --git a/source/Ox.UI/js/Menu/Ox.MainMenu.js b/source/Ox.UI/js/Menu/Ox.MainMenu.js
index 7cc02d0e..4c7e37f3 100644
--- a/source/Ox.UI/js/Menu/Ox.MainMenu.js
+++ b/source/Ox.UI/js/Menu/Ox.MainMenu.js
@@ -227,6 +227,11 @@ Ox.MainMenu = function(options, self) {
         return that;
     };
 
+    that.setItemTitle = function(id, title) {
+        that.getItem(id).options({title: title});
+        return that;
+    };
+
     /*@
     uncheckItem <f> uncheckItem
     @*/
diff --git a/source/Ox.UI/js/Panel/Ox.SplitPanel.js b/source/Ox.UI/js/Panel/Ox.SplitPanel.js
index fa17c585..b2476274 100644
--- a/source/Ox.UI/js/Panel/Ox.SplitPanel.js
+++ b/source/Ox.UI/js/Panel/Ox.SplitPanel.js
@@ -61,11 +61,9 @@ Ox.SplitPanel = function(options, self) {
     // create resizebars
     self.options.elements.forEach(function(element, i) {
         //that.append(element)
-        //Ox.print('V: ', v, that.$elements[i])
         var index = i == 0 ? 0 : 1;
         that.$elements[i].appendTo(that.$element); // fixme: that.$content
         if (element.collapsible || element.resizable) {
-            //Ox.print('v.size', v.size)
             self.resizebarElements[index] = i < 2 ? [0, 1] : [1, 2];
             self.$resizebars[index] = Ox.Resizebar({
                 collapsed: element.collapsed,
@@ -103,7 +101,6 @@ Ox.SplitPanel = function(options, self) {
                 return false;
             }
         });
-        //Ox.print('getPositionById', id, position);
         return position;
     }
 
@@ -298,6 +295,7 @@ Ox.SplitPanel = function(options, self) {
             element.element.triggerEvent('toggle', {
                 'collapsed': element.collapsed
             });
+            self.$resizebars[pos == 0 ? 0 : 1].options({collapsed: element.collapsed});
 			element = self.options.elements[pos == 0 ? 1 : pos - 1];
             element.element.triggerEvent('resize', {
 				size: element.element[self.dimensions[0]]()
@@ -322,6 +320,7 @@ Ox.SplitPanel = function(options, self) {
 };
 
 // fixme: remove!
+/*
 Ox.SplitPanel_ = function(options, self) {
 
     self = self || {};
@@ -507,3 +506,4 @@ Ox.SplitPanel_ = function(options, self) {
     return that;
     
 };
+*/
diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js
index ae4db58c..7aec5872 100644
--- a/source/Ox.UI/js/Video/Ox.VideoEditor.js
+++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js
@@ -1021,6 +1021,8 @@ Ox.VideoEditor = function(options, self) {
             setSizes();
         } else if (key == 'position') {
             setPosition(value);
+        } else if (key == 'showAnnotations') {
+            that.$element.toggle(1);
         }
     };
 
diff --git a/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js
index a15d7caf..4695c5fc 100644
--- a/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js
+++ b/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js
@@ -259,6 +259,8 @@ Ox.VideoPanelPlayer = function(options, self) {
             self.$timeline.options({
                 position: value
             });
+        } else if (key == 'showAnnotations') {
+            that.$element.toggle(1);
         } else if (key == 'width') {
             self.$video.options({
                 width: getPlayerWidth()