Misc tweaks + theme + etc