diff --git a/Makefile b/Makefile
index 8f8af5d51..6976f63d3 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,8 @@ info:
 	@echo "EPSILON_VERSION = $(EPSILON_VERSION)"
 	@echo "EPSILON_APPS = $(EPSILON_APPS)"
 	@echo "EPSILON_I18N = $(EPSILON_I18N)"
+	@echo "OMEGA_THEME = $(OMEGA_THEME)"
+	@echo "BUILD_DIR = $(BUILD_DIR)"
 	@echo "PLATFORM" = $(PLATFORM)
 	@echo "DEBUG" = $(DEBUG)
 	@echo "EPSILON_GETOPT" = $(EPSILON_GETOPT)
@@ -103,6 +105,11 @@ include build/scenario/Makefile
 include quiz/Makefile # Quiz needs to be included at the end
 
 all_src = $(apps_all_src) $(escher_src) $(ion_all_src) $(kandinsky_src) $(liba_src) $(libaxx_src) $(poincare_src) $(python_src) $(epsilon_src) $(runner_src) $(ion_target_device_flasher_light_src) $(ion_target_device_flasher_verbose_src) $(ion_target_device_bench_src) $(tests_src)
+
+# Make palette.h a dep for every source-file.
+# This ensures that the theming engine works correctly.
+$(call object_for,$(all_app_src)): $(BUILD_DIR)/escher/palette.h
+
 all_objs = $(call object_for,$(all_src))
 .SECONDARY: $(all_objs)
 
@@ -127,6 +134,11 @@ clean:
 	@echo "CLEAN"
 	$(Q) rm -rf $(BUILD_DIR)
 
+.PHONY: cleanall
+cleanall:
+	@echo "CLEANALL"
+	$(Q) rm -rf output
+
 .PHONY: cowsay_%
 cowsay_%:
 	@echo " -------"
diff --git a/build/config.mak b/build/config.mak
index a59637cc0..0d3568c60 100644
--- a/build/config.mak
+++ b/build/config.mak
@@ -11,6 +11,7 @@ EPSILON_APPS ?= calculation rpn graph code statistics probability solver atom se
 EPSILON_I18N ?= en fr es de pt
 EPSILON_GETOPT ?= 0
 ESCHER_LOG_EVENTS_BINARY ?= 0
+OMEGA_THEME ?= omega_light
 
 include build/defaults.mak
 include build/platform.$(PLATFORM).mak
