convert most elements to use a basic shader and proper diffuse lighting
fix typo and consts