diff --git a/.travis.yml b/.travis.yml
index 5f6f2821..cbf1dfa2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ before_script:
  - sleep 5
 script:
 - grunt
-- npm test
+- npm run test:unit
 cache:
  directories:
   - node_modules
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3626334a..c442f3a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Add test for check if exits the directories present in defaults modules.
 - Add calendar option to set a separate date format for full day events.
 - Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification
+- Add ability to change the path of the `custom.css`.
 
 ### Updated
 - Added missing keys to Polish translation.
@@ -33,6 +34,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Fix instruction in README for using automatically installer script.
 - Bug of duplicated compliments as described in [here](https://forum.magicmirror.builders/topic/2381/compliments-module-stops-cycling-compliments).
 - Fix double message about port when server is starting
+- Corrected Swedish translations for TODAY/TOMORROW/DAYAFTERTOMORROW.
 
 ## [2.1.1] - 2017-04-01
 
diff --git a/README.md b/README.md
index c19ee20f..8b0c66be 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ The following properties can be configured:
 | `units` | The units that will be used in the default weather modules. Possible values are `metric` or `imperial`. The default is `metric`. |
 | `modules` | An array of active modules. **The array must contain objects. See the next table below for more information.** |
 | `electronOptions` | An optional array of Electron (browser) options. This allows configuration of e.g. the browser screen size and position (example: `electronOptions: { fullscreen: false, width: 800, height: 600 }`). Kiosk mode can be enabled by setting `kiosk = true`, `autoHideMenuBar = false` and `fullscreen = false`. More options can be found [here](https://github.com/electron/electron/blob/master/docs/api/browser-window.md). |
-
+| `customCss` | The path of the `custom.css` stylesheet. The default is `css/custom.css`. |
 
 Module configuration:
 
diff --git a/js/defaults.js b/js/defaults.js
index 66926de7..eada87a4 100644
--- a/js/defaults.js
+++ b/js/defaults.js
@@ -21,6 +21,7 @@ var defaults = {
 	timeFormat: 24,
 	units: "metric",
 	zoom: 1,
+	customCss: "css/custom.css",
 
 	modules: [
 		{
diff --git a/js/loader.js b/js/loader.js
index 2dc260ad..98db1c25 100644
--- a/js/loader.js
+++ b/js/loader.js
@@ -35,7 +35,7 @@ var Loader = (function() {
 				// This is done after all the modules so we can
 				// overwrite all the defined styles.
 
-				loadFile("css/custom.css", function() {
+				loadFile(config.customCss, function() {
 					// custom.css loaded. Start all modules.
 					startModules();
 				});
diff --git a/translations/sv.json b/translations/sv.json
index 8025e51e..13288ec3 100644
--- a/translations/sv.json
+++ b/translations/sv.json
@@ -1,9 +1,9 @@
 {
 	"LOADING": "Laddar …",
 
-	"TODAY": "Idag",
-	"TOMORROW": "Imorgon",
-	"DAYAFTERTOMORROW": "Iövermorgon",
+	"TODAY": "I dag",
+	"TOMORROW": "I morgon",
+	"DAYAFTERTOMORROW": "I övermorgon",
 	"RUNNING": "Slutar",
 	"EMPTY": "Inga kommande händelser.",