Simplify desktop-theme CSS and HTML a lot