diff --git a/Models/Brands/Logos/Webenv/render.conf.tpl b/Models/Brands/Logos/Webenv/render.conf.tpl
index 54bf495..8a9bc99 100644
--- a/Models/Brands/Logos/Webenv/render.conf.tpl
+++ b/Models/Brands/Logos/Webenv/render.conf.tpl
@@ -3,7 +3,7 @@
 
 [centos-logo.png]  
 render-type = "svg"
-render-from = "${TCAR_BASEDIR}/Artworks/Brands/{Symbols/Webenv/centos.svgz,Types/Webenv/centos.svgz}"
+render-from = "${TCAR_BASEDIR}/Models/Brands/{Symbols/Webenv/centos.svgz,Types/Webenv/centos.svgz}"
 render-flow = "extended"
 export-id   = "CENTOSARTWORK"
 formats     = "xpm pdf jpg tif"
diff --git a/Models/Brands/Symbols/Default/render.conf.tpl b/Models/Brands/Symbols/Default/render.conf.tpl
index 3d512f1..98facab 100644
--- a/Models/Brands/Symbols/Default/render.conf.tpl
+++ b/Models/Brands/Symbols/Default/render.conf.tpl
@@ -3,7 +3,7 @@
 
 [centos.png]
 render-type = "svg"
-render-from = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/centos.svgz"
+render-from = "${TCAR_BASEDIR}/Models/Brands/Symbols/Default/centos.svgz"
 render-flow = "extended"
 formats     = "xpm pdf jpg tif"
 heights     = "11 16 20 22 24 26 32 36 38 40 48 52 64 72 78 96 112 124 128 148 164 196 200 512"
