diff --git a/htdocs/includes/fontawesome/.gitignore b/htdocs/theme/common/fontawesome/.gitignore
similarity index 100%
rename from htdocs/includes/fontawesome/.gitignore
rename to htdocs/theme/common/fontawesome/.gitignore
diff --git a/htdocs/includes/fontawesome/.npmignore b/htdocs/theme/common/fontawesome/.npmignore
similarity index 100%
rename from htdocs/includes/fontawesome/.npmignore
rename to htdocs/theme/common/fontawesome/.npmignore
diff --git a/htdocs/includes/fontawesome/CONTRIBUTING.md b/htdocs/theme/common/fontawesome/CONTRIBUTING.md
similarity index 100%
rename from htdocs/includes/fontawesome/CONTRIBUTING.md
rename to htdocs/theme/common/fontawesome/CONTRIBUTING.md
diff --git a/htdocs/includes/fontawesome/Gemfile b/htdocs/theme/common/fontawesome/Gemfile
similarity index 100%
rename from htdocs/includes/fontawesome/Gemfile
rename to htdocs/theme/common/fontawesome/Gemfile
diff --git a/htdocs/includes/fontawesome/Gemfile.lock b/htdocs/theme/common/fontawesome/Gemfile.lock
similarity index 100%
rename from htdocs/includes/fontawesome/Gemfile.lock
rename to htdocs/theme/common/fontawesome/Gemfile.lock
diff --git a/htdocs/includes/fontawesome/HELP-US-OUT.txt b/htdocs/theme/common/fontawesome/HELP-US-OUT.txt
similarity index 100%
rename from htdocs/includes/fontawesome/HELP-US-OUT.txt
rename to htdocs/theme/common/fontawesome/HELP-US-OUT.txt
diff --git a/htdocs/includes/fontawesome/README.md b/htdocs/theme/common/fontawesome/README.md
similarity index 100%
rename from htdocs/includes/fontawesome/README.md
rename to htdocs/theme/common/fontawesome/README.md
diff --git a/htdocs/includes/fontawesome/_config.yml b/htdocs/theme/common/fontawesome/_config.yml
similarity index 100%
rename from htdocs/includes/fontawesome/_config.yml
rename to htdocs/theme/common/fontawesome/_config.yml
diff --git a/htdocs/includes/fontawesome/bower.json b/htdocs/theme/common/fontawesome/bower.json
similarity index 100%
rename from htdocs/includes/fontawesome/bower.json
rename to htdocs/theme/common/fontawesome/bower.json
diff --git a/htdocs/includes/fontawesome/component.json b/htdocs/theme/common/fontawesome/component.json
similarity index 100%
rename from htdocs/includes/fontawesome/component.json
rename to htdocs/theme/common/fontawesome/component.json
diff --git a/htdocs/includes/fontawesome/composer.json b/htdocs/theme/common/fontawesome/composer.json
similarity index 100%
rename from htdocs/includes/fontawesome/composer.json
rename to htdocs/theme/common/fontawesome/composer.json
diff --git a/htdocs/includes/fontawesome/css/font-awesome.css b/htdocs/theme/common/fontawesome/css/font-awesome.css
similarity index 100%
rename from htdocs/includes/fontawesome/css/font-awesome.css
rename to htdocs/theme/common/fontawesome/css/font-awesome.css
diff --git a/htdocs/includes/fontawesome/css/font-awesome.css.map b/htdocs/theme/common/fontawesome/css/font-awesome.css.map
similarity index 100%
rename from htdocs/includes/fontawesome/css/font-awesome.css.map
rename to htdocs/theme/common/fontawesome/css/font-awesome.css.map
diff --git a/htdocs/includes/fontawesome/css/font-awesome.min.css b/htdocs/theme/common/fontawesome/css/font-awesome.min.css
similarity index 100%
rename from htdocs/includes/fontawesome/css/font-awesome.min.css
rename to htdocs/theme/common/fontawesome/css/font-awesome.min.css
diff --git a/htdocs/includes/fontawesome/fonts/FontAwesome.otf b/htdocs/theme/common/fontawesome/fonts/FontAwesome.otf
similarity index 100%
rename from htdocs/includes/fontawesome/fonts/FontAwesome.otf
rename to htdocs/theme/common/fontawesome/fonts/FontAwesome.otf
diff --git a/htdocs/includes/fontawesome/fonts/fontawesome-webfont.eot b/htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.eot
similarity index 100%
rename from htdocs/includes/fontawesome/fonts/fontawesome-webfont.eot
rename to htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.eot
diff --git a/htdocs/includes/fontawesome/fonts/fontawesome-webfont.svg b/htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.svg
similarity index 100%
rename from htdocs/includes/fontawesome/fonts/fontawesome-webfont.svg
rename to htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.svg
diff --git a/htdocs/includes/fontawesome/fonts/fontawesome-webfont.ttf b/htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from htdocs/includes/fontawesome/fonts/fontawesome-webfont.ttf
rename to htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.ttf
diff --git a/htdocs/includes/fontawesome/fonts/fontawesome-webfont.woff b/htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.woff
similarity index 100%
rename from htdocs/includes/fontawesome/fonts/fontawesome-webfont.woff
rename to htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.woff
diff --git a/htdocs/includes/fontawesome/fonts/fontawesome-webfont.woff2 b/htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from htdocs/includes/fontawesome/fonts/fontawesome-webfont.woff2
rename to htdocs/theme/common/fontawesome/fonts/fontawesome-webfont.woff2
diff --git a/htdocs/includes/fontawesome/less/animated.less b/htdocs/theme/common/fontawesome/less/animated.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/animated.less
rename to htdocs/theme/common/fontawesome/less/animated.less
diff --git a/htdocs/includes/fontawesome/less/bordered-pulled.less b/htdocs/theme/common/fontawesome/less/bordered-pulled.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/bordered-pulled.less
rename to htdocs/theme/common/fontawesome/less/bordered-pulled.less
diff --git a/htdocs/includes/fontawesome/less/core.less b/htdocs/theme/common/fontawesome/less/core.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/core.less
rename to htdocs/theme/common/fontawesome/less/core.less
diff --git a/htdocs/includes/fontawesome/less/fixed-width.less b/htdocs/theme/common/fontawesome/less/fixed-width.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/fixed-width.less
rename to htdocs/theme/common/fontawesome/less/fixed-width.less
diff --git a/htdocs/includes/fontawesome/less/font-awesome.less b/htdocs/theme/common/fontawesome/less/font-awesome.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/font-awesome.less
rename to htdocs/theme/common/fontawesome/less/font-awesome.less
diff --git a/htdocs/includes/fontawesome/less/icons.less b/htdocs/theme/common/fontawesome/less/icons.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/icons.less
rename to htdocs/theme/common/fontawesome/less/icons.less
diff --git a/htdocs/includes/fontawesome/less/larger.less b/htdocs/theme/common/fontawesome/less/larger.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/larger.less
rename to htdocs/theme/common/fontawesome/less/larger.less
diff --git a/htdocs/includes/fontawesome/less/list.less b/htdocs/theme/common/fontawesome/less/list.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/list.less
rename to htdocs/theme/common/fontawesome/less/list.less
diff --git a/htdocs/includes/fontawesome/less/mixins.less b/htdocs/theme/common/fontawesome/less/mixins.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/mixins.less
rename to htdocs/theme/common/fontawesome/less/mixins.less
diff --git a/htdocs/includes/fontawesome/less/path.less b/htdocs/theme/common/fontawesome/less/path.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/path.less
rename to htdocs/theme/common/fontawesome/less/path.less
diff --git a/htdocs/includes/fontawesome/less/rotated-flipped.less b/htdocs/theme/common/fontawesome/less/rotated-flipped.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/rotated-flipped.less
rename to htdocs/theme/common/fontawesome/less/rotated-flipped.less
diff --git a/htdocs/includes/fontawesome/less/screen-reader.less b/htdocs/theme/common/fontawesome/less/screen-reader.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/screen-reader.less
rename to htdocs/theme/common/fontawesome/less/screen-reader.less
diff --git a/htdocs/includes/fontawesome/less/stacked.less b/htdocs/theme/common/fontawesome/less/stacked.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/stacked.less
rename to htdocs/theme/common/fontawesome/less/stacked.less
diff --git a/htdocs/includes/fontawesome/less/variables.less b/htdocs/theme/common/fontawesome/less/variables.less
similarity index 100%
rename from htdocs/includes/fontawesome/less/variables.less
rename to htdocs/theme/common/fontawesome/less/variables.less
diff --git a/htdocs/includes/fontawesome/package.json b/htdocs/theme/common/fontawesome/package.json
similarity index 100%
rename from htdocs/includes/fontawesome/package.json
rename to htdocs/theme/common/fontawesome/package.json
diff --git a/htdocs/includes/fontawesome/scss/_animated.scss b/htdocs/theme/common/fontawesome/scss/_animated.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_animated.scss
rename to htdocs/theme/common/fontawesome/scss/_animated.scss
diff --git a/htdocs/includes/fontawesome/scss/_bordered-pulled.scss b/htdocs/theme/common/fontawesome/scss/_bordered-pulled.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_bordered-pulled.scss
rename to htdocs/theme/common/fontawesome/scss/_bordered-pulled.scss
diff --git a/htdocs/includes/fontawesome/scss/_core.scss b/htdocs/theme/common/fontawesome/scss/_core.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_core.scss
rename to htdocs/theme/common/fontawesome/scss/_core.scss
diff --git a/htdocs/includes/fontawesome/scss/_fixed-width.scss b/htdocs/theme/common/fontawesome/scss/_fixed-width.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_fixed-width.scss
rename to htdocs/theme/common/fontawesome/scss/_fixed-width.scss
diff --git a/htdocs/includes/fontawesome/scss/_icons.scss b/htdocs/theme/common/fontawesome/scss/_icons.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_icons.scss
rename to htdocs/theme/common/fontawesome/scss/_icons.scss
diff --git a/htdocs/includes/fontawesome/scss/_larger.scss b/htdocs/theme/common/fontawesome/scss/_larger.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_larger.scss
rename to htdocs/theme/common/fontawesome/scss/_larger.scss
diff --git a/htdocs/includes/fontawesome/scss/_list.scss b/htdocs/theme/common/fontawesome/scss/_list.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_list.scss
rename to htdocs/theme/common/fontawesome/scss/_list.scss
diff --git a/htdocs/includes/fontawesome/scss/_mixins.scss b/htdocs/theme/common/fontawesome/scss/_mixins.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_mixins.scss
rename to htdocs/theme/common/fontawesome/scss/_mixins.scss
diff --git a/htdocs/includes/fontawesome/scss/_path.scss b/htdocs/theme/common/fontawesome/scss/_path.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_path.scss
rename to htdocs/theme/common/fontawesome/scss/_path.scss
diff --git a/htdocs/includes/fontawesome/scss/_rotated-flipped.scss b/htdocs/theme/common/fontawesome/scss/_rotated-flipped.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_rotated-flipped.scss
rename to htdocs/theme/common/fontawesome/scss/_rotated-flipped.scss
diff --git a/htdocs/includes/fontawesome/scss/_screen-reader.scss b/htdocs/theme/common/fontawesome/scss/_screen-reader.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_screen-reader.scss
rename to htdocs/theme/common/fontawesome/scss/_screen-reader.scss
diff --git a/htdocs/includes/fontawesome/scss/_stacked.scss b/htdocs/theme/common/fontawesome/scss/_stacked.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_stacked.scss
rename to htdocs/theme/common/fontawesome/scss/_stacked.scss
diff --git a/htdocs/includes/fontawesome/scss/_variables.scss b/htdocs/theme/common/fontawesome/scss/_variables.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/_variables.scss
rename to htdocs/theme/common/fontawesome/scss/_variables.scss
diff --git a/htdocs/includes/fontawesome/scss/font-awesome.scss b/htdocs/theme/common/fontawesome/scss/font-awesome.scss
similarity index 100%
rename from htdocs/includes/fontawesome/scss/font-awesome.scss
rename to htdocs/theme/common/fontawesome/scss/font-awesome.scss