diff --git a/app/styles/app.scss b/app/styles/app.scss
index 764e55ba..344aaa5f 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -19,7 +19,7 @@
 @import "app/misc";
 @import "app/popup";
 // @import "app/pro";
-@import "app/settings";
+// @import "app/settings";
 
 @import "app/components/travis-switch";
 @import "app/components/sync-button";
@@ -57,3 +57,4 @@
 @import "app/layouts/caches";
 @import "app/layouts/getting-started";
 @import "app/layouts/first-sync";
+@import "app/layouts/settings";
diff --git a/app/styles/app/layouts/settings.sass b/app/styles/app/layouts/settings.sass
new file mode 100644
index 00000000..4bd93130
--- /dev/null
+++ b/app/styles/app/layouts/settings.sass
@@ -0,0 +1,42 @@
+// If you'd no longer like to run this project on Travis CI you can deactivate it now.<br>You will be able to reactivate it in the future if you'd like to.
+
+$add-green: #3AA95E
+$add-green-hover: #3BA85D
+
+$add-var-bg: #c2c3c5
+$add-var-color: $white
+$add-var-radius: 4px
+
+$deactivate-red: #EB3A3D
+$deactivate-red-hover: #D12F2F
+
+$deactivate-bg: #e93d3c
+
+$heading-color: #63a4a3
+$heading-size: 18px
+
+$switch-height: 32px
+$switch-size: 11px
+$switch-color: $white
+
+$switch-descr-size: 16px
+$switch-descr-color: #8e8f8e
+
+$switch-descr-inline-size: 12px
+$switch-descr-inline-color: #8e8f8e
+
+$input-border: 1px solid #eeedec
+$input-radius: 4px
+$input-color: #8e8f8e
+$input-width: 78px
+$input-height: 32px
+
+$setting-section-border: 2px solid #f2f3ef
+
+$env-vars-bg: #f2f3ef
+$env-vars-color: #8e8f8e
+$env-vars-size: 16px
+$env-vars-radius: 4px
+$env-vars-pw-bg: #eeedec
+
+$input-main-height: 30px
diff --git a/app/templates/settings.hbs b/app/templates/settings.hbs
index cc9e4bc4..73f1054a 100644
--- a/app/templates/settings.hbs
+++ b/app/templates/settings.hbs
@@ -1,11 +1,23 @@
-<ul class="navigation tabnav-sub">
-  <li>{{#link-to "settings.index"}}General Settings{{/link-to}}</li>
-  <li>{{#link-to "env_vars"}}Environment Variables{{/link-to}}</li>
+<div class="settings">
+  
+  <section class="settings-section">
+    <h2>General Settings</h2>
+  </section>
+
+  <section class="settings-section">
+    <h2>Environment Variables</h2>
+  </section>
+{{#if config.endpoints.sshKey}}
+  <section class="settings-section">
+    <h2>SSH Key</h2>
+  </section>
+{{/if}}
+  <section class="settings-section">
+    <h2>Deactivate Repository</h2>
+  </section>
+
+</div>
 
-  {{#if config.endpoints.sshKey}}
-    <li>{{#link-to "ssh_key"}}SSH Key{{/link-to}}</li>
-  {{/if}}
-</ul>
 
 <div id="settings">
   {{outlet}}