More changes to the theme

Lots have been corrected and fixed