diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark.scss
index 40a12be7..4ab46a5d 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark.scss
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark.scss
@@ -3,6 +3,5 @@ $variant: 'dark';
 @import '../../../sass/variables';
 @import '../../../sass/colors';
 @import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
 @import '../../../sass/gnome-shell/widgets-40-0';
 @import '../../../sass/gnome-shell/extensions-40-0';
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-Light.scss b/src/main/gnome-shell/shell-40-0/gnome-shell-Light.scss
index f8ab74d0..9ec40fdf 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light.scss
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light.scss
@@ -3,6 +3,5 @@ $variant: 'light';
 @import '../../../sass/variables';
 @import '../../../sass/colors';
 @import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
 @import '../../../sass/gnome-shell/widgets-40-0';
 @import '../../../sass/gnome-shell/extensions-40-0';
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark.scss b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark.scss
index 86cb6fc4..5e76dcef 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark.scss
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark.scss
@@ -3,6 +3,5 @@ $variant: 'dark';
 @import '../../../sass/variables';
 @import '../../../sass/colors';
 @import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
 @import '../../../sass/gnome-shell/widgets-42-0';
 @import '../../../sass/gnome-shell/extensions-40-0';
diff --git a/src/main/gnome-shell/shell-42-0/gnome-shell-Light.scss b/src/main/gnome-shell/shell-42-0/gnome-shell-Light.scss
index d6124cb7..9660cc1d 100644
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light.scss
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light.scss
@@ -3,6 +3,5 @@ $variant: 'light';
 @import '../../../sass/variables';
 @import '../../../sass/colors';
 @import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
 @import '../../../sass/gnome-shell/widgets-42-0';
 @import '../../../sass/gnome-shell/extensions-40-0';
diff --git a/src/main/gnome-shell/shell-44-0/gnome-shell-Dark.scss b/src/main/gnome-shell/shell-44-0/gnome-shell-Dark.scss
index 1ce17c56..59936482 100644
--- a/src/main/gnome-shell/shell-44-0/gnome-shell-Dark.scss
+++ b/src/main/gnome-shell/shell-44-0/gnome-shell-Dark.scss
@@ -3,6 +3,5 @@ $variant: 'dark';
 @import '../../../sass/variables';
 @import '../../../sass/colors';
 @import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
 @import '../../../sass/gnome-shell/widgets-44-0';
 @import '../../../sass/gnome-shell/extensions-40-0';
diff --git a/src/main/gnome-shell/shell-44-0/gnome-shell-Light.scss b/src/main/gnome-shell/shell-44-0/gnome-shell-Light.scss
index 2aed7ccc..0fdd093c 100644
--- a/src/main/gnome-shell/shell-44-0/gnome-shell-Light.scss
+++ b/src/main/gnome-shell/shell-44-0/gnome-shell-Light.scss
@@ -3,6 +3,5 @@ $variant: 'light';
 @import '../../../sass/variables';
 @import '../../../sass/colors';
 @import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
 @import '../../../sass/gnome-shell/widgets-44-0';
 @import '../../../sass/gnome-shell/extensions-40-0';
diff --git a/src/main/gnome-shell/shell-46-0/gnome-shell-Dark.scss b/src/main/gnome-shell/shell-46-0/gnome-shell-Dark.scss
index acfd8721..ae213729 100644
--- a/src/main/gnome-shell/shell-46-0/gnome-shell-Dark.scss
+++ b/src/main/gnome-shell/shell-46-0/gnome-shell-Dark.scss
@@ -3,6 +3,5 @@ $variant: 'dark';
 @import '../../../sass/variables';
 @import '../../../sass/colors';
 @import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
 @import '../../../sass/gnome-shell/widgets-46-0';
 @import '../../../sass/gnome-shell/extensions-46-0';
