Lots of cleanup. Now with a theme :)