add several Bugfixes and theming features