diff --git a/Models/Distribution/Anaconda/Rnotes/render.conf b/Models/Distribution/Anaconda/Rnotes/render.conf
deleted file mode 100755
index 8a334f6..0000000
--- a/Models/Distribution/Anaconda/Rnotes/render.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-[01-welcome.png]
-render-type = "svg"
-render-flow = "base"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/01-welcome.svgz"
-locale-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/01-welcome.svgz.po"
-
-[02-donate.png]
-render-type = "svg"
-render-flow = "base"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/02-donate.svgz"
-locale-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/02-donate.svgz.po"
-
-[03-yum.png]
-render-type = "svg"
-render-flow = "base"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/03-yum.svgz"
-locale-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/03-yum.svgz.po"
-
-[04-repos.png]
-render-type = "svg"
-render-flow = "base"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/04-repos.svgz"
-locale-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/04-repos.svgz.po"
-
-[05-centosplus.png]
-render-type = "svg"
-render-flow = "base"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/05-centosplus.svgz"
-locale-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/05-centosplus.svgz.po"
-
-[06-support.png]
-render-type = "svg"
-render-flow = "base"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/06-support.svgz"
-locale-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/06-support.svgz.po"
-
-[07-docs.png]
-render-type = "svg"
-render-flow = "base"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/07-docs.svgz"
-locale-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/07-docs.svgz.po"
-
-[08-wiki.png]
-render-type = "svg"
-render-flow = "base"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/08-wiki.svgz"
-locale-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/08-wiki.svgz.po"
-
-[09-virtualization.png]
-render-type = "svg"
-render-flow = "base"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/09-virtualization.svgz"
-locale-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/09-virtualization.svgz.po"
diff --git a/Models/Distribution/Anaconda/Rnotes/render.conf.tpl b/Models/Distribution/Anaconda/Rnotes/render.conf.tpl
new file mode 100755
index 0000000..e0d8ff4
--- /dev/null
+++ b/Models/Distribution/Anaconda/Rnotes/render.conf.tpl
@@ -0,0 +1,53 @@
+[01-welcome.png]
+render-type = "svg"
+render-flow = "base"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/01-welcome.svgz"
+locale-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/01-welcome.svgz.po"
+
+[02-donate.png]
+render-type = "svg"
+render-flow = "base"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/02-donate.svgz"
+locale-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/02-donate.svgz.po"
+
+[03-yum.png]
+render-type = "svg"
+render-flow = "base"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/03-yum.svgz"
+locale-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/03-yum.svgz.po"
+
+[04-repos.png]
+render-type = "svg"
+render-flow = "base"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/04-repos.svgz"
+locale-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/04-repos.svgz.po"
+
+[05-centosplus.png]
+render-type = "svg"
+render-flow = "base"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/05-centosplus.svgz"
+locale-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/05-centosplus.svgz.po"
+
+[06-support.png]
+render-type = "svg"
+render-flow = "base"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/06-support.svgz"
+locale-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/06-support.svgz.po"
+
+[07-docs.png]
+render-type = "svg"
+render-flow = "base"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/07-docs.svgz"
+locale-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/07-docs.svgz.po"
+
+[08-wiki.png]
+render-type = "svg"
+render-flow = "base"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/08-wiki.svgz"
+locale-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/08-wiki.svgz.po"
+
+[09-virtualization.png]
+render-type = "svg"
+render-flow = "base"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/09-virtualization.svgz"
+locale-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/Locales/${TCAR_SCRIPT_LANG_LC}/09-virtualization.svgz.po"
diff --git a/Models/Distribution/Anaconda/render.conf b/Models/Distribution/Anaconda/render.conf
deleted file mode 100755
index ef2cb9a..0000000
--- a/Models/Distribution/Anaconda/render.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-[anaconda_header.png]
-render-type = "svg"
-render-flow = "base"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/anaconda_header.svgz"
-locale-from = "no-locale"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+20+44"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Final/ffffff/ffffff-0/48/5.png:x48+160+20"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+732+20"
-
-[first.png]
-render-type = "svg"
-render-flow = "base"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/first.svgz"
-locale-from = "no-locale"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+30+20"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+30+225"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Final/ffffff/ffffff-0/48/5.png:x48+170+201"
-
-[splash.png]
-render-type = "svg"
-render-flow = "base"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Anaconda/splash.svgz"
-locale-from = "no-locale"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+30+20"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+30+156"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Final/ffffff/ffffff-0/48/5.png:x48+170+132"
diff --git a/Models/Distribution/Anaconda/render.conf.tpl b/Models/Distribution/Anaconda/render.conf.tpl
new file mode 100755
index 0000000..fe62a03
--- /dev/null
+++ b/Models/Distribution/Anaconda/render.conf.tpl
@@ -0,0 +1,26 @@
+[anaconda_header.png]
+render-type = "svg"
+render-flow = "base"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/anaconda_header.svgz"
+locale-from = "no-locale"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+20+44"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Final/ffffff/ffffff-0/48/5.png:x48+160+20"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+732+20"
+
+[first.png]
+render-type = "svg"
+render-flow = "base"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/first.svgz"
+locale-from = "no-locale"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+30+20"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+30+225"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Final/ffffff/ffffff-0/48/5.png:x48+170+201"
+
+[splash.png]
+render-type = "svg"
+render-flow = "base"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Anaconda/splash.svgz"
+locale-from = "no-locale"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+30+20"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+30+156"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Final/ffffff/ffffff-0/48/5.png:x48+170+132"
diff --git a/Models/Distribution/Bootloader/render.conf b/Models/Distribution/Bootloader/render.conf
deleted file mode 100644
index 8628cae..0000000
--- a/Models/Distribution/Bootloader/render.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[splash.png]
-render-type     = "svg"
-render-flow     = "base"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Grub/splash.svgz"
-
-[splash.xpm]
-render-type     = "palette"
-render-from     = "Final/splash.png"
-palette-gpl     = "${TCAR_BASEDIR}/Artworks/Themes/Motifs/${MOTIF}/Palettes/grub.gpl"
-
-[splash.xpm.gz]
-render-type     = "compress"
-render-from     = "Final/splash.xpm"
-command         = "/bin/gzip -f"
diff --git a/Models/Distribution/Bootloader/render.conf.tpl b/Models/Distribution/Bootloader/render.conf.tpl
new file mode 100644
index 0000000..ae800e9
--- /dev/null
+++ b/Models/Distribution/Bootloader/render.conf.tpl
@@ -0,0 +1,14 @@
+[splash.png]
+render-type     = "svg"
+render-flow     = "base"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Grub/splash.svgz"
+
+[splash.xpm]
+render-type     = "palette"
+render-from     = "Final/splash.png"
+palette-gpl     = "${TCAR_BASEDIR}/Artworks/Themes/Motifs/${MOTIF}/Palettes/grub.gpl"
+
+[splash.xpm.gz]
+render-type     = "compress"
+render-from     = "Final/splash.xpm"
+command         = "/bin/gzip -f"
diff --git a/Models/Distribution/Firstboot/render.conf b/Models/Distribution/Firstboot/render.conf
deleted file mode 100644
index 683a0c7..0000000
--- a/Models/Distribution/Firstboot/render.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[firstboot-left.png]
-render-type     = "svg"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Firstboot/firstboot-left.svgz"
-render-flow     = "base"
-brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+10+542"
-
-[splash-small.png]
-render-type     = "svg"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Firstboot/splash-small.svgz"
-render-flow     = "base"
-brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+30+156"
-brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Final/ffffff/ffffff-0/48/5.png:x48+170+132"
-brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+30+20"
diff --git a/Models/Distribution/Firstboot/render.conf.tpl b/Models/Distribution/Firstboot/render.conf.tpl
new file mode 100644
index 0000000..c60a7c9
--- /dev/null
+++ b/Models/Distribution/Firstboot/render.conf.tpl
@@ -0,0 +1,13 @@
+[firstboot-left.png]
+render-type     = "svg"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Firstboot/firstboot-left.svgz"
+render-flow     = "base"
+brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+10+542"
+
+[splash-small.png]
+render-type     = "svg"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Firstboot/splash-small.svgz"
+render-flow     = "base"
+brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+30+156"
+brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Final/ffffff/ffffff-0/48/5.png:x48+170+132"
+brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+30+20"
diff --git a/Models/Distribution/Gdm/render.conf b/Models/Distribution/Gdm/render.conf
deleted file mode 100644
index 3d7dcd8..0000000
--- a/Models/Distribution/Gdm/render.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-[screenshot.png]
-render-type     = "svg"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Gdm/screenshot.svgz"
-render-flow     = "base"
-brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/16/centos.png:x16+5+5"
-
-[800x600.tar.gz]
-render-type     = "archive"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Motifs/${MOTIF}/Backgrounds/Final/800x600.png:background.png"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Gdm/GdmGreeterTheme.desktop"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Gdm/GdmGreeterTheme.xml"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Gdm/icon-language.png"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Gdm/icon-reboot.png"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Gdm/icon-session.png"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Gdm/icon-shutdown.png"
-render-from     = "Final/screenshot.png"
-command         = "/bin/tar -czf"
-
-[1360x768.tar.gz]
-render-type     = "archive"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Motifs/${MOTIF}/Backgrounds/Final/1360x768.png:background.png"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Gdm/GdmGreeterTheme.desktop"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Gdm/GdmGreeterTheme.xml"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Gdm/icon-language.png"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Gdm/icon-reboot.png"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Gdm/icon-session.png"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Gdm/icon-shutdown.png"
-render-from     = "Final/screenshot.png"
-command         = "/bin/tar --remove-files -czf"
diff --git a/Models/Distribution/Gdm/render.conf.tpl b/Models/Distribution/Gdm/render.conf.tpl
new file mode 100644
index 0000000..4b53cc1
--- /dev/null
+++ b/Models/Distribution/Gdm/render.conf.tpl
@@ -0,0 +1,29 @@
+[screenshot.png]
+render-type     = "svg"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Gdm/screenshot.svgz"
+render-flow     = "base"
+brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/16/centos.png:x16+5+5"
+
+[800x600.tar.gz]
+render-type     = "archive"
+render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Motifs/${MOTIF}/Backgrounds/Final/800x600.png:background.png"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Gdm/GdmGreeterTheme.desktop"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Gdm/GdmGreeterTheme.xml"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Gdm/icon-language.png"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Gdm/icon-reboot.png"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Gdm/icon-session.png"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Gdm/icon-shutdown.png"
+render-from     = "Final/screenshot.png"
+command         = "/bin/tar -czf"
+
+[1360x768.tar.gz]
+render-type     = "archive"
+render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Motifs/${MOTIF}/Backgrounds/Final/1360x768.png:background.png"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Gdm/GdmGreeterTheme.desktop"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Gdm/GdmGreeterTheme.xml"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Gdm/icon-language.png"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Gdm/icon-reboot.png"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Gdm/icon-session.png"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Gdm/icon-shutdown.png"
+render-from     = "Final/screenshot.png"
+command         = "/bin/tar --remove-files -czf"
diff --git a/Models/Distribution/Gnome-splash/render.conf b/Models/Distribution/Gnome-splash/render.conf
deleted file mode 100644
index ae825e6..0000000
--- a/Models/Distribution/Gnome-splash/render.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[gnome-splash.png]
-render-type = "svg"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Gsplash/gnome-splash.svgz"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+10+190"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Final/ffffff/ffffff-0/48/5.png:x48+150+166"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+10+10"
diff --git a/Models/Distribution/Gnome-splash/render.conf.tpl b/Models/Distribution/Gnome-splash/render.conf.tpl
new file mode 100644
index 0000000..a092e17
--- /dev/null
+++ b/Models/Distribution/Gnome-splash/render.conf.tpl
@@ -0,0 +1,6 @@
+[gnome-splash.png]
+render-type = "svg"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Gsplash/gnome-splash.svgz"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+10+190"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Final/ffffff/ffffff-0/48/5.png:x48+150+166"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+10+10"
diff --git a/Models/Distribution/Kde-splash/render.conf b/Models/Distribution/Kde-splash/render.conf
deleted file mode 100644
index fe88242..0000000
--- a/Models/Distribution/Kde-splash/render.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-[splash_active_bar.png]
-render-type     = "svg"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Ksplash/splash_active_bar.svgz"
-render-flow     = "base"
-
-[splash_bottom.png]
-render-type     = "svg"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Ksplash/splash_bottom.svgz"
-render-flow     = "base"
-
-[splash_inactive_bar.png]
-render-type     = "svg"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Ksplash/splash_inactive_bar.svgz"
-render-flow     = "base"
-
-[splash_top.png]
-render-type     = "svg"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Ksplash/splash_top.svgz"
-render-flow     = "base"
-brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+10+189"
-brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Final/ffffff/ffffff-0/48/5.png:x48+150+165"
-brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+10+10"
-
-[Preview.png]
-render-type     = "images"
-render-from     = "Final/splash_top.png"
-render-from     = "Final/splash_active_bar.png"
-render-from     = "Final/splash_bottom.png"
-command         = "/usr/bin/convert -append"
-
-[ksplash.tar.gz]
-render-type     = "archive"
-render-from     = "Final/splash_top.png"
-render-from     = "Final/splash_active_bar.png"
-render-from     = "Final/splash_bottom.png"
-render-from     = "Final/Preview.png
-command         = "/bin/tar -czf"
diff --git a/Models/Distribution/Kde-splash/render.conf.tpl b/Models/Distribution/Kde-splash/render.conf.tpl
new file mode 100644
index 0000000..90ea07c
--- /dev/null
+++ b/Models/Distribution/Kde-splash/render.conf.tpl
@@ -0,0 +1,37 @@
+[splash_active_bar.png]
+render-type     = "svg"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Ksplash/splash_active_bar.svgz"
+render-flow     = "base"
+
+[splash_bottom.png]
+render-type     = "svg"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Ksplash/splash_bottom.svgz"
+render-flow     = "base"
+
+[splash_inactive_bar.png]
+render-type     = "svg"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Ksplash/splash_inactive_bar.svgz"
+render-flow     = "base"
+
+[splash_top.png]
+render-type     = "svg"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Ksplash/splash_top.svgz"
+render-flow     = "base"
+brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+10+189"
+brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Final/ffffff/ffffff-0/48/5.png:x48+150+165"
+brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+10+10"
+
+[Preview.png]
+render-type     = "images"
+render-from     = "Final/splash_top.png"
+render-from     = "Final/splash_active_bar.png"
+render-from     = "Final/splash_bottom.png"
+command         = "/usr/bin/convert -append"
+
+[ksplash.tar.gz]
+render-type     = "archive"
+render-from     = "Final/splash_top.png"
+render-from     = "Final/splash_active_bar.png"
+render-from     = "Final/splash_bottom.png"
+render-from     = "Final/Preview.png
+command         = "/bin/tar -czf"
diff --git a/Models/Distribution/Kdm/render.conf b/Models/Distribution/Kdm/render.conf
deleted file mode 100644
index 28db80c..0000000
--- a/Models/Distribution/Kdm/render.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-[screenshot.png]
-render-type     = "svg"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Kdm/screenshot.svgz"
-render-flow     = "base"
-brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/16/centos.png:x16+5+5"
-
-[800x600.tar.gz]
-render-type     = "archive"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Motifs/${MOTIF}/Backgrounds/Final/800x600.png:background.png"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Kdm/GdmGreeterTheme.desktop"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Kdm/GdmGreeterTheme.xml"
-render-from     = "Final/screenshot.png"
-command         = "/bin/tar --remove-files -czf"
-
-[1360x768.tar.gz]
-render-type     = "archive"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Motifs/${MOTIF}/Backgrounds/Final/1360x768.png:background.png"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Kdm/GdmGreeterTheme.desktop"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Kdm/GdmGreeterTheme.xml"
-render-from     = "Final/screenshot.png"
-command         = "/bin/tar --remove-files -czf"
diff --git a/Models/Distribution/Kdm/render.conf.tpl b/Models/Distribution/Kdm/render.conf.tpl
new file mode 100644
index 0000000..d02a969
--- /dev/null
+++ b/Models/Distribution/Kdm/render.conf.tpl
@@ -0,0 +1,21 @@
+[screenshot.png]
+render-type     = "svg"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Kdm/screenshot.svgz"
+render-flow     = "base"
+brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/16/centos.png:x16+5+5"
+
+[800x600.tar.gz]
+render-type     = "archive"
+render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Motifs/${MOTIF}/Backgrounds/Final/800x600.png:background.png"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Kdm/GdmGreeterTheme.desktop"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Kdm/GdmGreeterTheme.xml"
+render-from     = "Final/screenshot.png"
+command         = "/bin/tar --remove-files -czf"
+
+[1360x768.tar.gz]
+render-type     = "archive"
+render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Motifs/${MOTIF}/Backgrounds/Final/1360x768.png:background.png"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Kdm/GdmGreeterTheme.desktop"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Kdm/GdmGreeterTheme.xml"
+render-from     = "Final/screenshot.png"
+command         = "/bin/tar --remove-files -czf"
diff --git a/Models/Distribution/Release-notes/render.conf.tpl b/Models/Distribution/Release-notes/render.conf.tpl
index af40069..170dbf4 100644
--- a/Models/Distribution/Release-notes/render.conf.tpl
+++ b/Models/Distribution/Release-notes/render.conf.tpl
@@ -1,31 +1,31 @@
 [release_notes.html]
 render-type     = "asciidoc"
 render-flow     = "article"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Release_notes/release_notes.asciidoc"
