Cleaned up default themes