fix for THEMES_PATH and default/header

Missed a few items in the branch files that pertained to my previous two
commits.