diff --git a/src/main/gnome-shell/shell-46-0/gnome-shell-Light.scss b/src/main/gnome-shell/shell-46-0/gnome-shell-Light.scss
index 49474c61..5f0a59c7 100644
--- a/src/main/gnome-shell/shell-46-0/gnome-shell-Light.scss
+++ b/src/main/gnome-shell/shell-46-0/gnome-shell-Light.scss
@@ -3,6 +3,5 @@ $variant: 'light';
 @import '../../../sass/variables';
 @import '../../../sass/colors';
 @import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
 @import '../../../sass/gnome-shell/widgets-46-0';
 @import '../../../sass/gnome-shell/extensions-46-0';
diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss
index 5f60ba7b..d5016232 100644
--- a/src/sass/gnome-shell/_common.scss
+++ b/src/sass/gnome-shell/_common.scss
@@ -76,5 +76,6 @@ stage {
   @include fontsize(8);
 }
 
-%monospace {font-family: monospace;}
-%numeric { font-feature-settings: "tnum";}
+%monospace { font-family: monospace; }
+
+%numeric { font-feature-settings: "tnum"; }
diff --git a/src/sass/gnome-shell/_widgets-3-28.scss b/src/sass/gnome-shell/_widgets-3-28.scss
index b5dd1a01..9402d29d 100644
--- a/src/sass/gnome-shell/_widgets-3-28.scss
+++ b/src/sass/gnome-shell/_widgets-3-28.scss
@@ -1,3 +1,4 @@
+@import 'common';
 @import 'common/a11y';
 @import 'common/app-grid';
 @import 'common/base';
diff --git a/src/sass/gnome-shell/_widgets-40-0.scss b/src/sass/gnome-shell/_widgets-40-0.scss
index 2c1f2b4b..0153f977 100644
--- a/src/sass/gnome-shell/_widgets-40-0.scss
+++ b/src/sass/gnome-shell/_widgets-40-0.scss
@@ -1,3 +1,4 @@
+@import 'common';
 @import 'common/a11y';
 @import 'common/app-grid';
 @import 'common/base';
diff --git a/src/sass/gnome-shell/_widgets-42-0.scss b/src/sass/gnome-shell/_widgets-42-0.scss
index 7076138b..698aa550 100644
--- a/src/sass/gnome-shell/_widgets-42-0.scss
+++ b/src/sass/gnome-shell/_widgets-42-0.scss
@@ -1,3 +1,4 @@
+@import 'common';
 @import 'common/a11y';
 @import 'common/app-grid';
 @import 'common/base';
diff --git a/src/sass/gnome-shell/_widgets-44-0.scss b/src/sass/gnome-shell/_widgets-44-0.scss
index c724a93e..36eacef2 100644
--- a/src/sass/gnome-shell/_widgets-44-0.scss
+++ b/src/sass/gnome-shell/_widgets-44-0.scss
@@ -1,3 +1,4 @@
+@import 'common';
 @import 'common/a11y';
 @import 'common/app-grid';
 @import 'common/base';
diff --git a/src/sass/gnome-shell/_widgets-46-0.scss b/src/sass/gnome-shell/_widgets-46-0.scss
index 0cfec836..d1f39bf2 100644
--- a/src/sass/gnome-shell/_widgets-46-0.scss
+++ b/src/sass/gnome-shell/_widgets-46-0.scss
@@ -1,3 +1,4 @@
+@import 'common';
 @import 'common/a11y';
 @import 'common/app-grid';
 @import 'common/base';
diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss
index fdb81d97..a3abd4f8 100644
--- a/src/sass/gnome-shell/common/_panel.scss
+++ b/src/sass/gnome-shell/common/_panel.scss
@@ -105,10 +105,10 @@ $panel_height: $menuitem_size;
 #panel {
   background-color: $panel_bg;
   font-weight: 500;
+  @extend %numeric;
   color: $panel_fg;
-  font-feature-settings: "tnum";
   transition-duration: 250ms;
-  @include font(body-1);
+  // @include font(body-1);
   height: $panel_height !important;
   box-shadow: 0 5px 16px rgba(black, 0.05);