Cleaned up the theme a bit