diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j
index 4c5e8a41a..8007a0f4d 100644
--- a/AppKit/CPAlert.j
+++ b/AppKit/CPAlert.j
@@ -560,7 +560,6 @@ var bottomHeight = 71;
         [_window setMovableByWindowBackground:YES];
     }
 
-
     _needsLayout = NO;
 }
 
diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-center.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-center.png
new file mode 100644
index 000000000..835bb2e53
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-center.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-center.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-center.png
new file mode 100644
index 000000000..73ce9b719
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-center.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-left.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-left.png
new file mode 100644
index 000000000..fb6c92e7f
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-left.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-right.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-right.png
new file mode 100644
index 000000000..0ae8971cb
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-right.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-center.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-center.png
new file mode 100644
index 000000000..33051c355
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-center.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-left.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-left.png
new file mode 100644
index 000000000..84148f538
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-left.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-right.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-right.png
new file mode 100644
index 000000000..6b4b60ca3
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-right.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-left.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-left.png
new file mode 100644
index 000000000..4369e4b58
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-left.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-right.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-right.png
new file mode 100644
index 000000000..7ccd0552f
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-right.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-content-border-center.png b/AppKit/Themes/Aristo2/Resources/colorwell-content-border-center.png
new file mode 100644
index 000000000..42e6e798a
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/colorwell-content-border-center.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-content-border-left.png b/AppKit/Themes/Aristo2/Resources/colorwell-content-border-left.png
new file mode 100644
index 000000000..829450376
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/colorwell-content-border-left.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-content-border-right.png b/AppKit/Themes/Aristo2/Resources/colorwell-content-border-right.png
new file mode 100644
index 000000000..829450376
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/colorwell-content-border-right.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-center.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-center.png
new file mode 100644
index 000000000..f5d8de4c2
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-center.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-left.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-left.png
new file mode 100644
index 000000000..4ec53b31b
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-left.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-right.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-right.png
new file mode 100644
index 000000000..152acfd72
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-right.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/token-center-disabled.png b/AppKit/Themes/Aristo2/Resources/token-center-disabled.png
new file mode 100644
index 000000000..64a06e738
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/token-center-disabled.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/token-left-disabled.png b/AppKit/Themes/Aristo2/Resources/token-left-disabled.png
new file mode 100644
index 000000000..de6f5aa51
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/token-left-disabled.png differ
diff --git a/AppKit/Themes/Aristo2/Resources/token-right-disabled.png b/AppKit/Themes/Aristo2/Resources/token-right-disabled.png
new file mode 100644
index 000000000..86cbe135e
Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/token-right-disabled.png differ
diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j
index 3e742d857..447a38530 100644
--- a/AppKit/Themes/Aristo2/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j
@@ -8,6 +8,16 @@
 
 @import <BlendKit/BKThemeDescriptor.j>
 
+var themedButtonValues = nil,
+    themedTextFieldValues = nil,
+    themedVerticalScrollerValues = nil,
+    themedHorizontalScrollerValues = nil,
+    themedSegmentedControlValues = nil,
+    themedHorizontalSliderValues = nil,
+    themedVerticalSliderValues = nil,
+    themedCircularSliderValues = nil,
+    themedButtonBarValues = nil,
+    themedAlertValues = nil;
 
 @implementation Aristo2ThemeDescriptor : BKThemeDescriptor
 
@@ -636,11 +646,14 @@
 
 + (CPTokenField)themedTokenField
 {
-    var tokenfield = [[CPTokenField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 29.0)],
+    var tokenfield = [[CPTokenField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 29.0)];
 
         overrides =
         [
             [@"bezel-inset", CGInsetMakeZero()],
+            [@"bezel-inset", CGInsetMake(3.0, 4.0, 3.0, 4.0),    CPThemeStateBezeled],
+            [@"bezel-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0),    CPThemeStateBezeled | CPThemeStateEditing],
+
             [@"editor-inset", CGInsetMake(3.0, 0.0, 0.0, 0.0)],
 
             // Non-bezeled token field with tokens
@@ -650,13 +663,12 @@
             [@"content-inset", CGInsetMake(7.0, 8.0, 6.0, 8.0), CPTextFieldStatePlaceholder],
 
             // Bezeled token field with tokens
-            [@"content-inset", CGInsetMake(5.0, 5.0, 4.0, 5.0), CPThemeStateBezeled],
+            [@"content-inset", CGInsetMake(5.0, 8.0, 4.0, 8.0), CPThemeStateBezeled],
 
             // Bezeled token field with no tokens
-            [@"content-inset", CGInsetMake(8.0, 8.0, 7.0, 8.0), CPThemeStateBezeled | CPTextFieldStatePlaceholder]
+            [@"content-inset", CGInsetMake(10.0, 8.0, 7.0, 8.0), CPThemeStateBezeled | CPTextFieldStatePlaceholder],
         ];
 
-
     [self registerThemeValues:overrides forView:tokenfield inherit:themedTextFieldValues];
 
     return tokenfield;