some more major changes to the theme...