Fix light/dark ripple effect, minor fixes