Move theme mixin to separate file and other tweaks