-locale-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Release_notes/Locales/${TCAR_SCRIPT_LANG_LC}/release_notes.asciidoc.po"
+render-from     = "${TCAR_BASEDIR}/Models/Release_notes/release_notes.asciidoc"
+locale-from     = "${TCAR_BASEDIR}/Models/Release_notes/Locales/${TCAR_SCRIPT_LANG_LC}/release_notes.asciidoc.po"
 formats         = "xhtml"
 render-page     = "single-notoc"
 
 [index.html]
 render-type     = "asciidoc"
 render-flow     = "article"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Release_notes/index.asciidoc"
-locale-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Release_notes/Locales/${TCAR_SCRIPT_LANG_LC}/index.asciidoc.po"
+render-from     = "${TCAR_BASEDIR}/Models/Release_notes/index.asciidoc"
+locale-from     = "${TCAR_BASEDIR}/Models/Release_notes/Locales/${TCAR_SCRIPT_LANG_LC}/index.asciidoc.po"
 formats         = "xhtml"
 render-page     = "single-notoc"
 
 [firefox_service_agreement.html]
 render-type     = "asciidoc"
 render-flow     = "article"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Release_notes/firefox_service_agreement.asciidoc"
-locale-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Release_notes/Locales/${TCAR_SCRIPT_LANG_LC}/firefox_service_agreement.asciidoc.po"
+render-from     = "${TCAR_BASEDIR}/Models/Release_notes/firefox_service_agreement.asciidoc"
+locale-from     = "${TCAR_BASEDIR}/Models/Release_notes/Locales/${TCAR_SCRIPT_LANG_LC}/firefox_service_agreement.asciidoc.po"
 formats         = "xhtml"
 render-page     = "single-notoc"
 
 [eula.html]
 render-type     = "asciidoc"
 render-flow     = "article"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Release_notes/eula.asciidoc"
