Doing some clean up. Having 16 different themes in there is beyond understanding.
Merge commit 'dd308a145d9a4bcfe1df3e8f87f16d577087ab21' into research