Updated theme file and cleaned up according to code standards.