Actually, the last error was missing @extends

Also move some declarations around to make it more
in line with the rest of the CSS.