diff --git a/.travis.yml b/.travis.yml
index 66dd107..64533be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "0.12"
+  - "4"
 
 sudo: false
 
@@ -10,12 +10,11 @@ cache:
     - node_modules
 
 before_install:
-  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
-  - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - npm config set spin false
+  - npm install -g bower
+  - npm install phantomjs-prebuilt
 
 install:
-  - npm install -g bower
   - npm install
   - bower install
 
diff --git a/.watchmanconfig b/.watchmanconfig
index 5e9462c..e7834e3 100644
--- a/.watchmanconfig
+++ b/.watchmanconfig
@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp"]
+  "ignore_dirs": ["tmp", "dist"]
 }
diff --git a/README.md b/README.md
index d9dc038..ee83d1b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Design
 
 This README outlines the details of collaborating on this Ember application.
-A short introduction of this app could easily go here.
+
 
 ## Prerequisites
 
@@ -10,7 +10,7 @@ You will need the following things properly installed on your computer.
 * [Git](http://git-scm.com/)
 * [Node.js](http://nodejs.org/) (with NPM)
 * [Bower](http://bower.io/)
-* [Ember CLI](http://www.ember-cli.com/)
+* [Ember CLI](http://ember-cli.com/)
 * [PhantomJS](http://phantomjs.org/)
 
 ## Installation
@@ -46,8 +46,14 @@ Specify what it takes to deploy your app.
 ## Further Reading / Useful Links
 
 * [ember.js](http://emberjs.com/)
-* [ember-cli](http://www.ember-cli.com/)
+* [ember-cli](http://ember-cli.com/)
 * Development Browser Extensions
   * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
 
+## Todo
+
+
+[ ] Resources formats with descriptions
+[ ] Make section-links available for deep-linking straight to content.
+[ ] Feedback for each
diff --git a/app/app.js b/app/app.js
index 8d66b95..831ad61 100644
--- a/app/app.js
+++ b/app/app.js
@@ -1,16 +1,16 @@
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
-import loadInitializers from 'ember/load-initializers';
+import Resolver from './resolver';
+import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-var App;
+let App;
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
 App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
-  Resolver: Resolver
+  Resolver
 });
 
 loadInitializers(App, config.modulePrefix);
diff --git a/app/pods/components/content-section/component.js b/app/pods/components/content-section/component.js
index f9e5a83..1993e33 100644
--- a/app/pods/components/content-section/component.js
+++ b/app/pods/components/content-section/component.js
@@ -19,7 +19,8 @@ export default Ember.Component.extend({
   },
   actions: {
     openModal(element){
-      Ember.$('#modal-image-'+element).modal();
+      console.log("#"+element + "-modal");
+      Ember.$("#"+element + "-modal").modal();
       //console.log('modal-image-'+element);
     }
   }
diff --git a/app/pods/components/content-section/template.hbs b/app/pods/components/content-section/template.hbs
index 517d28f..aa77cb2 100644
--- a/app/pods/components/content-section/template.hbs
+++ b/app/pods/components/content-section/template.hbs
@@ -41,9 +41,10 @@
   <img {{action 'openModal' basename}} class="img-illustration" data-id="image-{{convert-aeoaa basename}}" src="https://hiof.no/assets/plugins/design-{{type}}/illustrations/{{illustration}}">
 
 
-  {{#my-modal title=title basename=basename}}
+  {{#bs-modal title=title basename=basename footer=false open=false id=basename}}
   <img src="https://hiof.no/assets/plugins/design-{{type}}/illustrations/{{illustration}}">
-  {{/my-modal}}
+  {{bs-modal-footer closeTitle="Cancel" submitTitle="Ok"}}
+  {{/bs-modal}}
 
 </aside>
 
diff --git a/app/pods/components/header-section/template.hbs b/app/pods/components/header-section/template.hbs
index 4cea7fa..46427a7 100644
--- a/app/pods/components/header-section/template.hbs
+++ b/app/pods/components/header-section/template.hbs
@@ -26,9 +26,9 @@
 
 
   <ul id="nav-internal" class="nav navbar-nav  navbar-right">
-      <li>{{#link-to 'guide'}}Designmal{{/link-to}}</li>
       <li>{{#link-to 'template'}}Dokumentmaler{{/link-to}}</li>
-      <li>{{#link-to 'webcomponent'}}Web komponenter{{/link-to}}</li>
+      <li>{{#link-to 'guide'}}Design spesifikasjon{{/link-to}}</li>
+      <li>{{#link-to 'webcomponent'}}Web-komponenter spesifikasjon{{/link-to}}</li>
       <!--
       <li class="dropdown">
       <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Nettsidekomponenter<span class="caret"></span></a><ul class="dropdown-menu collapse" role="menu">
@@ -62,5 +62,3 @@
 
 </div>
 </nav>
-
-
diff --git a/app/pods/components/my-modal/template.hbs b/app/pods/components/my-modal/template.hbs
index 9ed2319..d37b53a 100644
--- a/app/pods/components/my-modal/template.hbs
+++ b/app/pods/components/my-modal/template.hbs
@@ -11,8 +11,3 @@
     </div>
   </div>
 </div>
-
-
-
-
-
diff --git a/app/pods/components/nav-internal/component.js b/app/pods/components/nav-internal/component.js
index 0a6b0fb..c92d146 100644
--- a/app/pods/components/nav-internal/component.js
+++ b/app/pods/components/nav-internal/component.js
@@ -1,28 +1,30 @@
 import Ember from 'ember';
 
 export default Ember.Component.extend({
-    tagName: 'aside',
-    classNames: ['internal-nav'],
-    didInsertElement: function() {
-        Ember.$('.nav-internal').toc({
-            title: '',
-            listType: 'ul'
-        });
-        //Ember.$('body').scrollspy({ target: 'nav.nav-internal' });
-        Ember.$('.nav-internal ul').addClass('nav nav-pills nav-stacked');
+  tagName: 'aside',
+  classNames: ['internal-nav'],
+  didInsertElement: function() {
+    Ember.$('.nav-internal').toc({
+      title: '',
+      listType: 'ul',
+      headers: '.content h1, .content h2, .content h3, .content h4, .content h5, .content h6',
+      showEffect: 'fadeIn'
+    });
+    //Ember.$('body').scrollspy({ target: 'nav.nav-internal' });
+    Ember.$('.nav-internal ul').addClass('nav nav-pills nav-stacked');
 
-        Ember.$('.nav-internal a').on('click', function(e) {
-            e.preventDefault();
-            var el = Ember.$(this).attr('href');
+    Ember.$('.nav-internal a').on('click', function(e) {
+      e.preventDefault();
+      var el = Ember.$(this).attr('href');
 
 
 
-            Ember.$('html, body').animate({
-                scrollTop: Ember.$(el).offset().top
-            }, 200);
+      Ember.$('html, body').animate({
+        scrollTop: Ember.$(el).offset().top
+      }, 200);
 
-            //Ember.$.scrolTo($(this).attr('href'));
-            //console.log(this);
-        });
-    }
+      //Ember.$.scrolTo($(this).attr('href'));
+      //console.log(this);
+    });
+  }
 });
diff --git a/app/resolver.js b/app/resolver.js
new file mode 100644
index 0000000..2fb563d
--- /dev/null
+++ b/app/resolver.js
@@ -0,0 +1,3 @@
+import Resolver from 'ember-resolver';
+
+export default Resolver;
diff --git a/app/styles/_bootstrap-custom.scss b/app/styles/_bootstrap-custom.scss
index 6ecd17c..47a1168 100644
--- a/app/styles/_bootstrap-custom.scss
+++ b/app/styles/_bootstrap-custom.scss
@@ -1,50 +1,50 @@
-// Core variables and mixins
-@import "bootstrap/variables";
-@import "bootstrap/mixins";
-
-// Reset and dependencies
-@import "bootstrap/normalize";
-//@import "bootstrap/print";
-@import "bootstrap/glyphicons";
-
-// Core CSS
-@import "bootstrap/scaffolding";
-@import "bootstrap/type";
-@import "bootstrap/code";
-//@import "bootstrap/grid";
-@import "bootstrap/tables";
-@import "bootstrap/forms";
-@import "bootstrap/buttons";
-
-// Components
-@import "bootstrap/component-animations";
-@import "bootstrap/dropdowns";
-@import "bootstrap/button-groups";
-@import "bootstrap/input-groups";
-@import "bootstrap/navs";
-@import "bootstrap/navbar";
-@import "bootstrap/breadcrumbs";
-@import "bootstrap/pagination";
-@import "bootstrap/pager";
-@import "bootstrap/labels";
-@import "bootstrap/badges";
-@import "bootstrap/jumbotron";
-@import "bootstrap/thumbnails";
-@import "bootstrap/alerts";
-@import "bootstrap/progress-bars";
-@import "bootstrap/media";
-@import "bootstrap/list-group";
-@import "bootstrap/panels";
-@import "bootstrap/responsive-embed";
-@import "bootstrap/wells";
-@import "bootstrap/close";
-
-// Components w/ JavaScript
-@import "bootstrap/modals";
-@import "bootstrap/tooltip";
-@import "bootstrap/popovers";
-//@import "bootstrap/carousel";
-
-// Utility classes
-@import "bootstrap/utilities";
-//@import "bootstrap/responsive-utilities";
+//   // Core variables and mixins
+//   @import "bootstrap/variables";
+//   @import "bootstrap/mixins";
+//   
+//   // Reset and dependencies
+//   @import "bootstrap/normalize";
+//   //@import "bootstrap/print";
+//   @import "bootstrap/glyphicons";
+//   
+//   // Core CSS
+//   @import "bootstrap/scaffolding";
+//   @import "bootstrap/type";
+//   @import "bootstrap/code";
+//   //@import "bootstrap/grid";
+//   @import "bootstrap/tables";
+//   @import "bootstrap/forms";
+//   @import "bootstrap/buttons";
+//   
+//   // Components
+//   @import "bootstrap/component-animations";
+//   @import "bootstrap/dropdowns";
+//   @import "bootstrap/button-groups";
+//   @import "bootstrap/input-groups";
+//   @import "bootstrap/navs";
+//   @import "bootstrap/navbar";
+//   @import "bootstrap/breadcrumbs";
+//   @import "bootstrap/pagination";
+//   @import "bootstrap/pager";
+//   @import "bootstrap/labels";
+//   @import "bootstrap/badges";
+//   @import "bootstrap/jumbotron";
+//   @import "bootstrap/thumbnails";
+//   @import "bootstrap/alerts";
+//   @import "bootstrap/progress-bars";
+//   @import "bootstrap/media";
+//   @import "bootstrap/list-group";
+//   @import "bootstrap/panels";
+//   @import "bootstrap/responsive-embed";
+//   @import "bootstrap/wells";
+//   @import "bootstrap/close";
+//   
+//   // Components w/ JavaScript
+//   @import "bootstrap/modals";
+//   @import "bootstrap/tooltip";
+//   @import "bootstrap/popovers";
+//   //@import "bootstrap/carousel";
+//   
+//   // Utility classes
+//   @import "bootstrap/utilities";
+//   //@import "bootstrap/responsive-utilities";
diff --git a/app/styles/app.scss b/app/styles/app.scss
index e6a0da2..428750f 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -1,10 +1,10 @@
-@import 'bootstrap-custom';
+//@import 'bootstrap-custom';
 @import '../../bower_components/sass-mq/mq';
 @import '../../bower_components/hiof-layout/dist/layout';
 @import '../../bower_components/hiof-colors/dist/colors';
 @import '../../bower_components/hiof-typography/dist/typography';
 @import '../../bower_components/highlightjs/styles/github';
-@import "pod-styles";
+//@import "pod-styles";
 html {
     overflow-x: hidden;
 
@@ -41,7 +41,9 @@ body {
         color: #111;
     }
 }
-
+.nav-stacked > li + li{
+  margin-left: 2.4rem;
+}
 .container-fluid {
     max-width: 104rem;
     margin: 0 auto;
diff --git a/bower.json b/bower.json
index cef96aa..fd73d17 100644
--- a/bower.json
+++ b/bower.json
@@ -1,22 +1,17 @@
 {
   "name": "design",
   "dependencies": {
-    "ember": "1.13.5",
-    "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.13.7",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
-    "ember-qunit": "0.4.7",
-    "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.18",
-    "jquery": "^1.11.1",
-    "loader.js": "ember-cli/loader.js#3.2.0",
-    "qunit": "~1.17.1",
+    "ember": "~2.6.0",
+    "ember-cli-shims": "0.1.1",
+    "ember-cli-test-loader": "0.2.2",
+    "ember-qunit-notifications": "0.1.0",
+    "showdown": "^1.4.2",
+    "toc": "git@github.com:ghiculescu/jekyll-table-of-contents.git",
     "hiof-layout": "git@github.com:hiof/layout.git",
     "hiof-colors": "git@github.com:hiof/colors.git",
     "hiof-typography": "git@github.com:hiof/typography.git",
-    "toc": "git@github.com:ghiculescu/jekyll-table-of-contents.git",
     "sass-mq": "~3.2.4",
-    "highlightjs": "~8.8.0"
+    "highlightjs": "~8.8.0",
+    "bootstrap": "~3.3.5"
   }
 }
diff --git a/config/environment.js b/config/environment.js
index 7d191f0..258709a 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -1,55 +1,57 @@
 /* jshint node: true */
 
 module.exports = function(environment) {
-    var ENV = {
-        modulePrefix: 'design',
-        podModulePrefix: 'design/pods',
-        environment: environment,
-        baseURL: '/',
-        locationType: 'auto',
-        contentSecurityPolicy: {
-            'connect-src': "'self' hiof.no",
-            'img-src': "'self' https://hiof.no http://hiof.no placehold.it https://placeholdit.imgix.net", // For placeholder images
-            'script-src': "'self' 'unsafe-inline' 'unsafe-eval' cloudflare.com cdnjs.cloudflare.com https://gstatic.com",
-            'style-src': "'self' 'unsafe-inline' cloudflare.com cdnjs.cloudflare.com https://fonts.googleapis.com https://gstatic.com",
-            'font-src': "'self' fonts.googleapis.com https://fonts.gstatic.com gstatic.com"
-        },
-        EmberENV: {
-            FEATURES: {
-                // Here you can enable experimental features on an ember canary build
-                // e.g. 'with-controller': true
-            }
-        },
-
-        APP: {
-            // Here you can pass flags/options to your application instance
-            // when it is created
-        }
-    };
-
-    if (environment === 'development') {
-        // ENV.APP.LOG_RESOLVER = true;
-        // ENV.APP.LOG_ACTIVE_GENERATION = true;
-        // ENV.APP.LOG_TRANSITIONS = true;
-        // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
-        // ENV.APP.LOG_VIEW_LOOKUPS = true;
+  var ENV = {
+    modulePrefix: 'design',
+    podModulePrefix: 'design/pods',
+    environment: environment,
+    baseURL: '/',
+    locationType: 'auto',
+    contentSecurityPolicy: {
+        'connect-src': "'self' hiof.no",
+        'img-src': "'self' https://hiof.no http://hiof.no placehold.it https://placeholdit.imgix.net", // For placeholder images
+        'script-src': "'self' 'unsafe-inline' 'unsafe-eval' cloudflare.com cdnjs.cloudflare.com https://gstatic.com",
+        'style-src': "'self' 'unsafe-inline' cloudflare.com cdnjs.cloudflare.com https://fonts.googleapis.com https://gstatic.com",
+        'font-src': "'self' fonts.googleapis.com https://fonts.gstatic.com gstatic.com"
+    },
+    EmberENV: {
+      FEATURES: {
+        // Here you can enable experimental features on an ember canary build
+        // e.g. 'with-controller': true
+      }
+    },
+
+
+
+    APP: {
+      // Here you can pass flags/options to your application instance
+      // when it is created
     }
+  };
 
-    if (environment === 'test') {
-        // Testem prefers this...
-        ENV.baseURL = '/';
-        ENV.locationType = 'none';
+  if (environment === 'development') {
+    // ENV.APP.LOG_RESOLVER = true;
+    // ENV.APP.LOG_ACTIVE_GENERATION = true;
+    // ENV.APP.LOG_TRANSITIONS = true;
+    // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
+    // ENV.APP.LOG_VIEW_LOOKUPS = true;
+  }
 
-        // keep test console output quieter
-        ENV.APP.LOG_ACTIVE_GENERATION = false;
-        ENV.APP.LOG_VIEW_LOOKUPS = false;
+  if (environment === 'test') {
+    // Testem prefers this...
+    ENV.baseURL = '/';
+    ENV.locationType = 'none';
 
-        ENV.APP.rootElement = '#ember-testing';
-    }
+    // keep test console output quieter
+    ENV.APP.LOG_ACTIVE_GENERATION = false;
+    ENV.APP.LOG_VIEW_LOOKUPS = false;
 
-    if (environment === 'production') {
+    ENV.APP.rootElement = '#ember-testing';
+  }
 
-    }
+  if (environment === 'production') {
+
+  }
 
-    return ENV;
+  return ENV;
 };
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 4d2b80a..539a73d 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -1,36 +1,27 @@
+/*jshint node:true*/
 /* global require, module */
 var EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
 module.exports = function(defaults) {
-    var app = new EmberApp(defaults, {
-        'ember-cli-bootstrap-sass': {
-            'importBootstrapJS': true
-        },
-        buildInfoOptions: {
-            metaTemplate: 'version={VERSION}'
-        }
-    });
-    //app.import('bower_components/api/sections.json');
-    //app.import('bower_components/api/files.json');
-    app.import('bower_components/ember/ember-template-compiler.js', {
-        prepend: true
-    });
-    app.import(app.bowerDirectory + '/toc/toc.js');
+  var app = new EmberApp(defaults, {
+    'ember-bootstrap': {
+      'importBootstrapTheme': true
+    }
+    // Add options here
+  });
+  app.import(app.bowerDirectory + '/toc/toc.js');
+  // Use `app.import` to add additional libraries to the generated
+  // output files.
+  //
+  // If you need to use different assets in different
+  // environments, specify an object as the first parameter. That
+  // object's keys should be the environment name and the values
+  // should be the asset to use in that environment.
+  //
+  // If the library that you are including contains AMD or ES6
+  // modules that you would like to import into your application
+  // please specify an object with the list of modules as keys
+  // along with the exports of each module as its value.
 
-
-    //app.import(app.bowerDirectory + '/hiof-layout/app/assets/sass/layout.scss');
-    // Use `app.import` to add additional libraries to the generated
-    // output files.
-    //
-    // If you need to use different assets in different
-    // environments, specify an object as the first parameter. That
-    // object's keys should be the environment name and the values
-    // should be the asset to use in that environment.
-    //
-    // If the library that you are including contains AMD or ES6
-    // modules that you would like to import into your application
-    // please specify an object with the list of modules as keys
-    // along with the exports of each module as its value.
-
-    return app.toTree();
+  return app.toTree();
 };
diff --git a/package.json b/package.json
index 7a2bfc1..8ada72f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "design",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Small description for designguidlines goes here",
   "private": true,
   "directories": {
@@ -19,35 +19,32 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "^1.13.8",
-    "ember-cli-app-version": "0.4.0",
-    "ember-cli-babel": "^5.0.0",
-    "ember-cli-bootstrap-sass": "^0.2.11",
+    "broccoli-asset-rev": "^2.4.2",
+    "ember-ajax": "^2.0.1",
+    "ember-bootstrap": "0.7.2",
+    "ember-cli": "2.6.2",
+    "ember-cli-app-version": "^1.0.0",
+    "ember-cli-babel": "^5.1.6",
     "ember-cli-build-info": "^0.2.0",
-    "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "^1.0.0",
-    "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.18",
-    "ember-cli-release": "0.2.3",
-    "ember-cli-sass": "^4.0.1",
-    "ember-cli-showdown": "2.2.1",
-    "ember-cli-sri": "^1.0.1",
-    "ember-cli-uglify": "^1.0.1",
-    "ember-component-css": "0.1.6",
-    "ember-data": "1.13.7",
-    "ember-disable-proxy-controllers": "^1.0.0",
-    "ember-export-application-global": "^1.0.3",
-    "ember-lazy-image": "0.0.14",
+    "ember-cli-dependency-checker": "^1.2.0",
+    "ember-cli-htmlbars": "^1.0.3",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
+    "ember-cli-inject-live-reload": "^1.4.0",
+    "ember-cli-jshint": "^1.0.0",
+    "ember-cli-qunit": "^1.4.0",
+    "ember-cli-release": "^0.2.9",
+    "ember-cli-showdown": "2.7.1",
+    "ember-cli-sri": "^2.1.0",
+    "ember-cli-uglify": "^1.2.0",
+    "ember-data": "^2.6.0",
+    "ember-export-application-global": "^1.0.5",
+    "ember-lazy-image": "0.0.15",
+    "ember-load-initializers": "^0.5.1",
+    "ember-resolver": "^2.0.3",
     "ember-truth-helpers": "1.2.0",
-    "grunt": "^0.4.5",
-    "grunt-markdown-to-json": "^0.4.2",
-    "matchdep": "*",
-    "moment": "^2.10.3",
-    "rimraf": "2.2.8",
-    "time-grunt": "^0.3.1"
+    "ember-welcome-page": "^1.0.1",
+    "loader.js": "^4.0.1",
+    "showdown": "1.4.2",
+    "ember-cli-sass": "^5.3.1"
   }
 }
diff --git a/testem.js b/testem.js
new file mode 100644
index 0000000..26044b2
--- /dev/null
+++ b/testem.js
@@ -0,0 +1,13 @@
+/*jshint node:true*/
+module.exports = {
+  "framework": "qunit",
+  "test_page": "tests/index.html?hidepassed",
+  "disable_watching": true,
+  "launch_in_ci": [
+    "PhantomJS"
+  ],
+  "launch_in_dev": [
+    "PhantomJS",
+    "Chrome"
+  ]
+};
diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js
new file mode 100644
index 0000000..c3d4d1a
--- /dev/null
+++ b/tests/helpers/destroy-app.js
@@ -0,0 +1,5 @@
+import Ember from 'ember';
+
+export default function destroyApp(application) {
+  Ember.run(application, 'destroy');
+}
diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
new file mode 100644
index 0000000..76996fd
--- /dev/null
+++ b/tests/helpers/module-for-acceptance.js
@@ -0,0 +1,23 @@
+import { module } from 'qunit';
+import Ember from 'ember';
+import startApp from '../helpers/start-app';
+import destroyApp from '../helpers/destroy-app';
+
+const { RSVP: { Promise } } = Ember;
+
+export default function(name, options = {}) {
+  module(name, {
+    beforeEach() {
+      this.application = startApp();
+
+      if (options.beforeEach) {
+        return options.beforeEach.apply(this, arguments);
+      }
+    },
+
+    afterEach() {
+      let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
+      return Promise.resolve(afterEach).then(() => destroyApp(this.application));
+    }
+  });
+}
diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js
index 28f4ece..b208d38 100644
--- a/tests/helpers/resolver.js
+++ b/tests/helpers/resolver.js
@@ -1,7 +1,7 @@
-import Resolver from 'ember/resolver';
+import Resolver from '../../resolver';
 import config from '../../config/environment';
 
-var resolver = Resolver.create();
+const resolver = Resolver.create();
 
 resolver.namespace = {
   modulePrefix: config.modulePrefix,
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
index 0f7aab1..e098f1d 100644
--- a/tests/helpers/start-app.js
+++ b/tests/helpers/start-app.js
@@ -3,12 +3,12 @@ import Application from '../../app';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
-  var application;
+  let application;
 
-  var attributes = Ember.merge({}, config.APP);
+  let attributes = Ember.merge({}, config.APP);
   attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
-  Ember.run(function() {
+  Ember.run(() => {
     application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();
diff --git a/tests/index.html b/tests/index.html
index c7c2591..6cb0bd7 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -7,27 +7,28 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{content-for 'head'}}
-    {{content-for 'test-head'}}
+    {{content-for "head"}}
+    {{content-for "test-head"}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/design.css">
     <link rel="stylesheet" href="assets/test-support.css">
 
-    {{content-for 'head-footer'}}
-    {{content-for 'test-head-footer'}}
+    {{content-for "head-footer"}}
+    {{content-for "test-head-footer"}}
   </head>
   <body>
+    {{content-for "body"}}
+    {{content-for "test-body"}}
 
-    {{content-for 'body'}}
-    {{content-for 'test-body'}}
+    <script src="testem.js" integrity=""></script>
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/design.js"></script>
-    <script src="testem.js"></script>
+    <script src="assets/tests.js"></script>
     <script src="assets/test-loader.js"></script>
 
-    {{content-for 'body-footer'}}
-    {{content-for 'test-body-footer'}}
+    {{content-for "body-footer"}}
+    {{content-for "test-body-footer"}}
   </body>
 </html>