Minor tweaks and theme/condensing testing