Revert "Use substs as reference as needed."

This reverts commit e83187cb242df738d20bcd5b94a959188a2e7f55.
Revert "Set shortname to theme name"

This reverts commit d06db24ff6614b48d074b84f910ab265a7a6c831.