diff --git a/gulpfile.js b/gulpfile.js
index 3a785d9..23f400e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -15,6 +15,13 @@ gulp.task('default', ['css', 'audio', 'minify']);
 
 gulp.task('css', function(){
   return gulp.src('src/css/**/*.css')
+    .pipe(order([
+        // hlwn must come after modern
+        // modern must come after main
+        "hues-main.css",
+        "huesUI-modern.css",
+        "huesUI-hlwn.css"
+    ]))
     .pipe(plumber())
     .pipe(newer('css/hues-min.css'))
     .pipe(sourcemaps.init())
diff --git a/src/js/HuesCore.js b/src/js/HuesCore.js
index e3192d1..8c2ddc2 100644
--- a/src/js/HuesCore.js
+++ b/src/js/HuesCore.js
@@ -219,6 +219,8 @@ function HuesCore(defaults) {
         this.clearMessage();
         setInterval(this.loopCheck.bind(this), 1000);
         this.renderer = new HuesCanvas(this.root, this.soundManager.context, this);
+        this.callEventListeners("settingsupdated");
+        this.settingsUpdated();
         this.setColour(this.colourIndex);
         this.animationLoop();