Make dies-theme much cleaner and more easy-to-read/easy-to-tweak.