Cleaned theme settings a bit