Fixed some bugs with Theme/ThemeContent links