diff --git a/build/targets.simulator.mak b/build/targets.simulator.mak
index 1d6573daf..d3732c05c 100644
--- a/build/targets.simulator.mak
+++ b/build/targets.simulator.mak
@@ -7,4 +7,8 @@ $(BUILD_DIR)/test.headless.$(EXE): $(call object_for,$(test_runner_headless_src)
 
 HANDY_TARGETS += epsilon.headless test.headless
 
+run: $(BUILD_DIR)/epsilon.$(EXE)
+	@echo RUN
+	@$(Q) $(BUILD_DIR)/epsilon.$(EXE) -s
+
 -include build/targets.simulator.$(TARGET).mak
diff --git a/escher/Makefile b/escher/Makefile
index ee4f501d2..6e6453e89 100644
--- a/escher/Makefile
+++ b/escher/Makefile
@@ -95,6 +95,13 @@ $(eval $(call rule_for, \
   $$(HOSTCC) -std=c99 `libpng-config --cflags` $$^ `libpng-config --ldflags` -o $$@ \
 ))
 
+$(eval $(call rule_for, \
+  THEME, \
+  escher/palette.h, \
+  $(addprefix themes/themes/, $(addsuffix .json, $(OMEGA_THEME))), \
+  $$(PYTHON) themes/themes_manager.py $(OMEGA_THEME) $$@ \
+))
+
 INLINER := $(BUILD_DIR)/escher/image/inliner
 
 .PRECIOUS: $(BUILD_DIR)/%.h $(BUILD_DIR)/%.cpp
diff --git a/escher/include/escher/palette.h b/escher/include/escher/palette.h
deleted file mode 100644
index f7d4c6284..000000000
--- a/escher/include/escher/palette.h
+++ /dev/null
@@ -1,139 +0,0 @@
-#ifndef ESCHER_PALETTE_H
-#define ESCHER_PALETTE_H
-
-#include <kandinsky/color.h>
-
-class Palette {
-public:
-  constexpr static KDColor PrimaryText = KDColor::RGB24(0x000000);
-  constexpr static KDColor SecondaryText = KDColor::RGB24(0x6e6e6e);
-  constexpr static KDColor AccentText = KDColor::RGB24(0x00857f);
-  constexpr static KDColor ApproximateSignText = KDColor::RGB24(0x595959);
-  constexpr static KDColor ApproximateExpressionText = KDColor::RGB24(0x595959);
-  constexpr static KDColor BackgroundHard = KDColor::RGB24(0xffffff);
-  constexpr static KDColor BackgroundApps = KDColor::RGB24(0xfafafa);
-  constexpr static KDColor BackgroundAppsSecondary = KDColor::RGB24(0xf0f0f0);
-  constexpr static KDColor Toolbar = KDColor::RGB24(0xc03535);
-  constexpr static KDColor ToolbarText = KDColor::RGB24(0xffffff);
-  constexpr static KDColor ExpressionInputBackground = KDColor::RGB24(0xe0e0e0);
-  constexpr static KDColor ExpressionInputBorder = KDColor::RGB24(0xd9d9d9);
-  constexpr static KDColor GridPrimaryLine = KDColor::RGB24(0xd9d9d9);
-  constexpr static KDColor GridSecondaryLine = KDColor::RGB24(0xf5f5f5);
-  constexpr static KDColor Battery = KDColor::RGB24(0xffffff);
-  constexpr static KDColor BatteryInCharge = KDColor::RGB24(0x179e1f);
-  constexpr static KDColor BatteryLow = KDColor::RGB24(0x992321);
-  constexpr static KDColor ScrollBarForeground = KDColor::RGB24(0x4a4a4a);
-  constexpr static KDColor ScrollBarBackground = KDColor::RGB24(0xd9d9d9);
-  constexpr static KDColor Control = KDColor::RGB24(0x00857f);
-  constexpr static KDColor ControlEnabled = KDColor::RGB24(0x00b2b0);
-  constexpr static KDColor ControlDisabled = KDColor::RGB24(0x9e9e9e);
-  constexpr static KDColor CalculationBackgroundOdd = KDColor::RGB24(0xfafafa);
-  constexpr static KDColor CalculationBackgroundEven = KDColor::RGB24(0xffffff);
-  constexpr static KDColor CalculationEmptyBox = KDColor::RGB24(0xc4c4c4);
-  constexpr static KDColor CalculationEmptyBoxNeeded = KDColor::RGB24(0x00857f);
-  constexpr static KDColor CodeBackground = KDColor::RGB24(0xffffff);
-  constexpr static KDColor CodeBackgroundSelected = KDColor::RGB24(0xe0e0e0);
-  constexpr static KDColor CodeText = KDColor::RGB24(0x000000);
-  constexpr static KDColor CodeComment = KDColor::RGB24(0x999988);
-  constexpr static KDColor CodeNumber = KDColor::RGB24(0x009999);
-  constexpr static KDColor CodeKeyword = KDColor::RGB24(0xff000c);
-  constexpr static KDColor CodeOperator = KDColor::RGB24(0xd73a49);
-  constexpr static KDColor CodeString = KDColor::RGB24(0x032f62);
-  constexpr static KDColor ProbabilityCurve = KDColor::RGB24(0x00857f);
-  constexpr static KDColor ProbabilityCellBorder = KDColor::RGB24(0xececec);
-  constexpr static KDColor ProbabilityHistogramBar = KDColor::RGB24(0xd9d9d9);
-  constexpr static KDColor StatisticsBox = KDColor::RGB24(0x00857f);
-  constexpr static KDColor StatisticsBoxVerticalLine = KDColor::RGB24(0xd9d9d9);
-  constexpr static KDColor StatisticsSelected = KDColor::RGB24(0x00857f);
-  constexpr static KDColor StatisticsNotSelected = KDColor::RGB24(0xf5f5f5);
-  constexpr static KDColor GraphTangent = KDColor::RGB24(0x595959);
-  constexpr static KDColor SubMenuBackground = KDColor::RGB24(0xe0e0e0);
-  constexpr static KDColor SubMenuBorder = KDColor::RGB24(0xfafafa);
-  constexpr static KDColor SubMenuText = KDColor::RGB24(0x000000);
-  constexpr static KDColor ToolboxHeaderBackground = KDColor::RGB24(0x4a4a4a);
-  constexpr static KDColor ToolboxHeaderText = KDColor::RGB24(0xffffff);
-  constexpr static KDColor ToolboxHeaderBorder = KDColor::RGB24(0x4a4a4a);
-  constexpr static KDColor ToolboxBackground = KDColor::RGB24(0x000000);
-  constexpr static KDColor ListCellBackground = KDColor::RGB24(0xffffff);
-  constexpr static KDColor ListCellBackgroundSelected = KDColor::RGB24(0xe0e0e0);
-  constexpr static KDColor ListCellBorder = KDColor::RGB24(0xededef);
-  constexpr static KDColor ButtonBackground = KDColor::RGB24(0xe0e0e0);
-  constexpr static KDColor ButtonBackgroundSelected = KDColor::RGB24(0xd1d1d1);
-  constexpr static KDColor ButtonBackgroundSelectedHighContrast = KDColor::RGB24(0x00b2b0);
-  constexpr static KDColor ButtonBorder = KDColor::RGB24(0xadadad);
-  constexpr static KDColor ButtonRowBorder = KDColor::RGB24(0xd9d9d9);
-  constexpr static KDColor ButtonBorderOut = KDColor::RGB24(0xf5f5f5);
-  constexpr static KDColor ButtonShadow = KDColor::RGB24(0x003833);
-  constexpr static KDColor ButtonText = KDColor::RGB24(0x000000);
-  constexpr static KDColor TabBackground = KDColor::RGB24(0x4a4a4a);
-  constexpr static KDColor TabBackgroundSelected = KDColor::RGB24(0x757575);
-  constexpr static KDColor TabBackgroundActive = KDColor::RGB24(0xfafafa);
-  constexpr static KDColor TabBackgroundSelectedAndActive = KDColor::RGB24(0xe3e3e3);
-  constexpr static KDColor TabText = KDColor::RGB24(0xffffff);
-  constexpr static KDColor TabTextActive = KDColor::RGB24(0x000000);
-  constexpr static KDColor SubTabBackground = KDColor::RGB24(0xe0e0e0);
-  constexpr static KDColor SubTabBackgroundSelected = KDColor::RGB24(0xd1d1d1);
-  constexpr static KDColor SubTabText = KDColor::RGB24(0x000000);
-  constexpr static KDColor BannerFirstBackground = KDColor::RGB24(0x4a4a4a);
-  constexpr static KDColor BannerFirstBorder = KDColor::RGB24(0x4a4a4a);
-  constexpr static KDColor BannerFirstText = KDColor::RGB24(0xffffff);
-  constexpr static KDColor BannerFirstVariantBackground = KDColor::RGB24(0x4a4a4a);
-  constexpr static KDColor BannerFirstVariantBorder = KDColor::RGB24(0xfafafa);
-  constexpr static KDColor BannerFirstVariantText = KDColor::RGB24(0xffffff);
-  constexpr static KDColor BannerSecondBackground = KDColor::RGB24(0xe0e0e0);
-  constexpr static KDColor BannerSecondBorder = KDColor::RGB24(0xfafafa);
-  constexpr static KDColor BannerSecondText = KDColor::RGB24(0x000000);
-  constexpr static KDColor HomeBackground = KDColor::RGB24(0xffffff);
-  constexpr static KDColor HomeCellBackground = KDColor::RGB24(0xffffff);
-  constexpr static KDColor HomeCellBackgroundActive = KDColor::RGB24(0x4a4a4a);
-  constexpr static KDColor HomeCellText = KDColor::RGB24(0x000000);
-  constexpr static KDColor HomeCellTextActive = KDColor::RGB24(0xffffff);
-  constexpr static KDColor AtomUnknown = KDColor::RGB24(0xeeeeee);
-  constexpr static KDColor AtomText = KDColor::RGB24(0x000000);
-  constexpr static KDColor AtomAlkaliMetal = KDColor::RGB24(0xffaa00);
-  constexpr static KDColor AtomAlkaliEarthMetal = KDColor::RGB24(0xf6f200);
-  constexpr static KDColor AtomLanthanide = KDColor::RGB24(0xffaa8b);
-  constexpr static KDColor AtomActinide = KDColor::RGB24(0xdeaacd);
-  constexpr static KDColor AtomTransitionMetal = KDColor::RGB24(0xde999c);
-  constexpr static KDColor AtomPostTransitionMetal = KDColor::RGB24(0x9cbaac);
-  constexpr static KDColor AtomMetalloid = KDColor::RGB24(0x52ce8b);
-  constexpr static KDColor AtomHalogen = KDColor::RGB24(0x00debd);
-  constexpr static KDColor AtomReactiveNonmetal = KDColor::RGB24(0x00ee00);
-  constexpr static KDColor AtomNobleGas = KDColor::RGB24(0x8baaff);
-  constexpr static KDColor AtomTableLines = KDColor::RGB24(0x323532);
-  constexpr static KDColor YellowDark = KDColor::RGB24(0xffb734);
-  constexpr static KDColor YellowLight = KDColor::RGB24(0xffcc7b);
-  constexpr static KDColor PurpleBright = KDColor::RGB24(0x656975);
-  constexpr static KDColor PurpleDark = KDColor::RGB24(0x414147);
-  constexpr static KDColor GreyWhite = KDColor::RGB24(0xf5f5f5);
-  constexpr static KDColor GreyBright = KDColor::RGB24(0xececec);
-  constexpr static KDColor GreyMiddle = KDColor::RGB24(0xd9d9d9);
-  constexpr static KDColor GreyDark = KDColor::RGB24(0xa7a7a7);
-  constexpr static KDColor GreyVeryDark = KDColor::RGB24(0x8c8c8c);
-  constexpr static KDColor Select = KDColor::RGB24(0xd4d7e0);
-  constexpr static KDColor SelectDark = KDColor::RGB24(0xb0b8d8);
-  constexpr static KDColor WallScreen = KDColor::RGB24(0xf7f9fa);
-  constexpr static KDColor WallScreenDark = KDColor::RGB24(0xe0e6ed);
-  constexpr static KDColor SubTab = KDColor::RGB24(0xb8bbc5);
-  constexpr static KDColor LowBattery = KDColor::RGB24(0xf30211);
-  constexpr static KDColor Red = KDColor::RGB24(0xff000c);
-  constexpr static KDColor RedLight = KDColor::RGB24(0xfe6363);
-  constexpr static KDColor Magenta = KDColor::RGB24(0xff0588);
-  constexpr static KDColor Turquoise = KDColor::RGB24(0x60c1ec);
-  constexpr static KDColor Pink = KDColor::RGB24(0xffabb6);
-  constexpr static KDColor Blue = KDColor::RGB24(0x5075f2);
-  constexpr static KDColor BlueLight = KDColor::RGB24(0x718fee);
-  constexpr static KDColor Orange = KDColor::RGB24(0xfe871f);
-  constexpr static KDColor Green = KDColor::RGB24(0x50c102);
-  constexpr static KDColor GreenLight = KDColor::RGB24(0x52db8f);
-  constexpr static KDColor Brown = KDColor::RGB24(0x8d7350);
-  constexpr static KDColor Purple = KDColor::RGB24(0x6e2d79);
-  constexpr static KDColor DataColor[] = {Red, Blue, Green, YellowDark, Magenta, Turquoise, Pink, Orange};
-  constexpr static KDColor DataColorLight[] = {RedLight, BlueLight, GreenLight, YellowLight};
-  constexpr static KDColor AtomColor[] = {
-    AtomUnknown, AtomAlkaliMetal, AtomAlkaliEarthMetal, AtomLanthanide, AtomActinide, AtomTransitionMetal,
-    AtomPostTransitionMetal, AtomMetalloid, AtomHalogen, AtomReactiveNonmetal, AtomNobleGas
-  };
-};
-
-#endif
diff --git a/themes b/themes
index 57312b33a..775ae1ceb 160000
--- a/themes
+++ b/themes
@@ -1 +1 @@
-Subproject commit 57312b33acc18d4a93210046c59940f8552ef533
+Subproject commit 775ae1cebdd9f2bdc4d6afc6a15418327490799a