Reintroduced two themes. Still ugly though