Add option to turn off CRT effect - some changes