Themes fixes and CSS cleaning