Cleaned up theme variables