diff --git a/Theme/Chicago95/cinnamon/background-assets/desklet.png b/Theme/Chicago95/cinnamon/background-assets/desklet.png
deleted file mode 100755
index fb43707..0000000
Binary files a/Theme/Chicago95/cinnamon/background-assets/desklet.png and /dev/null differ
diff --git a/Theme/Chicago95/cinnamon/background-assets/desklet.png b/Theme/Chicago95/cinnamon/background-assets/desklet.png
new file mode 120000
index 0000000..7885831
--- /dev/null
+++ b/Theme/Chicago95/cinnamon/background-assets/desklet.png
@@ -0,0 +1 @@
+../button-assets/button.png
\ No newline at end of file
diff --git a/Theme/Chicago95/cinnamon/background-assets/header.png b/Theme/Chicago95/cinnamon/background-assets/header.png
deleted file mode 100755
index fb43707..0000000
Binary files a/Theme/Chicago95/cinnamon/background-assets/header.png and /dev/null differ
diff --git a/Theme/Chicago95/cinnamon/background-assets/header.png b/Theme/Chicago95/cinnamon/background-assets/header.png
new file mode 120000
index 0000000..7885831
--- /dev/null
+++ b/Theme/Chicago95/cinnamon/background-assets/header.png
@@ -0,0 +1 @@
+../button-assets/button.png
\ No newline at end of file
diff --git a/Theme/Chicago95/cinnamon/background-assets/keyboard-bg.png b/Theme/Chicago95/cinnamon/background-assets/keyboard-bg.png
deleted file mode 100755
index fb43707..0000000
Binary files a/Theme/Chicago95/cinnamon/background-assets/keyboard-bg.png and /dev/null differ
diff --git a/Theme/Chicago95/cinnamon/background-assets/keyboard-bg.png b/Theme/Chicago95/cinnamon/background-assets/keyboard-bg.png
new file mode 120000
index 0000000..7885831
--- /dev/null
+++ b/Theme/Chicago95/cinnamon/background-assets/keyboard-bg.png
@@ -0,0 +1 @@
+../button-assets/button.png
\ No newline at end of file
diff --git a/Theme/Chicago95/cinnamon/background-assets/menu.png b/Theme/Chicago95/cinnamon/background-assets/menu.png
deleted file mode 100755
index fb43707..0000000
Binary files a/Theme/Chicago95/cinnamon/background-assets/menu.png and /dev/null differ
diff --git a/Theme/Chicago95/cinnamon/background-assets/menu.png b/Theme/Chicago95/cinnamon/background-assets/menu.png
new file mode 120000
index 0000000..7885831
--- /dev/null
+++ b/Theme/Chicago95/cinnamon/background-assets/menu.png
@@ -0,0 +1 @@
+../button-assets/button.png
\ No newline at end of file
diff --git a/Theme/Chicago95/cinnamon/button-assets/button-focus-hover.png b/Theme/Chicago95/cinnamon/button-assets/button-focus-hover.png
deleted file mode 100755
index fb43707..0000000
Binary files a/Theme/Chicago95/cinnamon/button-assets/button-focus-hover.png and /dev/null differ
diff --git a/Theme/Chicago95/cinnamon/button-assets/button-focus-hover.png b/Theme/Chicago95/cinnamon/button-assets/button-focus-hover.png
new file mode 120000
index 0000000..a10b955
--- /dev/null
+++ b/Theme/Chicago95/cinnamon/button-assets/button-focus-hover.png
@@ -0,0 +1 @@
+button.png
\ No newline at end of file
diff --git a/Theme/Chicago95/cinnamon/button-assets/button-focus.png b/Theme/Chicago95/cinnamon/button-assets/button-focus.png
deleted file mode 100755
index fb43707..0000000
Binary files a/Theme/Chicago95/cinnamon/button-assets/button-focus.png and /dev/null differ
diff --git a/Theme/Chicago95/cinnamon/button-assets/button-focus.png b/Theme/Chicago95/cinnamon/button-assets/button-focus.png
new file mode 120000
index 0000000..a10b955
--- /dev/null
+++ b/Theme/Chicago95/cinnamon/button-assets/button-focus.png
@@ -0,0 +1 @@
+button.png
\ No newline at end of file
diff --git a/Theme/Chicago95/cinnamon/button-assets/button-hover.png b/Theme/Chicago95/cinnamon/button-assets/button-hover.png
deleted file mode 100755
index fb43707..0000000
Binary files a/Theme/Chicago95/cinnamon/button-assets/button-hover.png and /dev/null differ
diff --git a/Theme/Chicago95/cinnamon/button-assets/button-hover.png b/Theme/Chicago95/cinnamon/button-assets/button-hover.png
new file mode 120000
index 0000000..a10b955
--- /dev/null
+++ b/Theme/Chicago95/cinnamon/button-assets/button-hover.png
@@ -0,0 +1 @@
+button.png
\ No newline at end of file
diff --git a/Theme/Chicago95/cinnamon/button-assets/button.png b/Theme/Chicago95/cinnamon/button-assets/button.png
index fb43707..c0f7d70 100755
Binary files a/Theme/Chicago95/cinnamon/button-assets/button.png and b/Theme/Chicago95/cinnamon/button-assets/button.png differ
diff --git a/Theme/Chicago95/cinnamon/cinnamon.css b/Theme/Chicago95/cinnamon/cinnamon.css
index 1438127..464d138 100755
--- a/Theme/Chicago95/cinnamon/cinnamon.css
+++ b/Theme/Chicago95/cinnamon/cinnamon.css
@@ -117,7 +117,7 @@ StScrollBar StButton#hhandle {
   border-radius: 0px;
   width: 250px;
   min-height: 16px;
