diff --git a/.travis.yml b/.travis.yml
index 1e86dfc1c8..35a2d272b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: node_js
 node_js:
   - stable
 script:
-  - npm run lint && npm run test && npm run downloadsolc && npm run build
+  - npm run lint && npm run csslint && npm run test && npm run downloadsolc && npm run build
   - ./ci/browser_tests.sh
 deploy:
   provider: script
diff --git a/assets/css/browser-solidity.css b/assets/css/browser-solidity.css
index 1e3f5d4ca0..6be828a0c4 100644
--- a/assets/css/browser-solidity.css
+++ b/assets/css/browser-solidity.css
@@ -64,7 +64,6 @@ body {
 }
 
 #files .file {
-    display: inline-block;
     padding: 0 0.6em;
     box-sizing: border-box;
     background-color: #F4F6FF;
@@ -345,7 +344,6 @@ body {
 
 .sol.error,
 .sol.warning {
-    border-radius: 0;
     word-wrap: break-word;
     cursor: pointer;
     position: relative;
diff --git a/assets/css/styles.css b/assets/css/styles.css
index b86ebc00a1..ce0a1c193e 100644
--- a/assets/css/styles.css
+++ b/assets/css/styles.css
@@ -27,9 +27,6 @@ h2 {
   color:#393939;
 }
 
-h3, h4, h5, h6 {
-}
-
 a {
   color:#39c;
   font-weight:400;
diff --git a/assets/css/universal-dapp.css b/assets/css/universal-dapp.css
index 79c8dfd8b6..d42aa985c3 100644
--- a/assets/css/universal-dapp.css
+++ b/assets/css/universal-dapp.css
@@ -54,7 +54,6 @@
 
 .udapp .title {
 	margin-bottom: 0.4em;
-	display: inline-block;
 	padding: 0.2em;
 	background-color: rgba( 255,255,255,0.5 );
 	display: block;
diff --git a/package.json b/package.json
index 0642c90a51..b213e952b1 100644
--- a/package.json
+++ b/package.json
@@ -3,21 +3,24 @@
   "version": "1.0.0",
   "description": "Minimalistic browser-based Solidity IDE",
   "scripts": {
-    "test": "node test/index.js",
     "browser-test": "nightwatch --config nightwatch.js --env local",
+    "browser-test-remote-chrome": "nightwatch --config nightwatch.js --env chrome",
     "browser-test-remote-firefox": "nightwatch --config nightwatch.js --env default",
     "browser-test-remote-ie": "nightwatch --config nightwatch.js --env ie",
-    "browser-test-remote-chrome": "nightwatch --config nightwatch.js --env chrome",
     "browser-test-remote-safari": "nightwatch --config nightwatch.js --env safari",
     "build": "mkdir -p build; browserify src/index.js -g yo-yoify -o build/app.js",
+    "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='assets/css/font-awesome.min.css' assets/css/",
     "downloadsolc": "rm soljson.js; wget https://ethereum.github.io/solc-bin/soljson.js",
     "lint": "semistandard",
-    "serve": "http-server ."
+    "serve": "http-server .",
+    "test": "node test/index.js"
   },
   "devDependencies": {
     "brace": "^0.8.0",
     "browserify": "^13.0.0",
+    "csslint": "^1.0.2",
     "es6-shim": "^0.35.1",
+    "ethereum-remix": "0.0.2-alpha.0.0.7",
     "ethereumjs-abi": "^0.6.4",
     "ethereumjs-block": "^1.2.2",
     "ethereumjs-tx": "^1.1.1",
@@ -34,8 +37,7 @@
     "web3": "https://github.com/ethereum/web3.js#35bcace7173fda742ddb1bba84c8a70f0fa849e0",
     "webworkify": "^1.2.1",
     "yo-yo": "^1.2.2",
-    "yo-yoify": "^3.3.0",
-    "ethereum-remix": "0.0.2-alpha.0.0.7"
+    "yo-yoify": "^3.3.0"
   },
   "repository": {
     "type": "git",