master
Move contents back to src
Adds @normal usage for non default themes #6227
#1894 Fix basic icon paths to not try to load woff2, add src variable
Fix basic step theme