Theming improvements and bug fix.