Combined two features into one
Remove extra parentheses and swapped regex back
Merge pull request #1151 from jpiasetz/refactors-steps

Combined layout and theme features into one