diff --git a/Themes/Notch/Date.inc b/Themes/Notch/Date.inc
index b76e477..7c469a6 100644
--- a/Themes/Notch/Date.inc
+++ b/Themes/Notch/Date.inc
@@ -74,7 +74,5 @@ Container = DateContainer
 Meter = Shape
 X = (#Bar_OffsetX#+#Date_X#)
 Y = #Bar_OffsetY#
-W = ([DateIcon:W] + [Date:W] + 5)
-H = #Bar_Height#
-SolidColor=0,0,0
+Shape = Rectangle 0,0,([DateIcon:W] + [Date:W] + 5),#Bar_Height# | StrokeWidth 0
 DynamicVariables = 1
diff --git a/Themes/Notch/Music.inc b/Themes/Notch/Music.inc
index 1479bc1..042fe69 100644
--- a/Themes/Notch/Music.inc
+++ b/Themes/Notch/Music.inc
@@ -85,7 +85,5 @@ Container = MusicContainer
 Meter = Shape
 X=(#Bar_OffsetX#+#music_X#)
 Y=#Bar_OffsetY#
-H=#Bar_Height#
-W=([MusicIcon:W] + [MusicTrackTitle:W] + 5)
-SolidColor=0,0,0
+Shape = Rectangle 0,0,([MusicIcon:W] + [MusicTrackTitle:W] + 5),#Bar_Height# | StrokeWidth 0
 DynamicVariables = 1
diff --git a/Themes/Notch/Uptime.inc b/Themes/Notch/Uptime.inc
index d9deaee..f67f990 100644
--- a/Themes/Notch/Uptime.inc
+++ b/Themes/Notch/Uptime.inc
@@ -48,7 +48,5 @@ Container = UptimeContainer
 Meter = Shape
 X = (#Bar_OffsetX#+#Uptime_X#)
 Y = #Bar_OffsetY#
-W = ([UptimeIcon:W] + [Uptime:W] + 5)
-H = #Bar_Height#
-SolidColor=0,0,0
+Shape = Rectangle 0,0,([UptimeIcon:W] + [Uptime:W] + 5),#Bar_Height# | StrokeWidth 0
 DynamicVariables = 1
diff --git a/Themes/Notch/Volume.inc b/Themes/Notch/Volume.inc
index b9175ee..175bc6f 100644
--- a/Themes/Notch/Volume.inc
+++ b/Themes/Notch/Volume.inc
@@ -74,8 +74,6 @@ MouseOverAction=!CommandMeasure AdditionalSkinActionTimer "Stop 1"
 Meter = Shape
 X = (#Bar_OffsetX#+#Volume_X#)
 Y = #Bar_OffsetY#
-W = ([VolumeIcon:W] + [Volume:W] + 5)
-H = #Bar_Height#
-SolidColor=0,0,0
+Shape = Rectangle 0,0,([VolumeIcon:W] + [Volume:W] + 5),#Bar_Height# | StrokeWidth 0
 DynamicVariables = 1
 Group=Volume
diff --git a/Themes/Notch/Weather.inc b/Themes/Notch/Weather.inc
index 07fcc70..627e98d 100644
--- a/Themes/Notch/Weather.inc
+++ b/Themes/Notch/Weather.inc
@@ -87,7 +87,5 @@ Container = WeatherContainer
 Meter = Shape
 X = (#Bar_OffsetX#+#Weather_X#)
 Y = #Bar_OffsetY#
-W = ([WeatherIcon:W] + [Weather:W] + 10)
-H = #Bar_Height#
-SolidColor=0,0,0
+Shape = Rectangle 0,0,([WeatherIcon:W] + [Weather:W] + 10),#Bar_Height# | StrokeWidth 0
 DynamicVariables = 1
diff --git a/Themes/Notch/Weather2.inc b/Themes/Notch/Weather2.inc
index 3e017e7..98110f9 100644
--- a/Themes/Notch/Weather2.inc
+++ b/Themes/Notch/Weather2.inc
@@ -118,7 +118,5 @@ Container = Weather2Container
 Meter = Shape
 X = (#Bar_OffsetX#+#Weather2_X#)
 Y = #Bar_OffsetY#
-W = ([Weather2Icon:W] + [Weather2:W] + 10)
-H = #Bar_Height#
-SolidColor=0,0,0
+Shape = Rectangle 0,0,([Weather2Icon:W] + [Weather2:W] + 10),#Bar_Height# | StrokeWidth 0
 DynamicVariables = 1