Keeps working on the theme, making it closer to what I want