diff --git a/internal/styles/aluminum/aluminum.tss b/internal/styles/aluminum/aluminum.tss
index 399eede..48d7e59 100644
--- a/internal/styles/aluminum/aluminum.tss
+++ b/internal/styles/aluminum/aluminum.tss
@@ -19,18 +19,18 @@ $ColorCalendarWeekend       = #c2d3c4;
 $ColorCalendarDay           = #d6dae2;
 
 // Borders
-$BorderOutline        = $ColorOutline                   / 1;
-$BorderEngraved       = #c3c3c5 #e3e3e3 #e9e9e9 #c2c2c2 / 1;
-$BorderGap            = #697c7c #566767 #566767 #697c7c / 1;
-$BorderLifted         = #f9fafc #c2c8d3 #a4afc0 #f5f6f8 / 1;
-$BorderLiftedFocused  = #f0f4f9 #b1baca #9aa6b7 #e4e9ee / 1;
-$BorderFocused        = #5f8bc4 #5f8bc4 #5f8bc4 #5f8bc4 / 1;
-$BorderTear           = $BorderEngraved;
-$BorderTearFocused    = #7f94b5 #ced7e4 #ced7e4 #7f94b5 / 1;
-$BorderTearPad        = #0000                           / 3;
-$BorderTearPadFocused = #7391c080                       / 3;
-$BorderInnerShadow    = #a4afc0                         / 1 0 0 1;
-$BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
+$BorderOutline        = $ColorOutline                  ;
+$BorderEngraved       = #c3c3c5 #e3e3e3 #e9e9e9 #c2c2c2;
+$BorderGap            = #697c7c #566767 #566767 #697c7c;
+$BorderLifted         = #f9fafc #c2c8d3 #a4afc0 #f5f6f8;
+$BorderLiftedFocused  = #f0f4f9 #b1baca #9aa6b7 #e4e9ee;
+$BorderFocused        = #5f8bc4 #5f8bc4 #5f8bc4 #5f8bc4;
+$BorderTear           = $BorderEngraved                ;
+$BorderTearFocused    = #7f94b5 #ced7e4 #ced7e4 #7f94b5;
+$BorderTearPad        = #0000                          ;
+$BorderTearPadFocused = #7391c080                      ;
+$BorderInnerShadow    = #a4afc0                        ;
+$BorderOuterShadow    = #a4afc0                        ;
 
 *.* {
 	TextColor: $ColorForeground;
@@ -39,13 +39,13 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.Button {
-	Border:  $BorderEngraved, $BorderGap, $BorderLifted;
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderLifted / 1;
 	Padding: 4 8;
 	Color:   $ColorRaised;
 }
 
 *.Button[focused] {
-	Border:  $BorderEngraved, $BorderGap, $BorderLiftedFocused;
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderLiftedFocused / 1;
 	Padding: 4 8;
 	Color:   $ColorRaisedFocused;
 }
@@ -55,23 +55,23 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.Button[pressed] {
-	Border:  $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
 	Padding: 5 8 4 9;
 	Color:   $ColorRaisedPressed;
 }
 
 *.TextInput {
-	Border:  $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
 	Padding: 5 4 4 5;
 	Color:   $ColorSunken;
 }
 
 *.TextInput[focused] {
-	Border: $BorderEngraved, $BorderFocused, $BorderInnerShadow;
+	Border: $BorderEngraved / 1, $BorderFocused / 1, $BorderInnerShadow / 1 0 0 1;
 }
 
 *.TextView {
-	Border:  $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
 	Padding: 5 4 4 5;
 	Color:   $ColorSunken;
 }
@@ -81,7 +81,7 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.Container[sunken] {
-	Border:  $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
 	Padding: 5 4 4 5;
 	Color:   $ColorSunken;
 }
@@ -92,7 +92,7 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.Container[menu] {
-	Border: $BorderGap, $BorderLifted;
+	Border: $BorderGap / 1, $BorderLifted / 1;
 	Color:  $ColorBackground;
 	Gap:    0;
 }
@@ -113,16 +113,16 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.Separator {
-	Border: $BorderEngraved;
+	Border: $BorderEngraved / 1;
 }
 
 *.Slider {
-	Border: $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Border: $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
 	Color:  $ColorGutter;
 }
 
 *.Slider[focused] {
-	Border: $BorderEngraved, $BorderFocused, $BorderInnerShadow;
+	Border: $BorderEngraved / 1, $BorderFocused / 1, $BorderInnerShadow / 1 0 0 1;
 }
 
 *.Slider[hovered] {
@@ -138,18 +138,18 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.SliderHandle {
-	Border:      $BorderOuterShadow, $BorderGap, $BorderLifted;
+	Border:      $BorderOuterShadow / 0 1 1 0, $BorderGap / 1, $BorderLifted / 1;
 	Color:       $ColorRaised;
 	MinimumSize: 12;
 }
 
 *.Scrollbar {
-	Border: $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Border: $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
 	Color:  $ColorGutter;
 }
 
 *.Scrollbar[focused] {
-	Border: $BorderEngraved, $BorderFocused, $BorderInnerShadow;
+	Border: $BorderEngraved / 1, $BorderFocused / 1, $BorderInnerShadow / 1 0 0 1;
 }
 
 *.Scrollbar[hovered] {
@@ -165,7 +165,7 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.ScrollbarHandle {
-	Border:      $BorderOuterShadow, $BorderGap, $BorderLifted;
+	Border:      $BorderOuterShadow / 0 1 1 0, $BorderGap / 1, $BorderLifted / 1;
 	Color:       $ColorRaised;
 	MinimumSize: 12;
 }
@@ -175,14 +175,14 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.Checkbox {
-	Border:      $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Border:      $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
 	Color:       $ColorSunken;
 	Padding:     0 1 1 0;
 	MinimumSize: 19;
 }
 
 *.Checkbox[focused] {
-	Border:  $BorderEngraved, $BorderFocused, $BorderInnerShadow;
+	Border:  $BorderEngraved / 1, $BorderFocused / 1, $BorderInnerShadow / 1 0 0 1;
 	Color:   $ColorSunkenFocused;
 	Padding: 0;
 }
@@ -215,19 +215,19 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.TearLine {
-	Border: $BorderTearPad, $BorderTear;
+	Border: $BorderTearPad / 3, $BorderTear / 1;
 }
 
 *.TearLine[hovered] {
-	Border: $BorderTearPadFocused, $BorderTearFocused;
+	Border: $BorderTearPadFocused / 3, $BorderTearFocused / 1;
 }
 
 *.TearLine[focused] {
-	Border: $BorderTearPadFocused, $BorderTearFocused;
+	Border: $BorderTearPadFocused / 3, $BorderTearFocused / 1;
 }
 
 *.Calendar {
-	Border:  $BorderOuterShadow, $BorderGap;
+	Border:  $BorderOuterShadow / 0 1 1 0, $BorderGap / 1;
 	Color:   $ColorRaised;
 	Padding: 2;
 	Gap:     2;
@@ -257,41 +257,53 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.TabRow {
-	Border: $BorderEngraved, $BorderGap, $BorderInnerShadow;
-	Color:  $ColorSunken;
-	Gap:    0;
+	Border:  $BorderEngraved / 1 1 0 1, $BorderGap / 1 1 0 1, $BorderInnerShadow / 1 0 0 1;
+	Color:   $ColorSunken;
+	Gap:     0;
+	Padding: 1 0 0 0;
 }
 
 *.Tab {
-	Border:  $BorderEngraved, $BorderGap, $BorderLifted;
-	Color:   $ColorRaised;
+	Border:  #0000 / 1 0 0 0, $BorderOuterShadow / 0 1 0 0, $BorderGap / 1 1 0 1, $BorderLifted / 1;
+	Color:   $ColorSunken;
+	Padding: 4 8 2 8;
+}
+
+*.Tab[active] {
+	Border:  $BorderOuterShadow / 0 1 0 0, $BorderGap / 1 1 0 1, $BorderLifted / 1 1 0 1;
+	Color:   $ColorBackground;
 	Padding: 4 8;
 }
 
+*.TabSpacer {
+	Border: $BorderLifted / 0 0 1 0;
+	MinimumSize: 1 0;
+}
+
 *.Swatch {
-	Border:      $BorderEngraved, $BorderGap;
+	Border:      $BorderEngraved / 1, $BorderGap / 1;
 	Color:       #FFF;
 	MinimumSize: 19;
 }
 
 *.Swatch[focused] {
-	Border: $BorderEngraved, $BorderFocused;
+	Border: $BorderEngraved / 1, $BorderFocused / 1;
 }
 
 *.ColorPickerMap {
-	Border:      $BorderEngraved, $BorderGap;
+	Border:      $BorderEngraved / 1, $BorderGap / 1;
 	Color:       $ColorSunken;
 	MinimumSize: 128;
 }
 
 *.Dropdown {
-	Border:  $BorderEngraved, $BorderGap, $BorderLifted;
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderLifted / 1;
 	Padding: 4 8;
 	Color:   $ColorRaised;
 }
 
 *.Dropdown[focused] {
-	Border:  $BorderEngraved, $BorderGap, $BorderLiftedFocused;
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderLiftedFocused / 1;
 	Padding: 4 8;
 	Color:   $ColorRaisedFocused;
 }
@@ -301,7 +313,7 @@ $BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
 }
 
 *.Dropdown[pressed] {
-	Border:  $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Border:  $BorderEngraved / 1, $BorderGap / 1, $BorderInnerShadow / 1 0 0 1;
 	Padding: 5 8 4 9;
 	Color:   $ColorRaisedPressed;
 }