Moved shaders, more tweaking