diff --git a/app/index.js b/app/index.js
index 675a7ce..4b67841 100755
--- a/app/index.js
+++ b/app/index.js
@@ -124,7 +124,7 @@ RecroomGenerator.prototype.templates = function templates() {
 RecroomGenerator.prototype.writeIndex = function writeIndex() {
     var mainCssFiles = [
         'styles/normalize.css',
-        'styles/style.css',
+        'styles/compiled-stylus.css',
         'bower_components/brick/dist/brick.css'
     ];
 
@@ -142,7 +142,7 @@ RecroomGenerator.prototype.all = function all() {
     this.write('app/index.html', this.indexFile);
 
     this.copy('styles/normalize.css', 'app/styles/normalize.css');
-    this.copy('styles/style.css', 'app/styles/style.css');
+    this.copy('styles/app.styl', 'app/styles/app.styl');
 
     this.copy(this._getJSPath('scripts/app'), this._getJSPath('app/scripts/app'));
     this.copy(this._getJSPath('scripts/store'), this._getJSPath('app/scripts/store'));
diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
index 02acacb..30cd68c 100755
--- a/app/templates/Gruntfile.js
+++ b/app/templates/Gruntfile.js
@@ -28,13 +28,18 @@ module.exports = function (grunt) {
         yeoman: yeomanConfig,
         watch: {
             emberTemplates: {
-                files: ['<%= yeoman.app %>/templates/**/*.hbs','<%= yeoman.app %>/bower_components/**/*.hbs'],
+                files: ['<%%= yeoman.app %>/templates/**/*.hbs','<%= yeoman.app %>/bower_components/**/*.hbs'],
                 tasks: ['emberTemplates']
             },
             neuter: {
-                files: ['<%= yeoman.app %>/scripts/{,*/}*.js'],
+                files: ['<%%= yeoman.app %>/scripts/{,*/}*.js'],
                 tasks: ['neuter']
             },
+            stylus: {
+                files: ['<%%= yeoman.app %>/styles/{,*/}*.css',
+                        '<%%= yeoman.app %>/styles/{,*/}*.styl'],
+                tasks: ['stylus']
+            },
             livereload: {
                 options: {
                     livereload: LIVERELOAD_PORT
@@ -189,7 +194,7 @@ module.exports = function (grunt) {
         cssmin: {
             dist: {
                 files: {
-                    '<%%= yeoman.dist %>/styles/main.css': [
+                    '<%%= yeoman.dist %>/styles/compiled-stylus.css': [
                         '.tmp/styles/{,*/}*.css',
                         '<%%= yeoman.app %>/styles/{,*/}*.css'
                     ]
@@ -296,6 +301,17 @@ module.exports = function (grunt) {
                 }
             }
         },
+        stylus: {
+            compile: {
+                options: {
+                    compress: false,
+                    paths: ['node_modules/grunt-contrib-stylus/node_modules']
+                },
+                files: {
+                    '.tmp/styles/compiled-stylus.css': ['<%%= yeoman.app %>/styles/*.styl']
+                }
+            }
+        },
         neuter: {
             app: {
                 options: {
@@ -323,6 +339,7 @@ module.exports = function (grunt) {
             'clean:server',
             'replace:app',
             'concurrent:server',
+            'stylus',
             'neuter:app',
             'connect:livereload',
             'open',
@@ -335,6 +352,7 @@ module.exports = function (grunt) {
         'replace:app',
         'concurrent:test',
         'connect:test',
+        'stylus',
         'neuter:app',<% if (options.karma) { %>
         'karma'<% } else if (testFramework === 'mocha') { %>
         'mocha'<% } else if (testFramework === 'jasmine') { %>
@@ -346,6 +364,7 @@ module.exports = function (grunt) {
         'replace:dist',
         'useminPrepare',
         'concurrent:dist',
+        'stylus',
         'neuter:app',
         'concat',
         'cssmin',
diff --git a/app/templates/_package.json b/app/templates/_package.json
index 6d8ef7c..9eb1ec8 100755
--- a/app/templates/_package.json
+++ b/app/templates/_package.json
@@ -13,6 +13,7 @@
     "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-htmlmin": "~0.1.3",
     "grunt-contrib-imagemin": "~0.2.0",
+    "grunt-contrib-stylus": "^0.16.0",
     "grunt-contrib-watch": "~0.5.2",<% if (testFramework === 'jasmine') { %>
     "grunt-contrib-jasmine": "~0.5.1",<% } %>
     "grunt-rev": "~0.1.0",
diff --git a/app/templates/index.html b/app/templates/index.html
index d8582ad..b967ae9 100755
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -24,9 +24,6 @@
     <!-- Responsive and mobile friendly stuff -->
     <meta name="HandheldFriendly" content="True">
     <meta name="MobileOptimized" content="320">
-
-    <!-- l10n TODO: build step -->
-    <link rel="resource" type="application/l10n" href="l10n/en.properties">
   </head>
 
   <!-- Content gets replaced by the application.hbs template. -->
diff --git a/app/templates/styles/style.css b/app/templates/styles/app.styl
similarity index 100%
rename from app/templates/styles/style.css
rename to app/templates/styles/app.styl