Revert "Themes fixes (first part)"

This reverts commit ac126ee6003b7717f3c752e6db476cd5d99b4e77.