Merge pull request #1161 from Arantor/release-2.1

Theme changes
Merge pull request #1162 from Arantor/release-2.1

More old stuff to go buh-bye
Merge pull request #1163 from Arantor/release-2.1

! We now only use images/topic/* from the display view, and none of thos...