Bugfixes, polish, and updated themes for < v21