-  border: 1px solid #808080;
+  border-image: url("misc-assets/entry.png") 6;
   background-color: white;
   selected-color: white;
   caret-color: black;
@@ -948,7 +948,8 @@ StScrollBar StButton#hhandle {
 
 .menu-applications-inner-box {
   margin: 8px;
-  border: 1px solid #808080;
+  border: 2px solid #808080;
+  border-image: url("frame/frame_menu.png") 6;
   padding-top: 10px;
   padding-left: 10px;
   padding-right: 10px;
diff --git a/Theme/Chicago95/cinnamon/control-assets/switch-off.png b/Theme/Chicago95/cinnamon/control-assets/switch-off.png
deleted file mode 100755
index a82b891..0000000
Binary files a/Theme/Chicago95/cinnamon/control-assets/switch-off.png and /dev/null differ
diff --git a/Theme/Chicago95/cinnamon/control-assets/switch-off.png b/Theme/Chicago95/cinnamon/control-assets/switch-off.png
new file mode 120000
index 0000000..7cf9646
--- /dev/null
+++ b/Theme/Chicago95/cinnamon/control-assets/switch-off.png
@@ -0,0 +1 @@
+checkbox-unchecked.png
\ No newline at end of file
diff --git a/Theme/Chicago95/cinnamon/control-assets/switch-on.png b/Theme/Chicago95/cinnamon/control-assets/switch-on.png
deleted file mode 100755
index a2ce348..0000000
Binary files a/Theme/Chicago95/cinnamon/control-assets/switch-on.png and /dev/null differ
diff --git a/Theme/Chicago95/cinnamon/control-assets/switch-on.png b/Theme/Chicago95/cinnamon/control-assets/switch-on.png
new file mode 120000
index 0000000..d506341
--- /dev/null
+++ b/Theme/Chicago95/cinnamon/control-assets/switch-on.png
@@ -0,0 +1 @@
+checkbox-checked.png
\ No newline at end of file
diff --git a/Theme/Chicago95/cinnamon/frame/frame.png b/Theme/Chicago95/cinnamon/frame/frame.png
old mode 100755
new mode 100644
index dd34cd2..401332c
Binary files a/Theme/Chicago95/cinnamon/frame/frame.png and b/Theme/Chicago95/cinnamon/frame/frame.png differ
diff --git a/Theme/Chicago95/cinnamon/frame/frame_menu.png b/Theme/Chicago95/cinnamon/frame/frame_menu.png
new file mode 100644
index 0000000..4aa39b0
Binary files /dev/null and b/Theme/Chicago95/cinnamon/frame/frame_menu.png differ
diff --git a/Theme/Chicago95/cinnamon/misc-assets/entry.png b/Theme/Chicago95/cinnamon/misc-assets/entry.png
index 7925860..fec7353 100755
Binary files a/Theme/Chicago95/cinnamon/misc-assets/entry.png and b/Theme/Chicago95/cinnamon/misc-assets/entry.png differ
diff --git a/Theme/Chicago95/cinnamon/misc-assets/hover-2.png b/Theme/Chicago95/cinnamon/misc-assets/hover-2.png
deleted file mode 100755
index c7b38ff..0000000
Binary files a/Theme/Chicago95/cinnamon/misc-assets/hover-2.png and /dev/null differ
diff --git a/Theme/Chicago95/cinnamon/misc-assets/hover-2.png b/Theme/Chicago95/cinnamon/misc-assets/hover-2.png
new file mode 120000
index 0000000..c5454a2
--- /dev/null
+++ b/Theme/Chicago95/cinnamon/misc-assets/hover-2.png
@@ -0,0 +1 @@
+hover.png
\ No newline at end of file
diff --git a/Theme/Chicago95/cinnamon/panel-assets/button.png b/Theme/Chicago95/cinnamon/panel-assets/button.png
index 19e8977..a33c5a2 100755
Binary files a/Theme/Chicago95/cinnamon/panel-assets/button.png and b/Theme/Chicago95/cinnamon/panel-assets/button.png differ
diff --git a/Theme/Chicago95/cinnamon/panel-assets/button_attention.png b/Theme/Chicago95/cinnamon/panel-assets/button_attention.png
index 1fe23d3..5597e94 100755
Binary files a/Theme/Chicago95/cinnamon/panel-assets/button_attention.png and b/Theme/Chicago95/cinnamon/panel-assets/button_attention.png differ
diff --git a/Theme/Chicago95/cinnamon/panel-assets/button_selected.png b/Theme/Chicago95/cinnamon/panel-assets/button_selected.png
deleted file mode 100755
index 36061ce..0000000
Binary files a/Theme/Chicago95/cinnamon/panel-assets/button_selected.png and /dev/null differ
diff --git a/Theme/Chicago95/cinnamon/panel-assets/button_selected.png b/Theme/Chicago95/cinnamon/panel-assets/button_selected.png
new file mode 120000
index 0000000..b71da07
--- /dev/null
+++ b/Theme/Chicago95/cinnamon/panel-assets/button_selected.png
@@ -0,0 +1 @@
+pressed.png
\ No newline at end of file
diff --git a/Theme/Chicago95/cinnamon/panel-assets/hover-1.png b/Theme/Chicago95/cinnamon/panel-assets/hover-1.png
deleted file mode 100755
index 19e8977..0000000
Binary files a/Theme/Chicago95/cinnamon/panel-assets/hover-1.png and /dev/null differ
diff --git a/Theme/Chicago95/cinnamon/panel-assets/hover-1.png b/Theme/Chicago95/cinnamon/panel-assets/hover-1.png
new file mode 120000
index 0000000..a10b955
--- /dev/null
+++ b/Theme/Chicago95/cinnamon/panel-assets/hover-1.png
@@ -0,0 +1 @@
+button.png
\ No newline at end of file
diff --git a/Theme/Chicago95/cinnamon/thumbnail.png b/Theme/Chicago95/cinnamon/thumbnail.png
index 5ec3370..7598094 100755
Binary files a/Theme/Chicago95/cinnamon/thumbnail.png and b/Theme/Chicago95/cinnamon/thumbnail.png differ
diff --git a/Theme/Chicago95/gtk-3.0/thumbnail.png b/Theme/Chicago95/gtk-3.0/thumbnail.png
new file mode 100755
index 0000000..48ae00d
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/thumbnail.png differ
diff --git a/Theme/Chicago95/gtk-3.24/thumbnail.png b/Theme/Chicago95/gtk-3.24/thumbnail.png
new file mode 100755
index 0000000..48ae00d
Binary files /dev/null and b/Theme/Chicago95/gtk-3.24/thumbnail.png differ