Theme bugs & tweaks

just a little bit of tweaking and fixing..