-locale-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Release_notes/Locales/${TCAR_SCRIPT_LANG_LC}/eula.asciidoc.po"
+render-from     = "${TCAR_BASEDIR}/Models/Release_notes/eula.asciidoc"
+locale-from     = "${TCAR_BASEDIR}/Models/Release_notes/Locales/${TCAR_SCRIPT_LANG_LC}/eula.asciidoc.po"
 formats         = "xhtml"
 render-page     = "single-notoc"
diff --git a/Models/Distribution/Rhgb/render.conf b/Models/Distribution/Rhgb/render.conf
deleted file mode 100644
index 0ac2574..0000000
--- a/Models/Distribution/Rhgb/render.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[large-computer.png]
-render-type = "svg"
-render-flow = "base"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Rhgb/large-computer.svgz"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+30+30"
-
-[main-logo.png]
-render-type = "svg"
-render-flow = "base"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Rhgb/main-logo.svgz"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/124/centos.png:x124+186.5+21"
-
-[system-logo.png]
-render-type = "svg"
-render-flow = "base"
-render-from = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Rhgb/system-logo.svgz"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+5+24"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Final/ffffff/ffffff-0/48/5.png:x48+143+0"
diff --git a/Models/Distribution/Rhgb/render.conf.tpl b/Models/Distribution/Rhgb/render.conf.tpl
new file mode 100644
index 0000000..01007f2
--- /dev/null
+++ b/Models/Distribution/Rhgb/render.conf.tpl
@@ -0,0 +1,18 @@
+[large-computer.png]
+render-type = "svg"
+render-flow = "base"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Rhgb/large-computer.svgz"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+30+30"
+
+[main-logo.png]
+render-type = "svg"
+render-flow = "base"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Rhgb/main-logo.svgz"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/124/centos.png:x124+186.5+21"
+
+[system-logo.png]
+render-type = "svg"
+render-flow = "base"
+render-from = "${TCAR_BASEDIR}/Models/Distro/5/Rhgb/system-logo.svgz"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+5+24"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Final/ffffff/ffffff-0/48/5.png:x48+143+0"
diff --git a/Models/Distribution/Syslinux/render.conf.tpl b/Models/Distribution/Syslinux/render.conf.tpl
index 7019de3..861657c 100644
--- a/Models/Distribution/Syslinux/render.conf.tpl
+++ b/Models/Distribution/Syslinux/render.conf.tpl
@@ -1,6 +1,6 @@
 [syslinux-splash.png]
 render-type     = "svg"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Syslinux/syslinux-splash.svgz"
