Rework style processing to fix source map paths
Merge branch 'master' into sourcemaps