Cleaned up code, tweaked themes.