Fixed rendering and colors