diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index fad31f6fc..481e6a905 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -368,9 +368,21 @@ var themedButtonValues = nil,
 
 + (CPArray)themeShowcaseExcludes
 {
-    return ["alert", "cornerview", "columnHeader", "tableView", "tableHeaderRow", "tableDataView", "ruleeditor", "scrollView", "horizontalScroller", "verticalScroller", "tooltip"];
+    return ["themedAlert",
+            "themedMenuView",
+            "themedMenuItemStandardView",
+            "themedMenuItemMenuBarView",
+            "themedToolbarView",
+            "themedBordelessBridgeWindowView",
+            "themedWindowView",
+            "themedBrowser",
+            "themedRuleEditor",
+            "themedTableDataView",
+            "themedCornerview",
+            "themedTokenFieldTokenCloseButton"];
 }
 
+
 + (CPButton)makeButton
 {
     return [[CPButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 24.0)];
@@ -668,6 +680,8 @@ var themedButtonValues = nil,
     [scroller setFloatValue:0.1];
     [scroller setKnobProportion:0.5];
 
+    [scroller setStyle:CPScrollerStyleLegacy];
+
     return scroller;
 }
 
@@ -788,6 +802,8 @@ var themedButtonValues = nil,
     [scroller setFloatValue:0.1];
     [scroller setKnobProportion:0.5];
 
+    [scroller setStyle:CPScrollerStyleLegacy];
+
     return scroller;
 }
 
@@ -997,7 +1013,7 @@ var themedButtonValues = nil,
 
 + (CPTextField)themedRoundedTextField
 {
-    var textfield = [[CPTextField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 30.0)],
+    var textfield = [[CPTextField alloc] initWithFrame:CGRectMake(0.0, 0.0, 160.0, 30.0)],
         bezelColor = PatternColor(
             [
                 ["textfield-bezel-rounded-left.png", 15.0, 30.0],
@@ -1056,7 +1072,7 @@ var themedButtonValues = nil,
 
 + (CPSearchField)themedSearchField
 {
-    var searchField = [[CPSearchField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 30.0)],
+    var searchField = [[CPSearchField alloc] initWithFrame:CGRectMake(0.0, 0.0, 160.0, 30.0)],
 
         imageSearch = PatternImage("search-field-search.png", 25.0, 22.0),
         imageFind = PatternImage("search-field-find.png", 25.0, 22.0),
@@ -2010,7 +2026,7 @@ var themedButtonValues = nil,
 
 + (_CPToolTipWindowView)themedTooltip
 {
-    var toolTipView = [[_CPToolTipWindowView alloc] initWithFrame:CGRectMakeZero() styleMask:_CPToolTipWindowMask],
+    var toolTipView = [[_CPToolTipWindowView alloc] initWithFrame:CGRectMake(0.0, 0.0, 200.0, 100.0) styleMask:_CPToolTipWindowMask],
 
         themeValues =
         [
@@ -2189,7 +2205,7 @@ var themedButtonValues = nil,
 
 + (CPShadowView)themedShadowView
 {
-    var shadowView = [[CPShadowView alloc] initWithFrame:CGRectMakeZero()],
+    var shadowView = [[CPShadowView alloc] initWithFrame:CGRectMake(0.0, 0.0, 100, 100)],
 
         lightColor = PatternColor(
         [
@@ -2253,7 +2269,7 @@ var themedButtonValues = nil,
 
 + (_CPModalWindowView)themedModalWindowView
 {
-    var modalWindowView = [[_CPModalWindowView alloc] initWithFrame:CGRectMake(0,0,400,300) styleMask:_CPModalWindowView];
+    var modalWindowView = [[_CPModalWindowView alloc] initWithFrame:CGRectMake(0,0,200,200) styleMask:_CPModalWindowView];
 
     var bezelColor = PatternColor(
         [
@@ -2315,7 +2331,7 @@ var themedButtonValues = nil,
 
 + (_CPHUDWindowView)themedHUDWindowView
 {
-    var HUDWindowView = [[_CPHUDWindowView alloc] initWithFrame:CGRectMake(0,0,250,150) styleMask:CPHUDBackgroundWindowMask | CPClosableWindowMask],
+    var HUDWindowView = [[_CPHUDWindowView alloc] initWithFrame:CGRectMake(0,0,200,200) styleMask:CPHUDBackgroundWindowMask | CPClosableWindowMask],
 
         HUDBezelColor = PatternColor(
         [
@@ -2361,7 +2377,7 @@ var themedButtonValues = nil,
 
 + (_CPStandardWindowView)themedStandardWindowView
 {
-    var standardWindowView = [[_CPStandardWindowView alloc] initWithFrame:CGRectMake(0,0,200,300) styleMask:CPClosableWindowMask],
+    var standardWindowView = [[_CPStandardWindowView alloc] initWithFrame:CGRectMake(0,0,200,200) styleMask:CPClosableWindowMask],
 
         bezelHeadColor = PatternColor(
         [
@@ -2450,7 +2466,7 @@ var themedButtonValues = nil,
 
 + (_CPDocModalWindowView)themedDocModalWindowView
 {
-    var docModalWindowView = [[_CPDocModalWindowView alloc] initWithFrame:CGRectMake(0,0,200,300) styleMask:nil],
+    var docModalWindowView = [[_CPDocModalWindowView alloc] initWithFrame:CGRectMake(0,0,200,200) styleMask:nil],
 
         bezelColor = PatternColor(
         [
diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j
index c8b9a8ae9..979502794 100644
--- a/AppKit/Themes/Aristo2/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j
@@ -70,6 +70,22 @@ var themedButtonValues = nil,
     return @"Aristo2";
 }
 
++ (CPArray)themeShowcaseExcludes
+{
+    return ["themedAlert",
+            "themedMenuView",
+            "themedMenuItemStandardView",
+            "themedMenuItemMenuBarView",
+            "themedToolbarView",
+            "themedBordelessBridgeWindowView",
+            "themedWindowView",
+            "themedBrowser",
+            "themedRuleEditor",
+            "themedTableDataView",
+            "themedCornerview",
+            "themedTokenFieldTokenCloseButton"];
+}
+
 + (CPButton)makeButton
 {
     return [[CPButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 25)];
@@ -891,7 +907,7 @@ var themedButtonValues = nil,
             [@"bezel-inset",    CGInsetMake(0.0, 0.0, 0.0, 0.0),    CPThemeStateBordered],
             [@"bezel-inset",    CGInsetMake(0.0, 0.0, 0.0, 0.0),    CPThemeStateBordered | CPThemeStateHighlighted],
 
-            [@"offset",         CGPointMake(18, 6),                 CPThemeStateBordered]
+            [@"offset",         CGPointMake(17, 6),                 CPThemeStateBordered]
         ];
 
     [self registerThemeValues:themeValues forView:button];