Smalls fixes and improvements for the two versions of the theme