diff --git a/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd b/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd
index 90cc10316..64a66c275 100755
Binary files a/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd and b/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd differ
diff --git a/AppKit/Themes/Aristo2/Resources/token-center-disabled.png b/AppKit/Themes/Aristo2/Resources/token-center-disabled.png
index 64a06e738..4bd0d141f 100644
Binary files a/AppKit/Themes/Aristo2/Resources/token-center-disabled.png and b/AppKit/Themes/Aristo2/Resources/token-center-disabled.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/token-center.png b/AppKit/Themes/Aristo2/Resources/token-center.png
index 762839050..164f00a04 100755
Binary files a/AppKit/Themes/Aristo2/Resources/token-center.png and b/AppKit/Themes/Aristo2/Resources/token-center.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/token-close-highlighted.png b/AppKit/Themes/Aristo2/Resources/token-close-highlighted.png
index b17cc2b35..d0f3325c2 100755
Binary files a/AppKit/Themes/Aristo2/Resources/token-close-highlighted.png and b/AppKit/Themes/Aristo2/Resources/token-close-highlighted.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/token-close.png b/AppKit/Themes/Aristo2/Resources/token-close.png
index b638f5045..63c73df43 100755
Binary files a/AppKit/Themes/Aristo2/Resources/token-close.png and b/AppKit/Themes/Aristo2/Resources/token-close.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/token-highlighted-center.png b/AppKit/Themes/Aristo2/Resources/token-highlighted-center.png
index fa948b831..bb8a61cf6 100755
Binary files a/AppKit/Themes/Aristo2/Resources/token-highlighted-center.png and b/AppKit/Themes/Aristo2/Resources/token-highlighted-center.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/token-highlighted-left.png b/AppKit/Themes/Aristo2/Resources/token-highlighted-left.png
index 6e851e3a2..583b7e184 100755
Binary files a/AppKit/Themes/Aristo2/Resources/token-highlighted-left.png and b/AppKit/Themes/Aristo2/Resources/token-highlighted-left.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/token-highlighted-right.png b/AppKit/Themes/Aristo2/Resources/token-highlighted-right.png
index 36c95c3d4..45f99e3be 100755
Binary files a/AppKit/Themes/Aristo2/Resources/token-highlighted-right.png and b/AppKit/Themes/Aristo2/Resources/token-highlighted-right.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/token-left-disabled.png b/AppKit/Themes/Aristo2/Resources/token-left-disabled.png
index de6f5aa51..8c8aadf82 100644
Binary files a/AppKit/Themes/Aristo2/Resources/token-left-disabled.png and b/AppKit/Themes/Aristo2/Resources/token-left-disabled.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/token-left.png b/AppKit/Themes/Aristo2/Resources/token-left.png
index 009452c87..5ab13f5d8 100755
Binary files a/AppKit/Themes/Aristo2/Resources/token-left.png and b/AppKit/Themes/Aristo2/Resources/token-left.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/token-right-disabled.png b/AppKit/Themes/Aristo2/Resources/token-right-disabled.png
index 86cbe135e..639d52f2e 100644
Binary files a/AppKit/Themes/Aristo2/Resources/token-right-disabled.png and b/AppKit/Themes/Aristo2/Resources/token-right-disabled.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/token-right.png b/AppKit/Themes/Aristo2/Resources/token-right.png
index d7886f5ad..b5f3885d5 100755
Binary files a/AppKit/Themes/Aristo2/Resources/token-right.png and b/AppKit/Themes/Aristo2/Resources/token-right.png differ
diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j
index 68ca43f10..ecefd447d 100644
--- a/AppKit/Themes/Aristo2/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j
@@ -796,16 +796,27 @@ var themedButtonValues = nil,
             ],
             PatternIsHorizontal),
 
+        bezelDisabledColor = PatternColor(
+            [
+                ["token-left-disabled.png", 11.0, 19.0],
+                ["token-center-disabled.png", 1.0, 19.0],
+                ["token-right-disabled.png", 11.0, 19.0]
+            ],
+            PatternIsHorizontal),
+
         textColor = [CPColor colorWithRed:41.0 / 255.0 green:51.0 / 255.0 blue:64.0 / 255.0 alpha:1.0],
         textHighlightedColor = [CPColor whiteColor],
+        textDisabledColor = [CPColor colorWithRed:41.0 / 255.0 green:51.0 / 255.0 blue:64.0 / 255.0 alpha:0.5],
 
         themeValues =
         [
             [@"bezel-color",    bezelColor,                         CPThemeStateBezeled],
             [@"bezel-color",    bezelHighlightedColor,              CPThemeStateBezeled | CPThemeStateHighlighted],
+            [@"bezel-color",    bezelDisabledColor,                 CPThemeStateBezeled | CPThemeStateDisabled],
 
             [@"text-color",     textColor],
             [@"text-color",     textHighlightedColor,               CPThemeStateHighlighted],
+            [@"text-color",     textDisabledColor,                  CPThemeStateDisabled],
 
             [@"bezel-inset",    CGInsetMake(0.0, 0.0, 0.0, 0.0),    CPThemeStateBezeled],
             [@"content-inset",  CGInsetMake(1.0, 24.0, 2.0, 16.0),  CPThemeStateBezeled],