Colorization and some tweaks added, shaders are seperated