fixes #3: Major rewrite of the theme speed things up.