+render-from     = "${TCAR_BASEDIR}/Models/Distro/5/Syslinux/syslinux-splash.svgz"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/48/centos.png:x48+20+232"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Final/ffffff/ffffff-0/96/5.png:x96+300+184"
 
diff --git a/Models/Promotion/Cd-labels/render.conf.tpl b/Models/Promotion/Cd-labels/render.conf.tpl
index ac221fb..c34e069 100644
--- a/Models/Promotion/Cd-labels/render.conf.tpl
+++ b/Models/Promotion/Cd-labels/render.conf.tpl
@@ -1,8 +1,8 @@
 [label-install-cd]
 render-type     = "svg"
 render-flow     = "media"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/label-install.svgz"
-locale-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/label-install.svgz.po"
+render-from     = "${TCAR_BASEDIR}/Models/Media/label-install.svgz"
+locale-from     = "${TCAR_BASEDIR}/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/label-install.svgz.po"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+272.289+255"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+737.289+255"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/20/centos.png:x20+105+417"
@@ -15,8 +15,8 @@ media-arch      = "i386 x86_64"
 [label-install-dvd]
 render-type     = "svg"
 render-flow     = "media"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/label-install.svgz"
-locale-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/label-install.svgz.po"
+render-from     = "${TCAR_BASEDIR}/Models/Media/label-install.svgz"
+locale-from     = "${TCAR_BASEDIR}/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/label-install.svgz.po"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+272.289+255"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+737.289+255"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/20/centos.png:x20+105+417"
@@ -29,8 +29,8 @@ media-arch      = "i386 x86_64"
 [label-live-cd]
 render-type     = "svg"
 render-flow     = "media"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/label-live.svgz"
