Improve handling of uniforms

Also, make the basic shaders more basic
Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>