Disable restore on move when not using opaque move (that breaks the xor logic, a nicer way to handle this would be nice but for now, it's all I found)
Merge default theme with 4.2 style of borders and round corners to get the same kind of look as before (kind of identity).


(Old svn revision: 12449)