7.x theme feedback

Talked to Morgan, should be reverted.