diff --git a/bazaar/Theme/Theme.cpp b/bazaar/Theme/Theme.cpp
index 5dc620369..94b4320e2 100644
--- a/bazaar/Theme/Theme.cpp
+++ b/bazaar/Theme/Theme.cpp
@@ -271,6 +271,8 @@ void Theme::LoadMenuBar(MenuBar::Style& d, const VectorMap<String, String>& set,
 		(d.topbar,			"TopBar")
 		(d.topitem,			"TopItem",		3)
 		(d.topitemtext,		"topitemtext",	3)
+		(d.separator.l1,	"separatorl1")
+		(d.separator.l2,	"separatorl2")
 	;
 }
 
diff --git a/bazaar/Themes/Skulpture/Default/Progress/ProgressVChunk.PNG b/bazaar/Themes/Skulpture/Default/Progress/ProgressVChunk.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Default/Progress/ProgressVChunk.PNG
rename to bazaar/Themes/Skulpture/Default/Progress/ProgressVChunk.png
diff --git a/bazaar/Themes/Skulpture/Stone/Button/Button0.png b/bazaar/Themes/Skulpture/Stone/Button/ButtonLook0.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/Button/Button0.png
rename to bazaar/Themes/Skulpture/Stone/Button/ButtonLook0.png
diff --git a/bazaar/Themes/Skulpture/Stone/Button/Button1.png b/bazaar/Themes/Skulpture/Stone/Button/ButtonLook1.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/Button/Button1.png
rename to bazaar/Themes/Skulpture/Stone/Button/ButtonLook1.png
diff --git a/bazaar/Themes/Skulpture/Stone/Button/Button2.png b/bazaar/Themes/Skulpture/Stone/Button/ButtonLook2.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/Button/Button2.png
rename to bazaar/Themes/Skulpture/Stone/Button/ButtonLook2.png
diff --git a/bazaar/Themes/Skulpture/Stone/Button/Button3.png b/bazaar/Themes/Skulpture/Stone/Button/ButtonLook3.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/Button/Button3.png
rename to bazaar/Themes/Skulpture/Stone/Button/ButtonLook3.png
diff --git a/bazaar/Themes/Skulpture/Stone/EditField/EditField0.png b/bazaar/Themes/Skulpture/Stone/DropChoice/DropChoiceEdge0.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/EditField/EditField0.png
rename to bazaar/Themes/Skulpture/Stone/DropChoice/DropChoiceEdge0.png
diff --git a/bazaar/Themes/Skulpture/Stone/EditField/EditField1.png b/bazaar/Themes/Skulpture/Stone/DropList/DropListEdge0.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/EditField/EditField1.png
rename to bazaar/Themes/Skulpture/Stone/DropList/DropListEdge0.png
diff --git a/bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButton0.png b/bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButtonLook0.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButton0.png
rename to bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButtonLook0.png
diff --git a/bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButton1.png b/bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButtonLook1.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButton1.png
rename to bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButtonLook1.png
diff --git a/bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButton2.png b/bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButtonLook2.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButton2.png
rename to bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButtonLook2.png
diff --git a/bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButton3.png b/bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButtonLook3.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButton3.png
rename to bazaar/Themes/Skulpture/Stone/EdgeButton/EdgeButtonLook3.png
diff --git a/bazaar/Themes/Skulpture/Stone/EditField/EditField2.png b/bazaar/Themes/Skulpture/Stone/EditField/EditFieldEdge0.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/EditField/EditField2.png
rename to bazaar/Themes/Skulpture/Stone/EditField/EditFieldEdge0.png
diff --git a/bazaar/Themes/Skulpture/Stone/EditField/EditField3.png b/bazaar/Themes/Skulpture/Stone/EditField/EditFieldEdge1.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/EditField/EditField3.png
rename to bazaar/Themes/Skulpture/Stone/EditField/EditFieldEdge1.png
diff --git a/bazaar/Themes/Skulpture/Stone/EditField/EditFieldEdge2.png b/bazaar/Themes/Skulpture/Stone/EditField/EditFieldEdge2.png
new file mode 100644
index 000000000..52353090d
Binary files /dev/null and b/bazaar/Themes/Skulpture/Stone/EditField/EditFieldEdge2.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/EditField/EditFieldEdge3.png b/bazaar/Themes/Skulpture/Stone/EditField/EditFieldEdge3.png
new file mode 100644
index 000000000..52353090d
Binary files /dev/null and b/bazaar/Themes/Skulpture/Stone/EditField/EditFieldEdge3.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/LeftEdgeButton/LeftEdgeButtonLook0.png b/bazaar/Themes/Skulpture/Stone/LeftEdgeButton/LeftEdgeButtonLook0.png
new file mode 100644
index 000000000..b907389d3
Binary files /dev/null and b/bazaar/Themes/Skulpture/Stone/LeftEdgeButton/LeftEdgeButtonLook0.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/LeftEdgeButton/LeftEdgeButtonLook1.png b/bazaar/Themes/Skulpture/Stone/LeftEdgeButton/LeftEdgeButtonLook1.png
new file mode 100644
index 000000000..ecf2d3d8e
Binary files /dev/null and b/bazaar/Themes/Skulpture/Stone/LeftEdgeButton/LeftEdgeButtonLook1.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/LeftEdgeButton/LeftEdgeButtonLook2.png b/bazaar/Themes/Skulpture/Stone/LeftEdgeButton/LeftEdgeButtonLook2.png
new file mode 100644
index 000000000..ecf2d3d8e
Binary files /dev/null and b/bazaar/Themes/Skulpture/Stone/LeftEdgeButton/LeftEdgeButtonLook2.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/LeftEdgeButton/LeftEdgeButtonLook3.png b/bazaar/Themes/Skulpture/Stone/LeftEdgeButton/LeftEdgeButtonLook3.png
new file mode 100644
index 000000000..ecf2d3d8e
Binary files /dev/null and b/bazaar/Themes/Skulpture/Stone/LeftEdgeButton/LeftEdgeButtonLook3.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/MenuBar/MenuFrame.png b/bazaar/Themes/Skulpture/Stone/MenuBar/MenuPopupFrame.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/MenuBar/MenuFrame.png
rename to bazaar/Themes/Skulpture/Stone/MenuBar/MenuPopupFrame.png
diff --git a/bazaar/Themes/Skulpture/Stone/MenuBar/MenuTop0.png b/bazaar/Themes/Skulpture/Stone/MenuBar/MenuTopItem0.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/MenuBar/MenuTop0.png
rename to bazaar/Themes/Skulpture/Stone/MenuBar/MenuTopItem0.png
diff --git a/bazaar/Themes/Skulpture/Stone/MenuBar/MenuTop1.png b/bazaar/Themes/Skulpture/Stone/MenuBar/MenuTopItem1.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/MenuBar/MenuTop1.png
rename to bazaar/Themes/Skulpture/Stone/MenuBar/MenuTopItem1.png
diff --git a/bazaar/Themes/Skulpture/Stone/MenuBar/MenuTop2.png b/bazaar/Themes/Skulpture/Stone/MenuBar/MenuTopItem2.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/MenuBar/MenuTop2.png
rename to bazaar/Themes/Skulpture/Stone/MenuBar/MenuTopItem2.png
diff --git a/bazaar/Themes/Skulpture/Stone/OkButton/OkButton0.png b/bazaar/Themes/Skulpture/Stone/OkButton/OkButtonLook0.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/OkButton/OkButton0.png
rename to bazaar/Themes/Skulpture/Stone/OkButton/OkButtonLook0.png
diff --git a/bazaar/Themes/Skulpture/Stone/OkButton/OkButton1.png b/bazaar/Themes/Skulpture/Stone/OkButton/OkButtonLook1.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/OkButton/OkButton1.png
rename to bazaar/Themes/Skulpture/Stone/OkButton/OkButtonLook1.png
diff --git a/bazaar/Themes/Skulpture/Stone/OkButton/OkButton2.png b/bazaar/Themes/Skulpture/Stone/OkButton/OkButtonLook2.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/OkButton/OkButton2.png
rename to bazaar/Themes/Skulpture/Stone/OkButton/OkButtonLook2.png
diff --git a/bazaar/Themes/Skulpture/Stone/OkButton/OkButton3.png b/bazaar/Themes/Skulpture/Stone/OkButton/OkButtonLook3.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/OkButton/OkButton3.png
rename to bazaar/Themes/Skulpture/Stone/OkButton/OkButtonLook3.png
diff --git a/bazaar/Themes/Skulpture/Stone/Progress/ProgressVChunk.png b/bazaar/Themes/Skulpture/Stone/Progress/ProgressVChunk.png
new file mode 100644
index 000000000..6c15d333b
Binary files /dev/null and b/bazaar/Themes/Skulpture/Stone/Progress/ProgressVChunk.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/Progress/ProgressVLook.png b/bazaar/Themes/Skulpture/Stone/Progress/ProgressVLook.png
new file mode 100644
index 000000000..48b5ae918
Binary files /dev/null and b/bazaar/Themes/Skulpture/Stone/Progress/ProgressVLook.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButton3.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButton3.png
deleted file mode 100644
index 38cd83131..000000000
Binary files a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButton3.png and /dev/null differ
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButton0.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButtonLook0.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButton0.png
rename to bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButtonLook0.png
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButton1.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButtonLook1.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButton1.png
rename to bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButtonLook1.png
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButton2.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButtonLook2.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButton2.png
rename to bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButtonLook2.png
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButtonLook3.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButtonLook3.png
new file mode 100644
index 000000000..32b1757eb
Binary files /dev/null and b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollDownButtonLook3.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollHLower3.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollHLower3.png
index 0a1030335..836268770 100644
Binary files a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollHLower3.png and b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollHLower3.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollHUpper3.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollHUpper3.png
index 61f19e5a4..3de80aaa5 100644
Binary files a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollHUpper3.png and b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollHUpper3.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButton3.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButton3.png
deleted file mode 100644
index c1dd0e7e7..000000000
Binary files a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButton3.png and /dev/null differ
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButton0.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButtonLook0.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButton0.png
rename to bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButtonLook0.png
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButton1.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButtonLook1.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButton1.png
rename to bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButtonLook1.png
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButton2.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButtonLook2.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButton2.png
rename to bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButtonLook2.png
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButtonLook3.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButtonLook3.png
new file mode 100644
index 000000000..a534c7750
Binary files /dev/null and b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollLeftButtonLook3.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButton3.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButton3.png
deleted file mode 100644
index 46936700c..000000000
Binary files a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButton3.png and /dev/null differ
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButton0.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButtonLook0.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButton0.png
rename to bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButtonLook0.png
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButton1.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButtonLook1.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButton1.png
rename to bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButtonLook1.png
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButton2.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButtonLook2.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButton2.png
rename to bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButtonLook2.png
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButtonLook3.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButtonLook3.png
new file mode 100644
index 000000000..22bb9b47e
Binary files /dev/null and b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollRightButtonLook3.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButton3.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButton3.png
deleted file mode 100644
index 0d83771de..000000000
Binary files a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButton3.png and /dev/null differ
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButton0.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButtonLook0.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButton0.png
rename to bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButtonLook0.png
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButton1.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButtonLook1.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButton1.png
rename to bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButtonLook1.png
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButton2.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButtonLook2.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButton2.png
rename to bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButtonLook2.png
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButtonLook3.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButtonLook3.png
new file mode 100644
index 000000000..647c62824
Binary files /dev/null and b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollUpButtonLook3.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollVLower3.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollVLower3.png
index 744971070..99edb5c24 100644
Binary files a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollVLower3.png and b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollVLower3.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollVUpper3.png b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollVUpper3.png
index b21f84dc9..e04f12321 100644
Binary files a/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollVUpper3.png and b/bazaar/Themes/Skulpture/Stone/ScrollBar/ScrollVUpper3.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/Spin/SpinDec0.png b/bazaar/Themes/Skulpture/Stone/Spin/SpinDecLook0.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/Spin/SpinDec0.png
rename to bazaar/Themes/Skulpture/Stone/Spin/SpinDecLook0.png
diff --git a/bazaar/Themes/Skulpture/Stone/Spin/SpinDec1.png b/bazaar/Themes/Skulpture/Stone/Spin/SpinDecLook1.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/Spin/SpinDec1.png
rename to bazaar/Themes/Skulpture/Stone/Spin/SpinDecLook1.png
diff --git a/bazaar/Themes/Skulpture/Stone/Spin/SpinDec2.png b/bazaar/Themes/Skulpture/Stone/Spin/SpinDecLook2.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/Spin/SpinDec2.png
rename to bazaar/Themes/Skulpture/Stone/Spin/SpinDecLook2.png
diff --git a/bazaar/Themes/Skulpture/Stone/Spin/SpinDec3.png b/bazaar/Themes/Skulpture/Stone/Spin/SpinDecLook3.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/Spin/SpinDec3.png
rename to bazaar/Themes/Skulpture/Stone/Spin/SpinDecLook3.png
diff --git a/bazaar/Themes/Skulpture/Stone/Spin/SpinInc0.png b/bazaar/Themes/Skulpture/Stone/Spin/SpinIncLook0.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/Spin/SpinInc0.png
rename to bazaar/Themes/Skulpture/Stone/Spin/SpinIncLook0.png
diff --git a/bazaar/Themes/Skulpture/Stone/Spin/SpinInc1.png b/bazaar/Themes/Skulpture/Stone/Spin/SpinIncLook1.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/Spin/SpinInc1.png
rename to bazaar/Themes/Skulpture/Stone/Spin/SpinIncLook1.png
diff --git a/bazaar/Themes/Skulpture/Stone/Spin/SpinInc2.png b/bazaar/Themes/Skulpture/Stone/Spin/SpinIncLook2.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/Spin/SpinInc2.png
rename to bazaar/Themes/Skulpture/Stone/Spin/SpinIncLook2.png
diff --git a/bazaar/Themes/Skulpture/Stone/Spin/SpinInc3.png b/bazaar/Themes/Skulpture/Stone/Spin/SpinIncLook3.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/Spin/SpinInc3.png
rename to bazaar/Themes/Skulpture/Stone/Spin/SpinIncLook3.png
diff --git a/bazaar/Themes/Skulpture/Stone/ToolButton/ToolButton0.png b/bazaar/Themes/Skulpture/Stone/ToolButton/ToolButtonLook0.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ToolButton/ToolButton0.png
rename to bazaar/Themes/Skulpture/Stone/ToolButton/ToolButtonLook0.png
diff --git a/bazaar/Themes/Skulpture/Stone/ToolButton/ToolButton1.png b/bazaar/Themes/Skulpture/Stone/ToolButton/ToolButtonLook1.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ToolButton/ToolButton1.png
rename to bazaar/Themes/Skulpture/Stone/ToolButton/ToolButtonLook1.png
diff --git a/bazaar/Themes/Skulpture/Stone/ToolButton/ToolButton2.png b/bazaar/Themes/Skulpture/Stone/ToolButton/ToolButtonLook2.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ToolButton/ToolButton2.png
rename to bazaar/Themes/Skulpture/Stone/ToolButton/ToolButtonLook2.png
diff --git a/bazaar/Themes/Skulpture/Stone/ToolButton/ToolButton3.png b/bazaar/Themes/Skulpture/Stone/ToolButton/ToolButtonLook3.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ToolButton/ToolButton3.png
rename to bazaar/Themes/Skulpture/Stone/ToolButton/ToolButtonLook3.png
diff --git a/bazaar/Themes/Skulpture/Stone/ToolButton/ToolButton4.png b/bazaar/Themes/Skulpture/Stone/ToolButton/ToolButtonLook4.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ToolButton/ToolButton4.png
rename to bazaar/Themes/Skulpture/Stone/ToolButton/ToolButtonLook4.png
diff --git a/bazaar/Themes/Skulpture/Stone/ToolButton/ToolButton5.png b/bazaar/Themes/Skulpture/Stone/ToolButton/ToolButtonLook5.png
similarity index 100%
rename from bazaar/Themes/Skulpture/Stone/ToolButton/ToolButton5.png
rename to bazaar/Themes/Skulpture/Stone/ToolButton/ToolButtonLook5.png
diff --git a/bazaar/Themes/Skulpture/Stone/ViewEdge/ViewEdgeEdge.png b/bazaar/Themes/Skulpture/Stone/ViewEdge/ViewEdgeEdge.png
new file mode 100644
index 000000000..52353090d
Binary files /dev/null and b/bazaar/Themes/Skulpture/Stone/ViewEdge/ViewEdgeEdge.png differ
diff --git a/bazaar/Themes/Skulpture/Stone/theme.ini b/bazaar/Themes/Skulpture/Stone/theme.ini
index 527e33408..f738c4170 100644
--- a/bazaar/Themes/Skulpture/Stone/theme.ini
+++ b/bazaar/Themes/Skulpture/Stone/theme.ini
@@ -12,6 +12,15 @@ focusmargin=3
 
 [EdgeButton]
 look[]=png
