Minor CSS cleanup
Renamed theme files
Minor theme template fixes