diff --git a/src/popup/app/config.js b/src/popup/app/config.js
index cd88583b..d3811b09 100644
--- a/src/popup/app/config.js
+++ b/src/popup/app/config.js
@@ -125,13 +125,41 @@
                 data: { authorize: true },
                 params: { animation: null }
             })
-
             .state('help', {
                 url: '/help',
                 templateUrl: 'app/settings/views/settingsHelp.html',
                 controller: 'settingsHelpController',
                 data: { authorize: true },
                 params: { animation: null }
+            })
+            .state('sync', {
+                url: '/sync',
+                templateUrl: 'app/settings/views/settingsSync.html',
+                controller: 'settingsSyncController',
+                data: { authorize: true },
+                params: { animation: null }
+            })
+
+            .state('folders', {
+                url: '/folders',
+                templateUrl: 'app/settings/views/settingsFolders.html',
+                controller: 'settingsFoldersController',
+                data: { authorize: true },
+                params: { animation: null }
+            })
+            .state('addFolder', {
+                url: '/folders',
+                templateUrl: 'app/settings/views/settingsAddFolder.html',
+                controller: 'settingsFoldersController',
+                data: { authorize: true },
+                params: { animation: null }
+            })
+            .state('editFolder?folderId', {
+                url: '/folders',
+                templateUrl: 'app/settings/views/settingsEditFolder.html',
+                controller: 'settingsFoldersController',
+                data: { authorize: true },
+                params: { animation: null }
             });
     })
     .run(function ($rootScope, userService, loginService, tokenService, $state) {
diff --git a/src/popup/app/settings/settingsAddFolderController.js b/src/popup/app/settings/settingsAddFolderController.js
new file mode 100644
index 00000000..6551e65c
--- /dev/null
+++ b/src/popup/app/settings/settingsAddFolderController.js
@@ -0,0 +1,6 @@
+angular
+    .module('bit.settings')
+
+    .controller('settingsAddFolderController', function ($scope) {
+        
+    });
diff --git a/src/popup/app/settings/settingsEditFolderController.js b/src/popup/app/settings/settingsEditFolderController.js
new file mode 100644
index 00000000..9b0f0963
--- /dev/null
+++ b/src/popup/app/settings/settingsEditFolderController.js
@@ -0,0 +1,6 @@
+angular
+    .module('bit.settings')
+
+    .controller('settingsEditFolderController', function ($scope) {
+        
+    });
diff --git a/src/popup/app/settings/settingsFoldersController.js b/src/popup/app/settings/settingsFoldersController.js
new file mode 100644
index 00000000..9614180c
--- /dev/null
+++ b/src/popup/app/settings/settingsFoldersController.js
@@ -0,0 +1,6 @@
+angular
+    .module('bit.settings')
+
+    .controller('settingsFoldersController', function ($scope) {
+        
+    });
diff --git a/src/popup/app/settings/settingsSyncController.js b/src/popup/app/settings/settingsSyncController.js
new file mode 100644
index 00000000..bd86f3f2
--- /dev/null
+++ b/src/popup/app/settings/settingsSyncController.js
@@ -0,0 +1,6 @@
+angular
+    .module('bit.settings')
+
+    .controller('settingsSyncController', function ($scope) {
+
+    });
diff --git a/src/popup/app/settings/views/settingsAddFolder.html b/src/popup/app/settings/views/settingsAddFolder.html
new file mode 100644
index 00000000..514d2178
--- /dev/null
+++ b/src/popup/app/settings/views/settingsAddFolder.html
@@ -0,0 +1,24 @@
+<form name="theForm" ng-submit="theForm.$valid && save(folder)" bit-form="savePromise">
+    <div class="header">
+        <div class="left">
+            <a ng-click="close()" href="">Cancel</a>
+        </div>
+        <div class="right">
+            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">Save</button>
+            <i class="fa fa-spinner fa-lg" ng-show="theForm.$loading" ng-class="{'fa-spin' : theForm.$loading}"></i>
+        </div>
+        <div class="title">Add Folder</div>
+    </div>
+    <div class="content">
+        <div class="list">
+            <div class="list-section">
+                <div class="list-section-items">
+                    <div class="list-section-item">
+                        <label for="name" class="item-label">Name</label>
+                        <input id="name" type="text" name="Name" ng-model="folder.name">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>
diff --git a/src/popup/app/settings/views/settingsEditFolder.html b/src/popup/app/settings/views/settingsEditFolder.html
new file mode 100644
index 00000000..83cd9b46
--- /dev/null
+++ b/src/popup/app/settings/views/settingsEditFolder.html
@@ -0,0 +1,24 @@
+<form name="theForm" ng-submit="theForm.$valid && save(folder)" bit-form="savePromise">
+    <div class="header">
+        <div class="left">
+            <a ng-click="close()" href="">Cancel</a>
+        </div>
+        <div class="right">
+            <button type="submit" class="btn btn-link" ng-show="!theForm.$loading">Save</button>
+            <i class="fa fa-spinner fa-lg" ng-show="theForm.$loading" ng-class="{'fa-spin' : theForm.$loading}"></i>
+        </div>
+        <div class="title">Edit Folder</div>
+    </div>
+    <div class="content">
+        <div class="list">
+            <div class="list-section">
+                <div class="list-section-items">
+                    <div class="list-section-item">
+                        <label for="name" class="item-label">Name</label>
+                        <input id="name" type="text" name="Name" ng-model="folder.name">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>
diff --git a/src/popup/app/settings/views/settingsFolders.html b/src/popup/app/settings/views/settingsFolders.html
new file mode 100644
index 00000000..f89b5fc6
--- /dev/null
+++ b/src/popup/app/settings/views/settingsFolders.html
@@ -0,0 +1,27 @@
+<div class="header">
+    <div class="left">
+        <a ui-sref="tabs.settings({animation: 'out-slide-right'})"><i class="fa fa-chevron-left"></i> Settings</a>
+    </div>
+    <div class="right">
+        <a href="" ng-click="addFolder()"><i class="fa fa-plus fa-lg"></i></a>
+    </div>
+    <div class="title">Folders</div>
+</div>
+<div class="content">
+    <div ng-if="folders.length">
+        <div class="list">
+            <div class="list-grouped">
+                <a ng-click="editFolder(folder)" class="list-grouped-item"
+                   ng-repeat="folder in theFolders = (folders | orderBy: ['name'])">
+                    <span class="text">{{folder.name}}</span>
+                </a>
+            </div>
+        </div>
+    </div>
+    <div class="centered-message" ng-if="loaded && !folders.length">
+        <p>No folders to list. <a href="" ng-click="addFolder()">Add one</a></p>
+    </div>
+    <div class="page-loading" ng-if="!loaded">
+        <i class="fa fa-lg fa-spinner fa-spin"></i>
+    </div>
+</div>
diff --git a/src/popup/app/settings/views/settingsSync.html b/src/popup/app/settings/views/settingsSync.html
new file mode 100644
index 00000000..18e51785
--- /dev/null
+++ b/src/popup/app/settings/views/settingsSync.html
@@ -0,0 +1,9 @@
+<div class="header">
+    <div class="left">
+        <a ui-sref="tabs.settings({animation: 'out-slide-right'})"><i class="fa fa-chevron-left"></i> Settings</a>
+    </div>
+    <div class="title">Sync</div>
+</div>
+<div class="content">
+    
+</div>
diff --git a/src/popup/index.html b/src/popup/index.html
index 916c3a35..9d2f728a 100644
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -68,6 +68,10 @@
     <script src="app/settings/settingsController.js"></script>
     <script src="app/settings/settingsHelpController.js"></script>
     <script src="app/settings/settingsAboutController.js"></script>
+    <script src="app/settings/settingsSyncController.js"></script>
+    <script src="app/settings/settingsFoldersController.js"></script>
+    <script src="app/settings/settingsAddFolderController.js"></script>
+    <script src="app/settings/settingsEditFolderController.js"></script>
 
     <script src="app/tools/toolsModule.js"></script>
     <script src="app/tools/toolsController.js"></script>