fixed regex to allow spaces
refactored protocol matching
merge config and options in base extension
cleanup alpha theme
Merge remote-tracking branch 'origin/page-publish-date' into page-publish-date
finalisation