diff --git a/template/app/Application.js b/template/app/Application.js
index 291ca3cf6ddcaeb042f58357dc72f769ff917f09..c60c89ad3abb6303a8081e009a99c2accee7ef92 100644
--- a/template/app/Application.js
+++ b/template/app/Application.js
@@ -11,7 +11,21 @@ Ext.define('Docs.Application', {
         'Docs.History',
         'Docs.Comments',
         'Docs.Settings',
-        'Docs.view.Viewport'
+        'Docs.view.Viewport',
+
+        'Docs.controller.Auth',
+        'Docs.controller.Welcome',
+        'Docs.controller.Failure',
+        'Docs.controller.Classes',
+        'Docs.controller.Search',
+        'Docs.controller.InlineExamples',
+        'Docs.controller.Examples',
+        'Docs.controller.Guides',
+        'Docs.controller.Videos',
+        'Docs.controller.Tabs',
+        'Docs.controller.Comments',
+        'Docs.controller.CommentCounts',
+        'Docs.controller.Tests'
     ],
 
     constructor: function() {
diff --git a/template/app/Auth.js b/template/app/Auth.js
index 41ae8e39ea4b8480e892b0bec47cb26c1b142514..a2f480322252d8b795fddda2b31c9057bec7d7e7 100644
--- a/template/app/Auth.js
+++ b/template/app/Auth.js
@@ -5,7 +5,6 @@ Ext.define('Docs.Auth', {
     singleton: true,
     requires: [
         'Ext.Ajax',
-        'Ext.JSON',
         'Ext.util.Cookies'
     ],
 
diff --git a/template/app/controller/Search.js b/template/app/controller/Search.js
index 2ebeaff32361c9df678929f3c91b1052fea5ba22..0e8d8c804c225daede1ef5a70dd2d51a0260a21d 100644
--- a/template/app/controller/Search.js
+++ b/template/app/controller/Search.js
@@ -6,6 +6,7 @@ Ext.define('Docs.controller.Search', {
 
     requires: [
         'Docs.ClassRegistry',
+        'Docs.store.Search',
         'Docs.History'
     ],
 
diff --git a/template/app/model/Setting.js b/template/app/model/Setting.js
index ac51b5fd86f43c6087c0e5e1a32cc4d60ef3dd3b..a20f1ebe4bf4197543d43cf7630fb54b34d75cc7 100644
--- a/template/app/model/Setting.js
+++ b/template/app/model/Setting.js
@@ -4,6 +4,7 @@
 Ext.define('Docs.model.Setting', {
     fields: ['id', 'key', 'value'],
     extend: 'Ext.data.Model',
+    requires: ['Ext.data.proxy.LocalStorage'],
     proxy: {
         type: window['localStorage'] ? 'localstorage' : 'memory',
         id: Docs.data.localStorageDb + '-settings'
diff --git a/template/app/store/Settings.js b/template/app/store/Settings.js
index 966033800f39d9c4ecfd0f078fa60cff8aea226e..602b19b4e52bd75c1e60046b851458d9b823bd22 100644
--- a/template/app/store/Settings.js
+++ b/template/app/store/Settings.js
@@ -3,5 +3,6 @@
  */
 Ext.define('Docs.store.Settings', {
     extend: 'Ext.data.Store',
+    requires: ['Docs.model.Setting'],
     model: 'Docs.model.Setting'
 });