Biggest update on the theme so far. Needs cleaning.