merged some theming extras from another erdiko project