diff --git a/AppKit/Themes/Aristo/Resources/window-standard-bottom-center.png b/AppKit/Themes/Aristo/Resources/window-standard-bottom-center.png
new file mode 100644
index 000000000..d8c58c74a
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-bottom-center.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-bottom-left.png b/AppKit/Themes/Aristo/Resources/window-standard-bottom-left.png
new file mode 100644
index 000000000..d2a572874
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-bottom-left.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-bottom-right.png b/AppKit/Themes/Aristo/Resources/window-standard-bottom-right.png
new file mode 100644
index 000000000..aec8be6a1
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-bottom-right.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-button-highlighted.png b/AppKit/Themes/Aristo/Resources/window-standard-button-highlighted.png
new file mode 100644
index 000000000..ab5946cbd
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-button-highlighted.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-button-unsaved.png b/AppKit/Themes/Aristo/Resources/window-standard-button-unsaved.png
new file mode 100644
index 000000000..d5fe88d8c
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-button-unsaved.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-center-center.png b/AppKit/Themes/Aristo/Resources/window-standard-center-center.png
new file mode 100644
index 000000000..c00f5bc7f
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-center-center.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-center-left.png b/AppKit/Themes/Aristo/Resources/window-standard-center-left.png
new file mode 100644
index 000000000..eed2fa04b
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-center-left.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-center-right.png b/AppKit/Themes/Aristo/Resources/window-standard-center-right.png
new file mode 100644
index 000000000..ff48a1ae8
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-center-right.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-close-button-unsaved-highlighted.png b/AppKit/Themes/Aristo/Resources/window-standard-close-button-unsaved-highlighted.png
new file mode 100644
index 000000000..9681c5a2e
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-close-button-unsaved-highlighted.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-close-button.png b/AppKit/Themes/Aristo/Resources/window-standard-close-button.png
new file mode 100644
index 000000000..d29d5fbca
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-close-button.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-maximize-button-highlighted.png b/AppKit/Themes/Aristo/Resources/window-standard-maximize-button-highlighted.png
new file mode 100644
index 000000000..d72cfa6a9
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-maximize-button-highlighted.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-maximize-button.png b/AppKit/Themes/Aristo/Resources/window-standard-maximize-button.png
new file mode 100644
index 000000000..2c044317e
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-maximize-button.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-minimize-button-highlighted.png b/AppKit/Themes/Aristo/Resources/window-standard-minimize-button-highlighted.png
new file mode 100644
index 000000000..ab3765c79
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-minimize-button-highlighted.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-minimize-button.png b/AppKit/Themes/Aristo/Resources/window-standard-minimize-button.png
new file mode 100644
index 000000000..a63d93f54
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-minimize-button.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-top-center.png b/AppKit/Themes/Aristo/Resources/window-standard-top-center.png
new file mode 100644
index 000000000..5c8859704
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-top-center.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-top-left.png b/AppKit/Themes/Aristo/Resources/window-standard-top-left.png
new file mode 100644
index 000000000..2f62aff05
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-top-left.png differ
diff --git a/AppKit/Themes/Aristo/Resources/window-standard-top-right.png b/AppKit/Themes/Aristo/Resources/window-standard-top-right.png
new file mode 100644
index 000000000..a5d5c83f1
Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/window-standard-top-right.png differ
diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 79309572a..c5268dd39 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -2345,15 +2345,15 @@ var themedButtonValues = nil,
 
         bezelColor = PatternColor(
         [
-            [@"window-standard-top-left.png",5,5],
-            [@"window-standard-top-center.png",1,5],
-            [@"window-standard-top-right.png",5,5],
-            [@"window-standard-center-left.png",5,1],
-            [@"window-standard-center-center.png",1,1],
-            [@"window-standard-center-right.png",5,1],
-            [@"window-standard-bottom-left.png",5,5],
-            [@"window-standard-bottom-center.png",1,5],
-            [@"window-standard-bottom-right.png",5,5]
+            [@"window-standard-top-left.png", 2.0, 1.0],
+            [@"window-standard-top-center.png", 1.0, 1.0],
+            [@"window-standard-top-right.png", 2.0, 1.0],
+            [@"window-standard-center-left.png", 2.0, 1.0],
+            [@"window-standard-center-center.png", 1.0, 1.0],
+            [@"window-standard-center-right.png", 2.0, 1.0],
+            [@"window-standard-bottom-left.png", 2.0, 2.0],
+            [@"window-standard-bottom-center.png", 1.0, 2.0],
+            [@"window-standard-bottom-right.png", 2.0, 2.0]
         ]),
 
         closeButtonImage =                  PatternImage(@"window-standard-close-button.png", 16, 16),
@@ -2409,15 +2409,15 @@ var themedButtonValues = nil,
 
         bezelColor = PatternColor(
         [
-            [@"window-standard-top-left.png",5,5],
-            [@"window-standard-top-center.png",1,5],
-            [@"window-standard-top-right.png",5,5],
-            [@"window-standard-center-left.png",5,1],
-            [@"window-standard-center-center.png",1,1],
-            [@"window-standard-center-right.png",5,1],
-            [@"window-standard-bottom-left.png",5,5],
-            [@"window-standard-bottom-center.png",1,5],
-            [@"window-standard-bottom-right.png",5,5]
+            [@"window-standard-top-left.png", 2.0, 1.0],
+            [@"window-standard-top-center.png", 1.0, 1.0],
+            [@"window-standard-top-right.png", 2.0, 1.0],
+            [@"window-standard-center-left.png", 2.0, 1.0],
+            [@"window-standard-center-center.png", 1.0, 1.0],
+            [@"window-standard-center-right.png", 2.0, 1.0],
+            [@"window-standard-bottom-left.png", 2.0, 2.0],
+            [@"window-standard-bottom-center.png", 1.0, 2.0],
+            [@"window-standard-bottom-right.png", 2.0, 2.0]
         ]),
 
         sheetShadow = PatternColor(@"window-attached-sheet-shadow.png", 9, 8),