A theme named Default will no longer be ignored
Refactored element calls