diff --git a/.stylelintignore b/.stylelintignore
index 34594923..ba9ce74c 100644
--- a/.stylelintignore
+++ b/.stylelintignore
@@ -1 +1 @@
-app/reset.scss
+app/styles/reset.scss
diff --git a/app/components/Activity/ActivityModal.scss b/app/components/Activity/ActivityModal.scss
index 3c153fa5..01146a47 100644
--- a/app/components/Activity/ActivityModal.scss
+++ b/app/components/Activity/ActivityModal.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: relative;
diff --git a/app/components/Activity/Countdown.scss b/app/components/Activity/Countdown.scss
index 724ff663..29fefa3e 100644
--- a/app/components/Activity/Countdown.scss
+++ b/app/components/Activity/Countdown.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   display: block;
diff --git a/app/components/Activity/InvoiceModal.scss b/app/components/Activity/InvoiceModal.scss
index ecda25d6..398a9e1b 100644
--- a/app/components/Activity/InvoiceModal.scss
+++ b/app/components/Activity/InvoiceModal.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;
diff --git a/app/components/Activity/PaymentModal.scss b/app/components/Activity/PaymentModal.scss
index 1e173806..0a271e96 100644
--- a/app/components/Activity/PaymentModal.scss
+++ b/app/components/Activity/PaymentModal.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;
diff --git a/app/components/Activity/TransactionModal.scss b/app/components/Activity/TransactionModal.scss
index 8785a998..d82c08fc 100644
--- a/app/components/Activity/TransactionModal.scss
+++ b/app/components/Activity/TransactionModal.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;
diff --git a/app/components/Contacts/AddChannel.scss b/app/components/Contacts/AddChannel.scss
index 0b94138b..ef03e89f 100644
--- a/app/components/Contacts/AddChannel.scss
+++ b/app/components/Contacts/AddChannel.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: relative;
diff --git a/app/components/Contacts/ChannelForm.scss b/app/components/Contacts/ChannelForm.scss
index 727aed95..296be11d 100644
--- a/app/components/Contacts/ChannelForm.scss
+++ b/app/components/Contacts/ChannelForm.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: absolute;
diff --git a/app/components/Contacts/ConnectManually.scss b/app/components/Contacts/ConnectManually.scss
index fb3dda30..1064f6d1 100644
--- a/app/components/Contacts/ConnectManually.scss
+++ b/app/components/Contacts/ConnectManually.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: absolute;
diff --git a/app/components/Contacts/ContactModal.scss b/app/components/Contacts/ContactModal.scss
index 2e26dc3b..1c444197 100644
--- a/app/components/Contacts/ContactModal.scss
+++ b/app/components/Contacts/ContactModal.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .header {
   display: flex;
diff --git a/app/components/Contacts/ContactsForm.scss b/app/components/Contacts/ContactsForm.scss
index 3eedb95a..cd2cd731 100644
--- a/app/components/Contacts/ContactsForm.scss
+++ b/app/components/Contacts/ContactsForm.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .modal {
   position: absolute;
diff --git a/app/components/Contacts/Network.scss b/app/components/Contacts/Network.scss
index 24325223..cfada152 100644
--- a/app/components/Contacts/Network.scss
+++ b/app/components/Contacts/Network.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .network {
   position: relative;
diff --git a/app/components/Contacts/SubmitChannelForm.scss b/app/components/Contacts/SubmitChannelForm.scss
index 57f69f8d..36d8388c 100644
--- a/app/components/Contacts/SubmitChannelForm.scss
+++ b/app/components/Contacts/SubmitChannelForm.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .content {
   padding: 0 40px;
diff --git a/app/components/Contacts/SuggestedNodes.scss b/app/components/Contacts/SuggestedNodes.scss
index 2fb330a2..a273a6d4 100644
--- a/app/components/Contacts/SuggestedNodes.scss
+++ b/app/components/Contacts/SuggestedNodes.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;
diff --git a/app/components/Form/Form.scss b/app/components/Form/Form.scss
index ce2d3a95..f405ac66 100644
--- a/app/components/Form/Form.scss
+++ b/app/components/Form/Form.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: absolute;
diff --git a/app/components/Form/Pay.scss b/app/components/Form/Pay.scss
index 44123667..a203372e 100644
--- a/app/components/Form/Pay.scss
+++ b/app/components/Form/Pay.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   padding: 0 40px;
diff --git a/app/components/Form/Request.scss b/app/components/Form/Request.scss
index c19a1b5e..791c7643 100644
--- a/app/components/Form/Request.scss
+++ b/app/components/Form/Request.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   padding: 0 40px;
diff --git a/app/components/GlobalError/GlobalError.scss b/app/components/GlobalError/GlobalError.scss
index 05c02847..d220c14b 100644
--- a/app/components/GlobalError/GlobalError.scss
+++ b/app/components/GlobalError/GlobalError.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: absolute;
diff --git a/app/components/LoadingBolt/LoadingBolt.scss b/app/components/LoadingBolt/LoadingBolt.scss
index 9b2364b8..963e286a 100644
--- a/app/components/LoadingBolt/LoadingBolt.scss
+++ b/app/components/LoadingBolt/LoadingBolt.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   z-index: 1000;
diff --git a/app/components/Onboarding/Alias.scss b/app/components/Onboarding/Alias.scss
index fa15093c..8763fbb2 100644
--- a/app/components/Onboarding/Alias.scss
+++ b/app/components/Onboarding/Alias.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .alias {
   background: transparent;
diff --git a/app/components/Onboarding/Autopilot.scss b/app/components/Onboarding/Autopilot.scss
index b90c6e79..b64c47a7 100644
--- a/app/components/Onboarding/Autopilot.scss
+++ b/app/components/Onboarding/Autopilot.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;
diff --git a/app/components/Onboarding/ConnectionDetails.scss b/app/components/Onboarding/ConnectionDetails.scss
index de79ac00..34fb036e 100644
--- a/app/components/Onboarding/ConnectionDetails.scss
+++ b/app/components/Onboarding/ConnectionDetails.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;
diff --git a/app/components/Onboarding/ConnectionType.scss b/app/components/Onboarding/ConnectionType.scss
index 34537492..ad820ba8 100644
--- a/app/components/Onboarding/ConnectionType.scss
+++ b/app/components/Onboarding/ConnectionType.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;
diff --git a/app/components/Onboarding/FormContainer.scss b/app/components/Onboarding/FormContainer.scss
index 58d137dd..67d5ae5a 100644
--- a/app/components/Onboarding/FormContainer.scss
+++ b/app/components/Onboarding/FormContainer.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: relative;
diff --git a/app/components/Onboarding/InitWallet.scss b/app/components/Onboarding/InitWallet.scss
index 483428ee..e11bc81a 100644
--- a/app/components/Onboarding/InitWallet.scss
+++ b/app/components/Onboarding/InitWallet.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: relative;
diff --git a/app/components/Onboarding/Login.scss b/app/components/Onboarding/Login.scss
index dc5c3ad3..84f9b2af 100644
--- a/app/components/Onboarding/Login.scss
+++ b/app/components/Onboarding/Login.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: relative;
diff --git a/app/components/Onboarding/NewAezeedPassword.scss b/app/components/Onboarding/NewAezeedPassword.scss
index fea52187..ce9f8c4a 100644
--- a/app/components/Onboarding/NewAezeedPassword.scss
+++ b/app/components/Onboarding/NewAezeedPassword.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .input:nth-child(2) {
   margin-top: 30px;
diff --git a/app/components/Onboarding/NewWalletPassword.scss b/app/components/Onboarding/NewWalletPassword.scss
index 4a29c366..51e6ed41 100644
--- a/app/components/Onboarding/NewWalletPassword.scss
+++ b/app/components/Onboarding/NewWalletPassword.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .input:nth-child(2) {
   margin-top: 30px;
diff --git a/app/components/Onboarding/NewWalletSeed.scss b/app/components/Onboarding/NewWalletSeed.scss
index bf56895d..6a76d5d2 100644
--- a/app/components/Onboarding/NewWalletSeed.scss
+++ b/app/components/Onboarding/NewWalletSeed.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   font-size: 14px;
diff --git a/app/components/Onboarding/ReEnterSeed.scss b/app/components/Onboarding/ReEnterSeed.scss
index d7e19505..ef3576df 100644
--- a/app/components/Onboarding/ReEnterSeed.scss
+++ b/app/components/Onboarding/ReEnterSeed.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .seedContainer {
   display: flex;
diff --git a/app/components/Onboarding/RecoverForm.scss b/app/components/Onboarding/RecoverForm.scss
index 07553bfa..ed5d0977 100644
--- a/app/components/Onboarding/RecoverForm.scss
+++ b/app/components/Onboarding/RecoverForm.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .seedContainer {
   position: relative;
diff --git a/app/components/Onboarding/Signup.scss b/app/components/Onboarding/Signup.scss
index 72e97426..1fe342ae 100644
--- a/app/components/Onboarding/Signup.scss
+++ b/app/components/Onboarding/Signup.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;
diff --git a/app/components/Onboarding/Syncing.scss b/app/components/Onboarding/Syncing.scss
index 23f12d80..920adce7 100644
--- a/app/components/Onboarding/Syncing.scss
+++ b/app/components/Onboarding/Syncing.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: relative;
diff --git a/app/components/Wallet/ReceiveModal.scss b/app/components/Wallet/ReceiveModal.scss
index 55c1a933..77f104d0 100644
--- a/app/components/Wallet/ReceiveModal.scss
+++ b/app/components/Wallet/ReceiveModal.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: relative;
diff --git a/app/components/Wallet/Wallet.scss b/app/components/Wallet/Wallet.scss
index f6eb9700..7bd12b23 100644
--- a/app/components/Wallet/Wallet.scss
+++ b/app/components/Wallet/Wallet.scss
@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .wallet {
   background: $bluegrey;
diff --git a/app/index.js b/app/index.js
index c260f491..b292d8b0 100644
--- a/app/index.js
+++ b/app/index.js
@@ -3,7 +3,7 @@ import { render } from 'react-dom'
 import { AppContainer } from 'react-hot-loader'
 import Root from './containers/Root'
 import { configureStore, history } from './store/configureStore'
-import './app.global.scss'
+import './styles/app.global.scss'
 
 const store = configureStore()
 
diff --git a/app/routes/activity/components/Activity.scss b/app/routes/activity/components/Activity.scss
index 3846d7cf..5def6282 100644
--- a/app/routes/activity/components/Activity.scss
+++ b/app/routes/activity/components/Activity.scss
@@ -1,4 +1,4 @@
-@import '../../../variables.scss';
+@import '../../../styles/variables.scss';
 
 .search {
 	height: 55px;
diff --git a/app/routes/activity/components/components/Activity.scss b/app/routes/activity/components/components/Activity.scss
index f87b9a0b..ee79329f 100644
--- a/app/routes/activity/components/components/Activity.scss
+++ b/app/routes/activity/components/components/Activity.scss
@@ -1,4 +1,4 @@
-@import '../../../../variables.scss';
+@import '../../../../styles/variables.scss';
 
 .container {
   display: flex;
diff --git a/app/routes/activity/components/components/Transaction/Transaction.scss b/app/routes/activity/components/components/Transaction/Transaction.scss
index 37e30d6c..24b297ab 100644
--- a/app/routes/activity/components/components/Transaction/Transaction.scss
+++ b/app/routes/activity/components/components/Transaction/Transaction.scss
@@ -1,4 +1,4 @@
-@import '../../../../../variables.scss';
+@import '../../../../../styles/variables.scss';
 
 .container {
   display: flex;
diff --git a/app/routes/app/components/App.scss b/app/routes/app/components/App.scss
index f7472067..fd5bbbb2 100644
--- a/app/routes/app/components/App.scss
+++ b/app/routes/app/components/App.scss
@@ -1,4 +1,4 @@
-@import '../../../variables.scss';
+@import '../../../styles/variables.scss';
 
 .content {
 	position: relative;
diff --git a/app/animated_checkmark.scss b/app/styles/animated_checkmark.scss
similarity index 100%
rename from app/animated_checkmark.scss
rename to app/styles/animated_checkmark.scss
diff --git a/app/app.global.scss b/app/styles/app.global.scss
similarity index 100%
rename from app/app.global.scss
rename to app/styles/app.global.scss
diff --git a/app/keyframes.scss b/app/styles/keyframes.scss
similarity index 100%
rename from app/keyframes.scss
rename to app/styles/keyframes.scss
diff --git a/app/reset.scss b/app/styles/reset.scss
similarity index 100%
rename from app/reset.scss
rename to app/styles/reset.scss
diff --git a/app/tooltip.scss b/app/styles/tooltip.scss
similarity index 100%
rename from app/tooltip.scss
rename to app/styles/tooltip.scss
diff --git a/app/variables.scss b/app/styles/variables.scss
similarity index 100%
rename from app/variables.scss
rename to app/styles/variables.scss