-locale-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/label-live.svgz.po"
+render-from     = "${TCAR_BASEDIR}/Models/Media/label-live.svgz"
+locale-from     = "${TCAR_BASEDIR}/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/label-live.svgz.po"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+272.289+255"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+737.289+255"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/20/centos.png:x20+105+417"
@@ -43,8 +43,8 @@ media-arch      = "i386 x86_64"
 [label-live-dvd]
 render-type     = "svg"
 render-flow     = "media"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/label-live.svgz"
-locale-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/label-live.svgz.po"
+render-from     = "${TCAR_BASEDIR}/Models/Media/label-live.svgz"
+locale-from     = "${TCAR_BASEDIR}/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/label-live.svgz.po"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+272.289+255"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+737.289+255"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/20/centos.png:x20+105+417"
@@ -57,8 +57,8 @@ media-arch      = "i386 x86_64"
 [label-netinstall]
 render-type     = "svg"
 render-flow     = "media"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/label-netinstall.svgz"
-locale-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/label-netinstall.svgz.po"
+render-from     = "${TCAR_BASEDIR}/Models/Media/label-netinstall.svgz"
+locale-from     = "${TCAR_BASEDIR}/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/label-netinstall.svgz.po"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+272.289+255"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+737.289+255"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/20/centos.png:x20+105+417"
diff --git a/Models/Promotion/Cd-sleeves/render.conf.tpl b/Models/Promotion/Cd-sleeves/render.conf.tpl
index b815b72..c10625a 100644
--- a/Models/Promotion/Cd-sleeves/render.conf.tpl
+++ b/Models/Promotion/Cd-sleeves/render.conf.tpl
@@ -1,8 +1,8 @@
 [sleeve-install-cd]
 render-type     = "svg"
 render-flow     = "media"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/sleeve-install.svgz"
-locale-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/sleeve-install.svgz.po"
+render-from     = "${TCAR_BASEDIR}/Models/Media/sleeve-install.svgz"
+locale-from     = "${TCAR_BASEDIR}/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/sleeve-install.svgz.po"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+100+568"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+905+204"
 media-number    = "6"
@@ -13,8 +13,8 @@ media-arch      = "i386 x86_64"
 [sleeve-install-dvd]
 render-type     = "svg"
 render-flow     = "media"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/sleeve-install.svgz"
-locale-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/sleeve-install.svgz.po"
+render-from     = "${TCAR_BASEDIR}/Models/Media/sleeve-install.svgz"
+locale-from     = "${TCAR_BASEDIR}/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/sleeve-install.svgz.po"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+100+568"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+905+204"
 media-number    = "2"
@@ -25,8 +25,8 @@ media-arch      = "i386 x86_64"
 [sleeve-live-cd]
 render-type     = "svg"
 render-flow     = "media"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/sleeve-live.svgz"
-locale-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/sleeve-live.svgz.po"
+render-from     = "${TCAR_BASEDIR}/Models/Media/sleeve-live.svgz"
+locale-from     = "${TCAR_BASEDIR}/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/sleeve-live.svgz.po"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+100+568"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+905+204"
 media-number    = "1"
@@ -37,8 +37,8 @@ media-arch      = "i386 x86_64"
 [sleeve-live-dvd]
 render-type     = "svg"
 render-flow     = "media"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/sleeve-live.svgz"
-locale-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/sleeve-live.svgz.po"
+render-from     = "${TCAR_BASEDIR}/Models/Media/sleeve-live.svgz"
+locale-from     = "${TCAR_BASEDIR}/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/sleeve-live.svgz.po"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+100+568"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+905+204"
 media-number    = "1"
@@ -49,8 +49,8 @@ media-arch      = "i386 x86_64"
 [sleeve-netinstall]
 render-type     = "svg"
 render-flow     = "media"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/sleeve-netinstall.svgz"
-locale-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/sleeve-netinstall.svgz.po"
+render-from     = "${TCAR_BASEDIR}/Models/Media/sleeve-netinstall.svgz"
+locale-from     = "${TCAR_BASEDIR}/Models/Media/Locales/${TCAR_SCRIPT_LANG_LC}/sleeve-netinstall.svgz.po"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/24/centos.png:x24+100+568"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff/ffffff-0/48/centos.png:x48+905+204"
 media-number    = "1"
diff --git a/Models/Promotion/Posters/render.conf.tpl b/Models/Promotion/Posters/render.conf.tpl
index 4c0a619..41eeefd 100644
--- a/Models/Promotion/Posters/render.conf.tpl
+++ b/Models/Promotion/Posters/render.conf.tpl
@@ -1,7 +1,7 @@
 [744x1052.png]
 render-type     = "svg"
 render-flow     = "base"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Posters/744x1052.svgz"
+render-from     = "${TCAR_BASEDIR}/Models/Posters/744x1052.svgz"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/96/centos.png:x96+127+600"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/96/message.png:x96+127+716"
 brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff/ffffff-0/96/url.png:x96+127+832"
