Theming improvements & Example Theme