diff --git a/.jshintrc b/.jshintrc
index ba0626ff..74a30d8f 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -16,5 +16,14 @@
   "asi": true,
   "esnext": true,
   "laxcomma": true,
-  "node": true
+  "node": true,
+  "globals": {
+    "describe": false,
+    "it": false,
+    "before": false,
+    "beforeEach": false,
+    "after": false,
+    "afterEach": false,
+    "inject": false
+  }
 }
diff --git a/Gruntfile.js b/Gruntfile.js
deleted file mode 100644
index e3642e46..00000000
--- a/Gruntfile.js
+++ /dev/null
@@ -1,43 +0,0 @@
-module.exports = function (grunt) {
-
-  require('load-grunt-tasks')(grunt)
-
-  grunt.initConfig({
-    jade: {
-      translate: {
-        options: {
-          data: {
-            debug: false,
-            files: {
-              'tmp/html/all.html': ['res/app/**/*.jade']
-
-            }
-          }
-        }
-      }
-    },
-
-    'nggettext_extract': {
-      pot: {
-        files: {
-          'res/lang/po/template.pot': ['tmp/html/all.html', 'res/app/**/*.js']
-        }
-      }
-    },
-
-    'nggettext_compile': {
-      all: {
-        files: {
-          'res/lang/translations.js': ['res/lang/po/*.po']
-        }
-      }
-    }
-  })
-
-  grunt.registerTask('translate', [
-    'jade:translate'
-  , 'nggettext_extract'
-  , 'nggettext_compile'
-  ])
-  grunt.registerTask('default', ['translate'])
-}
diff --git a/bower.json b/bower.json
index ecb34a89..c238c9b7 100644
--- a/bower.json
+++ b/bower.json
@@ -10,7 +10,7 @@
     "oboe": "~1.14.2",
     "fa-borderlayout": "git@ghe.amb.ca.local:gunther-brunner/fa-borderlayout.git",
     "Snap.svg": "~0.2.0",
-    "angular-localForage": "~0.0.2",
+    "angular-localForage": "~0.1.0",
     "ng-table": "git://github.com/esvit/ng-table.git#880fbb26eda602c873b1448c92bdcf813296a72a",
     "jquery.terminal": "~0.8.4",
     "stf-site": "git@ghe.amb.ca.local:stf/stf-site.git",
diff --git a/gulpfile.js b/gulpfile.js
index 8c784514..2e00d32b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -16,3 +16,38 @@ gulp.task('jsonlint', function() {
 
 gulp.task('lint', ['jshint', 'jsonlint'])
 gulp.task('test', ['lint'])
+
+// TODO: convert this to gulp
+// 1. extract task: jade->html+js->pot
+// 2. compile task: po->js
+//grunt.initConfig({
+//  jade: {
+//    translate: {
+//      options: {
+//        data: {
+//          debug: false,
+//          files: {
+//            'tmp/html/all.html': ['res/app/**/*.jade']
+//
+//          }
+//        }
+//      }
+//    }
+//  },
+//
+//  'nggettext_extract': {
+//    pot: {
+//      files: {
+//        'res/lang/po/template.pot': ['tmp/html/all.html', 'res/app/**/*.js']
+//      }
+//    }
+//  },
+//
+//  'nggettext_compile': {
+//    all: {
+//      files: {
+//        'res/lang/translations.js': ['res/lang/po/*.po']
+//      }
+//    }
+//  }
+//})
\ No newline at end of file
diff --git a/res/app/components/stf/settings/index.js b/res/app/components/stf/settings/index.js
index f379d3f0..c62de7c7 100644
--- a/res/app/components/stf/settings/index.js
+++ b/res/app/components/stf/settings/index.js
@@ -5,6 +5,12 @@ module.exports = angular.module('stf/settings', [
   'LocalForageModule'
 ])
   .config(['$localForageProvider', function ($localForageProvider) {
-    $localForageProvider.setPrefix('stf.v0');
+    $localForageProvider.config({
+      name        : 'stf-v0',
+      version     : 1.0,
+      storeName   : 'settings',
+      description : 'STF Local Settings'
+    })
+
   }])
   .factory('SettingsService', require('./settings-service'))
diff --git a/res/app/components/stf/settings/settings-service.js b/res/app/components/stf/settings/settings-service.js
index ac084a15..b7e9b312 100644
--- a/res/app/components/stf/settings/settings-service.js
+++ b/res/app/components/stf/settings/settings-service.js
@@ -1,6 +1,4 @@
 module.exports = function SettingsServiceFactory($rootScope, $localForage) {
 
-
-
   return $localForage
 }
diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade
index 923bc403..286b1bf5 100644
--- a/res/app/device-list/device-list.jade
+++ b/res/app/device-list/device-list.jade
@@ -88,7 +88,7 @@ div.stf-device-list
                     span {{device.provider.name}}
                   td(data-title="'User'", sortable='"owner.name"', filter='{"owner.name": "text"}')
                     span {{device.owner.name}}
-              
+
               p
                 strong Sorting
                 pre {{tableParams.sorting() | json}}
diff --git a/res/app/settings/language/language-service.js b/res/app/settings/language/language-service.js
index 7920b64b..535bfb13 100644
--- a/res/app/settings/language/language-service.js
+++ b/res/app/settings/language/language-service.js
@@ -25,7 +25,7 @@ module.exports = function LanguageServiceFactory(SettingsService, $q, gettextCat
     if (LanguageService.selectedLanguage) {
       deferred.resolve(LanguageService.selectedLanguage)
     } else {
-      SettingsService.get('Language.selected').then(function (data) {
+      SettingsService.getItem('Language.selected').then(function (data) {
         if (data) {
           deferred.resolve(data)
         } else {
@@ -46,7 +46,7 @@ module.exports = function LanguageServiceFactory(SettingsService, $q, gettextCat
     var deferred = $q.defer()
     LanguageService.selectedLanguage = lang
     gettextCatalog.currentLanguage = lang
-    SettingsService.set('Language.selected', lang).then(function () {
+    SettingsService.setItem('Language.selected', lang).then(function () {
       deferred.resolve(lang)
     })
     return deferred.promise
diff --git a/res/app/settings/local/local-settings-controller.js b/res/app/settings/local/local-settings-controller.js
index 959c4434..528083e7 100644
--- a/res/app/settings/local/local-settings-controller.js
+++ b/res/app/settings/local/local-settings-controller.js
@@ -1,10 +1,10 @@
 module.exports = function ($scope, SettingsService) {
 
   $scope.resetSettings = function () {
-    SettingsService.clearAll()
+    SettingsService.clear()
   }
 
-  $scope.savedTo = SettingsService.getDriver()
+  $scope.savedTo = SettingsService.driver()
 
 //  $scope.resetSettings = function () {
 //    var title = 'Reset Settings';