+textcolor[]=color 0 0 0
+monocolor[]=color 0 0 0
+focusmargin=1
+
+[LeftEdgeButton]
+look[]=png
+textcolor[]=color 0 0 0
+monocolor[]=color 0 0 0
+focusmargin=1
 
 [Option0]
 look[]=png
@@ -72,19 +81,49 @@ item=png hot 2 2 0 0
 topitem[]=png hot 2 2 0 0
 topitemtext[]=color 0 0 0
 popupframe=png hot 2 2 4 3
+[ToolBar]
+look=color 176 176 176
+arealook=null
 
 [EditField]
 edge[]=png hot 2 2 10 10
 
+[ViewEdge]
+edge=png hot 2 2 10 10
+
 [DropChoice]
 look[]=null
+trivial[]=null
 trivialborder=2
 border=2
+activeedge=0
+loff=0
+overpaint=0
+roff=0
+trivialsep=0
+usetrivial=0
+edge[]=png hot 2 2 11 11
+left[]=png
+right[]=png
+lmiddle[]=png
+rmiddle[]=png
 
 [DropList]
 look[]=null
+trivial[]=null
 trivialborder=2
 border=2
+activeedge=0
+loff=0
+overpaint=0
+roff=0
+trivialsep=0
+usetrivial=0
+edge[]=png hot 2 2 11 11
+left[]=png
+right[]=png
+lmiddle[]=png
+rmiddle[]=png
 
 [TabCtrl]
 body=png hot 2 2 3 3
@@ -104,13 +143,21 @@ both[0]=png hot 3 4 14 20
 both[1]=png hot 3 3 14 20
 both[2]=png hot 2 2 11 21
 both[3]=png hot 2 2 11 21
+sel=rect 2 0 2 2
+edge=rect 0 0 0 0 
+extendleft=0
+text_color[]=color 0 0 0
 
 [Progress]
 hlook=png hot 2 2 19 19
 hchunk=png hot 33 0 0 0
+vlook=png hot 2 2 19 19
+vchunk=png hot 0 0 17 33
 
 [HeaderCtrl]
 look[]=png hot 1 1 84 18
+gridadjustment=0
+pressoffset=0
 
 [Colors]
 colorface=color 176 176 176