Change color names, add normal buttons, fix pattern, new nav