diff --git a/app/initializers/component-store.js b/app/initializers/component-store.js
index 0556ebf..54a3064 100644
--- a/app/initializers/component-store.js
+++ b/app/initializers/component-store.js
@@ -1,5 +1,5 @@
 export function initialize(container, application) {
-  application.inject('component', 'store', 'store:main');
+  application.inject('component', 'store', 'service:store');
 }
 
 export default {
diff --git a/app/initializers/global-variables.js b/app/initializers/global-variables.js
index 4ed58e6..7090375 100644
--- a/app/initializers/global-variables.js
+++ b/app/initializers/global-variables.js
@@ -7,10 +7,10 @@ var globals = Ember.Object.extend({
 });
 
 export function initialize(container, application) {
-  application.register('global:variables', globals, {singleton: true});
-  application.inject('controller', 'globals', 'global:variables');
-  application.inject('component', 'globals', 'global:variables');
-  application.inject('adapter', 'globals', 'global:variables');
+  application.register('service:globals', globals, {singleton: true});
+  application.inject('controller', 'globals', 'service:globals');
+  application.inject('component', 'globals', 'service:globals');
+  application.inject('adapter', 'globals', 'service:globals');
 }
 
 export default {
diff --git a/app/pods/application/adapter.js b/app/pods/application/adapter.js
index bb89c25..a2c9722 100644
--- a/app/pods/application/adapter.js
+++ b/app/pods/application/adapter.js
@@ -20,7 +20,7 @@ export default DS.RESTAdapter.extend({
         errors = {};
       if (response.errors !== undefined) {
         var jsonErrors = response.errors;
-        Ember.EnumerableUtils.forEach(Ember.keys(jsonErrors), function(key) {
+        Ember.EnumerableUtils.forEach(Object.keys(jsonErrors), function(key) {
           errors[Ember.String.camelize(key)] = jsonErrors[key];
         });
       }
diff --git a/app/pods/application/template.hbs b/app/pods/application/template.hbs
index 6e52a50..5fe3d0d 100644
--- a/app/pods/application/template.hbs
+++ b/app/pods/application/template.hbs
@@ -1,3 +1,4 @@
+{{#x-application}}
   <div class="flakes-navigation">
     {{site-logo}}
     {{#if session.isAuthenticated}}
@@ -49,3 +50,4 @@
       {{outlet}}
     </div>
   </div>
+{{/x-application}}
diff --git a/app/pods/application/view.js b/app/pods/application/view.js
deleted file mode 100644
index 7da9eeb..0000000
--- a/app/pods/application/view.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import Ember from 'ember';
-/* global FlakesFrame */
-
-export default Ember.View.extend({
-  classNames: ['flakes-frame'],
-  didInsertElement: function() {
-    FlakesFrame.init();
-  }
-});
diff --git a/app/pods/components/site-logo/component.js b/app/pods/components/site-logo/component.js
new file mode 100644
index 0000000..6e705e6
--- /dev/null
+++ b/app/pods/components/site-logo/component.js
@@ -0,0 +1,3 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({});
diff --git a/app/pods/components/x-application/component.js b/app/pods/components/x-application/component.js
new file mode 100644
index 0000000..79540b0
--- /dev/null
+++ b/app/pods/components/x-application/component.js
@@ -0,0 +1,10 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  classNames: ["flakes-frame"],
+
+  didInsertElement: function() {
+    FlakesFrame.init();
+  },
+
+});
diff --git a/app/pods/components/x-application/template.hbs b/app/pods/components/x-application/template.hbs
new file mode 100644
index 0000000..889d9ee
--- /dev/null
+++ b/app/pods/components/x-application/template.hbs
@@ -0,0 +1 @@
+{{yield}}
diff --git a/bower.json b/bower.json
index 7c160ea..122e534 100644
--- a/bower.json
+++ b/bower.json
@@ -2,14 +2,14 @@
   "name": "hymenobacterdotinfo",
   "dependencies": {
     "jquery": "~2.1.1",
-    "ember": "1.12.0",
+    "ember": "1.13.3",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "1.0.0-beta.18",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.3.3",
+    "ember-data": "1.13.5",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
+    "ember-qunit": "0.4.1",
     "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.15",
+    "ember-resolver": "~0.1.18",
     "loader.js": "ember-cli/loader.js#3.2.0",
     "qunit": "~1.17.1",
     "flakes": "~1.0.0",
diff --git a/ember-cli-build.js b/ember-cli-build.js
new file mode 100644
index 0000000..8c5e8c0
--- /dev/null
+++ b/ember-cli-build.js
@@ -0,0 +1,24 @@
+/* global require, module */
+var EmberApp = require('ember-cli/lib/broccoli/ember-app');
+
+module.exports = function(defaults) {
+  var app = new EmberApp(defaults, {
+    // Add options here
+  });
+
+  // STYLES //////////////////////////////////////////////////////////////////////
+  // flakes (and deps)
+  app.import('bower_components/flakes/css/all.css');
+  app.import('bower_components/gridforms/gridforms/gridforms.css');
+
+  // LIBS ////////////////////////////////////////////////////////////////////////
+  // flakes (and deps)
+  app.import('bower_components/snapjs/snap.js');
+  app.import('bower_components/responsive-elements/responsive-elements.js');
+  app.import('bower_components/gridforms/gridforms/gridforms.js');
+  app.import('bower_components/flakes/js/base.js');
+  // moment
+  app.import('bower_components/moment/moment.js');
+
+  return app.toTree();
+};
diff --git a/package.json b/package.json
index 466029d..65f1ffe 100644
--- a/package.json
+++ b/package.json
@@ -20,25 +20,26 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "0.2.7",
-    "ember-cli-app-version": "0.3.3",
+    "ember-cli": "1.13.1",
+    "ember-cli-app-version": "0.4.0",
     "ember-cli-babel": "^5.0.0",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.0",
     "ember-cli-divshot": "^0.1.7",
     "ember-cli-flash": "1.1.4",
-    "ember-cli-htmlbars": "0.7.6",
-    "ember-cli-ic-ajax": "0.1.1",
+    "ember-cli-htmlbars": "0.7.9",
+    "ember-cli-htmlbars-inline-precompile": "^0.1.1",
+    "ember-cli-ic-ajax": "0.2.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.13",
+    "ember-cli-qunit": "0.3.15",
     "ember-cli-simple-auth": "^0.8.0",
     "ember-cli-simple-auth-token": "^0.7.2",
+    "ember-cli-release": "0.2.3",
     "ember-cli-uglify": "^1.0.1",
-    "ember-data": "1.0.0-beta.18",
+    "ember-data": "1.13.5",
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2",
     "ember-select-2": "1.3.0",
-    "ember-table": "0.5.0",
-    "glob": "^4.5.3"
+    "ember-table": "0.5.0"
   }
 }
diff --git a/tests/.jshintrc b/tests/.jshintrc
index ea8b88f..6ec0b7c 100644
--- a/tests/.jshintrc
+++ b/tests/.jshintrc
@@ -26,7 +26,7 @@
   "node": false,
   "browser": false,
   "boss": true,
-  "curly": false,
+  "curly": true,
   "debug": false,
   "devel": false,
   "eqeqeq": true,
@@ -47,5 +47,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true
+  "esnext": true,
+  "unused": true
 }
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
index 16cc7c3..0f7aab1 100644
--- a/tests/helpers/start-app.js
+++ b/tests/helpers/start-app.js
@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import Application from '../../app';
-import Router from '../../router';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {