styles adjustment

modules/core_styles/styles/buttons.otui

@@ -3,19 +3,16 @@ Button < UIButton
   color: #f0ad4dff
   size: 106 24
   text-offset: 0 0
-
   image-color: white
   image-source: /core_styles/images/button.png
   image-border: 5
 
   $hover:
     image-source: /core_styles/images/button_hover.png
-    image-border: 5
 
   $pressed:
     text-offset: 1 1
     image-source: /core_styles/images/button_down.png
-    image-border: 5
 
   $disabled:
     color: #f0ad4d88

modules/core_styles/styles/checkboxes.otui

@@ -1,29 +1,26 @@
 CheckBox < UICheckBox
-  size: 12 12
-  box-size: 12 12
+  size: 16 16
   text-align: left
   text-offset: 16 0
   color: #aaaaaa
   image-color: #ffffffff
   image-rect: 0 0 12 12
+  image-offset: 0 2
+  image-source: /core_styles/images/checkbox.png
 
   $hover:
     color: #cccccc
 
   $!checked:
-    image-source: /core_styles/images/checkbox.png
     image-clip: 0 0 12 12
 
   $hover !checked:
-    image-source: /core_styles/images/checkbox.png
     image-clip: 0 12 12 12
 
   $checked:
-    image-source: /core_styles/images/checkbox.png
     image-clip: 0 24 12 12
 
   $hover checked:
-    image-source: /core_styles/images/checkbox.png
     image-clip: 0 36 12 12
 
   $disabled:
@@ -32,39 +29,31 @@ CheckBox < UICheckBox
 
 ColorBox < UICheckBox
   size: 16 16
-  box-size: 16 16
   image-color: #ffffffff
+  image-source: /core_styles/images/colorbox.png
 
   $checked:
-    image:
-      source: /core_styles/images/colorbox.png
-      clip: 16 0 16 16
+    image-clip: 16 0 16 16
 
   $!checked:
-    image:
-      source: /core_styles/images/colorbox.png
-      clip: 0 0 16 16
+    image-clip: 0 0 16 16
 
 ButtonBox < UICheckBox
   font: verdana-11px-antialised
   color: #f0ad4dff
   size: 106 24
-  box-size: 106 24
   text-offset: 0 0
   text-align: center
-
-  image-color: white
   image-source: /core_styles/images/button.png
+  image-color: white
   image-border: 5
 
   $hover:
     image-source: /core_styles/images/button_hover.png
-    image-border: 5
 
   $checked:
     text-offset: 1 1
     image-source: /core_styles/images/button_down.png
-    image-border: 5
 
   $disabled:
     color: #f0ad4d88

modules/core_styles/styles/comboboxes.otui

@@ -1,14 +1,9 @@
 ComboBoxPopupMenuButton < UIButton
+  height: 18
   font: verdana-11px-antialised
-  image-color: alpha
   text-align: left
   text-offset: 2 0
   color: #aaaaaa
-  height: 18
-  margin-left: 1
-  margin-right: 1
-  margin-top: 0
-  margin-bottom: 0
   background-color: white
 
   $hover:
@@ -18,18 +13,10 @@ ComboBoxPopupMenuButton < UIButton
   $disabled:
     color: #555555
 
-  $first:
-    margin-top: 1
-
-  $last:
-    margin-bottom: 1
-
 ComboBoxPopupMenuSeparator < UIWidget
-  margin-left: 1
-  margin-right: 1
   image-source: /core_styles/images/combobox.png
   image-repeated: true
-    clip: 1 59 89 1
+  image-clip: 1 59 89 1
   height: 1
   phantom: true
 
@@ -38,6 +25,7 @@ ComboBoxPopupMenu < UIPopupMenu
   image-clip: 0 60 89 20
   image-border: 1
   image-border-top: 0
+  padding: 1
 
 ComboBox < UIComboBox
   font: verdana-11px-antialised
@@ -51,13 +39,7 @@ ComboBox < UIComboBox
   image-clip: 0 0 89 20
 
   $hover:
-    image-source: /core_styles/images/combobox.png
-    image-border: 1
-    image-border-right: 17
     image-clip: 0 20 89 20
 
   $on:
-    image-source: /core_styles/images/combobox.png
-    image-border: 1
-    image-border-right: 17
     image-clip: 0 40 89 20

modules/core_styles/styles/panels.otui

@@ -20,7 +20,7 @@ InterfacePanel2 < Panel
   image-source: /core_styles/images/interface_panel2.png
   image-border: 4
 
-Map< UIMap
+Map < UIMap
   padding: 4
   image-source: /core_styles/images/map_panel.png
   image-border: 4

modules/core_styles/styles/popupmenus.otui

@@ -1,12 +1,10 @@
 PopupMenuButton < UIButton
-  font: verdana-11px-antialised
-  image-color: alpha
-  color: #aaaaaa
   height: 18
   margin-left: 3
   margin-right: 3
-  margin-top: 0
-  margin-bottom: 0
+  font: verdana-11px-antialised
+
+  color: #aaaaaa
   background-color: alpha
 
   $hover:
@@ -16,12 +14,6 @@ PopupMenuButton < UIButton
   $disabled:
     color: #555555
 
-  $first:
-    margin-top: 3
-
-  $last:
-    margin-bottom: 3
-
 PopupMenuSeparator < UIWidget
   margin-left: 2
   margin-right: 2
@@ -34,6 +26,7 @@ PopupMenuSeparator < UIWidget
 
 PopupMenu < UIPopupMenu
   width: 50
-  border-image:
   image-source: /core_styles/images/menubox.png
-  image-border: 3
+  image-border: 3
+  padding-top: 3
+  padding-bottom: 3

modules/core_styles/styles/progressbars.otui

@@ -1,4 +1,4 @@
 ProgressBar < UIProgressBar
-  height: 15
+  height: 16
   background-color: red
   border: 1 black

modules/core_styles/styles/separators.otui

@@ -1,6 +1,6 @@
 HorizontalSeparator < UIWidget
   image-source: /core_styles/images/horizontal_separator.png
-  image-border.top: 2
+  image-border-top: 2
   height: 2
   phantom: true
   focusable: false

modules/core_styles/styles/windows.otui

@@ -11,12 +11,29 @@ Window < UIWindow
   image-border: 4
   image-border-top: 20
 
-  //$pressed:
-  //  opacity: 0.75
-
   $disabled:
     color: #aaaaaa88
 
+Window2 < UIWindow
+  font: verdana-11px-antialised
+  size: 200 200
+  opacity: 1
+  color: white
+  text-offset: 0 2
+  text-align: top
+  image-source: /core_styles/images/window.png
+  image-border: 4
+  image-border-top: 20
+  padding-top: 28
+  padding-left: 16
+  padding-right: 16
+  padding-bottom: 16
+  $disabled:
+    color: #aaaaaa88
+
+MainWindow < Window2
+  anchors.centerIn: parent
+
 MiniWindow < UIWindow
   font: verdana-11px-antialised
   size: 192 200
@@ -30,5 +47,3 @@ MiniWindow < UIWindow
   image-border: 4
   image-border-top: 25
 
-MainWindow < Window
-  anchors.centerIn: parent