diff --git a/src/Options/options.scss b/src/Options/options.scss
new file mode 100644
index 0000000..991ad79
--- /dev/null
+++ b/src/Options/options.scss
@@ -0,0 +1,8 @@
+@import "../styles/fonts";
+@import "../styles/reset";
+@import "../styles/variables";
+
+body {
+  color: $black;
+  background-color: $greyWhite;
+}
diff --git a/src/Popup/popup.scss b/src/Popup/popup.scss
new file mode 100644
index 0000000..991ad79
--- /dev/null
+++ b/src/Popup/popup.scss
@@ -0,0 +1,8 @@
+@import "../styles/fonts";
+@import "../styles/reset";
+@import "../styles/variables";
+
+body {
+  color: $black;
+  background-color: $greyWhite;
+}
diff --git a/src/styles/base/_fonts.scss b/src/styles/_fonts.scss
similarity index 100%
rename from src/styles/base/_fonts.scss
rename to src/styles/_fonts.scss
diff --git a/src/styles/base/_reset.scss b/src/styles/_reset.scss
similarity index 74%
rename from src/styles/base/_reset.scss
rename to src/styles/_reset.scss
index af7a024..d8d29db 100644
--- a/src/styles/base/_reset.scss
+++ b/src/styles/_reset.scss
@@ -1,4 +1,4 @@
-// Manually forked from Normalize.css, Reboot.css, Sanitize.css, and Untouched.css
+// Forked from Normalize.css, Reboot.css, Sanitize.css, and Untouched.css
 
 *,
 *:before,
diff --git a/src/styles/base/_variables.scss b/src/styles/_variables.scss
similarity index 81%
rename from src/styles/base/_variables.scss
rename to src/styles/_variables.scss
index 1bdab74..6a8d43d 100644
--- a/src/styles/base/_variables.scss
+++ b/src/styles/_variables.scss
@@ -17,4 +17,7 @@ $bold: 700;
 $exbold: 800;
 $exblack: 900;
 
-// other
+// other variables
+.d-none {
+  display: none !important;
+}
diff --git a/src/styles/base/_components.scss b/src/styles/base/_components.scss
deleted file mode 100644
index 2d5589c..0000000
--- a/src/styles/base/_components.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-.d-none {
-  display: none !important;
-}
-
-.v-none {
-  visibility: hidden !important;
-}
-
-.text-center {
-  text-align: center;
-}
-
-.mt-3 {
-  margin-top: 3em;
-}
-
-.mb-2 {
-  margin-bottom: 2em;
-}
-
-.my-2 {
-  margin-top: 1em;
-  margin-bottom: 2em;
-}
-
-.py-2 {
-  padding: 1em 24px;
-}
diff --git a/src/styles/options.scss b/src/styles/options.scss
deleted file mode 100644
index ab8e82c..0000000
--- a/src/styles/options.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import "base/fonts";
-@import "base/reset";
-@import "base/variables";
-
-body {
-  color: $black;
-  background-color: $greyWhite;
-}
diff --git a/src/styles/popup.scss b/src/styles/popup.scss
deleted file mode 100644
index ab8e82c..0000000
--- a/src/styles/popup.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import "base/fonts";
-@import "base/reset";
-@import "base/variables";
-
-body {
-  color: $black;
-  background-color: $greyWhite;
-}