Revert "use $defaults instead of $theme"

This reverts commit d5038e93dba633cce36538905b7e5365ba1b3b63.