Bunch of more fixes and Theming