various bugfixes and completed theme integration