changed shim colors and backgrond images
merge conflicts