Cleaned up the themes