Misc updates, theme button