diff --git a/Models/Webenv/render.conf b/Models/Webenv/render.conf
deleted file mode 100644
index 671fd17..0000000
--- a/Models/Webenv/render.conf
+++ /dev/null
@@ -1,201 +0,0 @@
-[a-attach.png]
-render-type = "svg"
-render-from = "a-attach.svgz"
-
-[ads-sample-468x60.png]
-render-type = "svg"
-render-from = "ads-sample-468x60.svgz"
-
-[ads-sample-728x90.png]
-render-type = "svg"
-render-from = "ads-sample-728x90.svgz"
-
-[a-mail.png]
-render-type = "svg"
-render-from = "a-mail.svgz"
-
-[arrow.png]
-render-type = "svg"
-render-from = "arrow.svgz"
-
-[a-www.png]
-render-type = "svg"
-render-from = "a-www.svgz"
-
-[caution.png]
-render-type = "svg"
-render-from = "caution.svgz"
-
-[convention.png]
-render-type = "svg"
-render-from = "convention.svgz"
-
-[error.png]
-render-type = "svg"
-render-from = "error.svgz"
-
-[h1-bg.png]
-render-type = "svg"
-render-from = "h1-bg.svgz"
-
-[h2-bg.png]
-render-type = "svg"
-render-from = "h2-bg.svgz"
-
-[html-bg.png]
-render-type = "svg"
-render-from = "html-bg.svgz"
-
-[important.png]
-render-type = "svg"
-render-from = "important.svgz"
-
-[msg-bg-blue.png]
-render-type = "svg"
-render-from = "msg-bg-blue.svgz"
-
-[msg-bg-gray.png]
-render-type = "svg"
-render-from = "msg-bg-gray.svgz"
-
-[msg-bg-green.png]
-render-type = "svg"
-render-from = "msg-bg-green.svgz"
-
-[msg-bg-orange.png]
-render-type = "svg"
-render-from = "msg-bg-orange.svgz"
-
-[msg-bg-red.png]
-render-type = "svg"
-render-from = "msg-bg-red.svgz"
-
-[msg-bg-violet.png]
-render-type = "svg"
-render-from = "msg-bg-violet.svgz"
-
-[note.png]
-render-type = "svg"
-render-from = "note.svgz"
-
-[pagination-bg-1.png]
-render-type = "svg"
-render-from = "pagination-bg-1.svgz"
-
-[pagination-bg-2.png]
-render-type = "svg"
-render-from = "pagination-bg-2.svgz"
-
-[powered_by_centos.png]
-render-type = "svg"
-render-from = "powered_by_centos.svgz"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff-0/ffffff/26/centos.png:x26+3+3"
-brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff-0/ffffff/11/centos.png:x11+30+15.7"
-
-[redirect.png]
-render-type = "svg"
-render-from = "redirect.svgz"
-
-[success.png]
-render-type = "svg"
-render-from = "success.svgz"
-
-[tabs-bg-1.png]
-render-type = "svg"
-render-from = "tabs-bg-1.svgz"
-
-[tabs-bg-2.png]
-render-type = "svg"
-render-from = "tabs-bg-2.svgz"
-
-[tabs-bg-3.png]
-render-type = "svg"
-render-from = "tabs-bg-3.svgz"
-
-[tabs-bg-4.png]
-render-type = "svg"
-render-from = "tabs-bg-4.svgz"
-
-[tip.png]
-render-type = "svg"
-render-from = "tip.svgz"
-
-[toc-bg.png]
-render-type = "svg"
-render-from = "toc-bg.svgz"
-
-[top.png]
-render-type = "svg"
-render-from = "top.svgz"
-
-[ul.png]
-render-type = "svg"
-render-from = "ul.svgz"
-
-[warning.png]
-render-type = "svg"
-render-from = "warning.svgz"
-
-[0.png]
-render-type = "svg"
-render-from = "0.svgz"
-
-[1.png]
-render-type = "svg"
-render-from = "1.svgz"
-
-[2.png]
-render-type = "svg"
-render-from = "2.svgz"
-
-[3.png]
-render-type = "svg"
-render-from = "3.svgz"
-
-[4.png]
-render-type = "svg"
-render-from = "4.svgz"
-
-[5.png]
-render-type = "svg"
-render-from = "5.svgz"
-
-[6.png]
-render-type = "svg"
-render-from = "6.svgz"
-
-[7.png]
-render-type = "svg"
-render-from = "7.svgz"
-
-[8.png]
-render-type = "svg"
-render-from = "8.svgz"
-
-[9.png]
-render-type = "svg"
-render-from = "9.svgz"
-
-[10.png]
-render-type = "svg"
-render-from = "10.svgz"
-
-[11.png]
-render-type = "svg"
-render-from = "11.svgz"
-
-[12.png]
-render-type = "svg"
-render-from = "12.svgz"
-
-[13.png]
-render-type = "svg"
-render-from = "13.svgz"
-
-[14.png]
-render-type = "svg"
-render-from = "14.svgz"
-
-[15.png]
-render-type = "svg"
-render-from = "15.svgz"
diff --git a/Models/Webenv/render.conf.tpl b/Models/Webenv/render.conf.tpl
new file mode 100644
index 0000000..671fd17
--- /dev/null
+++ b/Models/Webenv/render.conf.tpl
@@ -0,0 +1,201 @@
+[a-attach.png]
+render-type = "svg"
+render-from = "a-attach.svgz"
+
+[ads-sample-468x60.png]
+render-type = "svg"
+render-from = "ads-sample-468x60.svgz"
+
+[ads-sample-728x90.png]
+render-type = "svg"
+render-from = "ads-sample-728x90.svgz"
+
+[a-mail.png]
+render-type = "svg"
+render-from = "a-mail.svgz"
+
+[arrow.png]
+render-type = "svg"
+render-from = "arrow.svgz"
+
+[a-www.png]
+render-type = "svg"
+render-from = "a-www.svgz"
+
+[caution.png]
+render-type = "svg"
+render-from = "caution.svgz"
+
+[convention.png]
+render-type = "svg"
+render-from = "convention.svgz"
+
+[error.png]
+render-type = "svg"
+render-from = "error.svgz"
+
+[h1-bg.png]
+render-type = "svg"
+render-from = "h1-bg.svgz"
+
+[h2-bg.png]
+render-type = "svg"
+render-from = "h2-bg.svgz"
+
+[html-bg.png]
+render-type = "svg"
+render-from = "html-bg.svgz"
+
+[important.png]
+render-type = "svg"
+render-from = "important.svgz"
+
+[msg-bg-blue.png]
+render-type = "svg"
+render-from = "msg-bg-blue.svgz"
+
+[msg-bg-gray.png]
+render-type = "svg"
+render-from = "msg-bg-gray.svgz"
+
+[msg-bg-green.png]
+render-type = "svg"
+render-from = "msg-bg-green.svgz"
+
+[msg-bg-orange.png]
+render-type = "svg"
+render-from = "msg-bg-orange.svgz"
+
+[msg-bg-red.png]
+render-type = "svg"
+render-from = "msg-bg-red.svgz"
+
+[msg-bg-violet.png]
+render-type = "svg"
+render-from = "msg-bg-violet.svgz"
+
+[note.png]
+render-type = "svg"
+render-from = "note.svgz"
+
+[pagination-bg-1.png]
+render-type = "svg"
+render-from = "pagination-bg-1.svgz"
+
+[pagination-bg-2.png]
+render-type = "svg"
+render-from = "pagination-bg-2.svgz"
+
+[powered_by_centos.png]
+render-type = "svg"
+render-from = "powered_by_centos.svgz"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Final/ffffff-0/ffffff/26/centos.png:x26+3+3"
+brand       = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Final/ffffff-0/ffffff/11/centos.png:x11+30+15.7"
+
+[redirect.png]
+render-type = "svg"
+render-from = "redirect.svgz"
+
+[success.png]
+render-type = "svg"
+render-from = "success.svgz"
+
+[tabs-bg-1.png]
+render-type = "svg"
+render-from = "tabs-bg-1.svgz"
+
+[tabs-bg-2.png]
+render-type = "svg"
+render-from = "tabs-bg-2.svgz"
+
+[tabs-bg-3.png]
+render-type = "svg"
+render-from = "tabs-bg-3.svgz"
+
+[tabs-bg-4.png]
+render-type = "svg"
+render-from = "tabs-bg-4.svgz"
+
+[tip.png]
+render-type = "svg"
+render-from = "tip.svgz"
+
+[toc-bg.png]
+render-type = "svg"
+render-from = "toc-bg.svgz"
+
+[top.png]
+render-type = "svg"
+render-from = "top.svgz"
+
+[ul.png]
+render-type = "svg"
+render-from = "ul.svgz"
+
+[warning.png]
+render-type = "svg"
+render-from = "warning.svgz"
+
+[0.png]
+render-type = "svg"
+render-from = "0.svgz"
+
+[1.png]
+render-type = "svg"
+render-from = "1.svgz"
+
+[2.png]
+render-type = "svg"
+render-from = "2.svgz"
+
+[3.png]
+render-type = "svg"
+render-from = "3.svgz"
+
+[4.png]
+render-type = "svg"
+render-from = "4.svgz"
+
+[5.png]
+render-type = "svg"
+render-from = "5.svgz"
+
+[6.png]
+render-type = "svg"
+render-from = "6.svgz"
+
+[7.png]
+render-type = "svg"
+render-from = "7.svgz"
+
+[8.png]
+render-type = "svg"
+render-from = "8.svgz"
+
+[9.png]
+render-type = "svg"
+render-from = "9.svgz"
+
+[10.png]
+render-type = "svg"
+render-from = "10.svgz"
+
+[11.png]
+render-type = "svg"
+render-from = "11.svgz"
+
+[12.png]
+render-type = "svg"
+render-from = "12.svgz"
+
+[13.png]
+render-type = "svg"
+render-from = "13.svgz"
+
+[14.png]
+render-type = "svg"
+render-from = "14.svgz"
+
+[15.png]
+render-type = "svg"
+render-from = "15.svgz"