diff --git a/frappe/public/scss/desk/color_picker.scss b/frappe/public/scss/common/color_picker.scss
similarity index 100%
rename from frappe/public/scss/desk/color_picker.scss
rename to frappe/public/scss/common/color_picker.scss
diff --git a/frappe/public/scss/desk/controls.scss b/frappe/public/scss/common/controls.scss
similarity index 100%
rename from frappe/public/scss/desk/controls.scss
rename to frappe/public/scss/common/controls.scss
diff --git a/frappe/public/scss/desk/datepicker.scss b/frappe/public/scss/common/datepicker.scss
similarity index 100%
rename from frappe/public/scss/desk/datepicker.scss
rename to frappe/public/scss/common/datepicker.scss
diff --git a/frappe/public/scss/desk/grid.scss b/frappe/public/scss/common/grid.scss
similarity index 100%
rename from frappe/public/scss/desk/grid.scss
rename to frappe/public/scss/common/grid.scss
diff --git a/frappe/public/scss/desk/index.scss b/frappe/public/scss/desk/index.scss
index 884e186504..1643034322 100644
--- a/frappe/public/scss/desk/index.scss
+++ b/frappe/public/scss/desk/index.scss
@@ -37,7 +37,7 @@
 @import "calendar";
 @import "dashboard_view";
 @import "tree";
-@import "controls";
+@import "../common/controls";
 @import "data_import";
 @import "driver";
 @import "role_editor";
diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss
index 5d319451ed..0ddc8e8d0f 100644
--- a/frappe/public/scss/website/index.scss
+++ b/frappe/public/scss/website/index.scss
@@ -6,9 +6,11 @@
 @import "../common/global.scss";
 @import "../common/icons.scss";
 @import 'base';
+@import "../common/flex";
 @import "../common/buttons";
 @import "../common/modal";
 @import "../common/indicator.scss";
+@import "../common/controls";
 @import 'multilevel_dropdown';
 @import 'website_image';
 @import 'website_avatar';