WM|RR: Fixed merge conflicts
WM|RR: Styles restored