Consistency, theme tweaks, bugfixes, working demo