diff --git a/Documentation/Models/Docbook/Tcar-ug/Repository/Conventions/directories.docbook b/Documentation/Models/Docbook/Tcar-ug/Repository/Conventions/directories.docbook
index 4de2550..c980bb2 100755
--- a/Documentation/Models/Docbook/Tcar-ug/Repository/Conventions/directories.docbook
+++ b/Documentation/Models/Docbook/Tcar-ug/Repository/Conventions/directories.docbook
@@ -35,7 +35,12 @@
<listitem>
<para>
This directory contains GIMP brushes. Brushes stored in this
- directory will be available inside GIMP's brushes dialog.
+ directory will be available inside GIMP's brushes dialog. This
+ directory organizes brushes files inside <filename
+ class="directory">Images</filename> and <filename
+ class="directory">Models</filename> directories. Inside
+ <filename class="directory">Models</filename> directory we
+ find the GIMP projects used to build the brush images.
</para>
</listitem>
</varlistentry>
@@ -45,7 +50,12 @@
<listitem>
<para>
This directory contains GIMP patterns. Patterns stored in this
- directory will be available inside GIMP's patterns dialog.
+ directory will be available inside GIMP's patterns dialog. This
+ directory organizes patterns files inside <filename
+ class="directory">Images</filename> and <filename
+ class="directory">Models</filename> directories. Inside
+ <filename class="directory">Models</filename> directory we
+ find the GIMP projects used to build the pattern images.
</para>
</listitem>
</varlistentry>
@@ -56,7 +66,11 @@
<para>
This directory contains GIMP gradients. Gradients stored in
this directory will be available inside GIMP's gradients
- dialog.
+ dialog. This directory organizes gradient files inside
+ <filename class="directory">Images</filename> and <filename
+ class="directory">Models</filename> directories. Inside
+ <filename class="directory">Models</filename> directory we
+ find the GIMP projects used to build the gradient images.
</para>
</listitem>
</varlistentry>
@@ -67,7 +81,13 @@
<para>
This directory contains font files. Font files stored in this
directory will be available to be used from applications like
- GIMP and Inkscape.
+ GIMP and Inkscape. This directory organizes font files inside
+ <filename class="directory">Images</filename> and <filename
+ class="directory">Models</filename> directories. Inside
+ <filename class="directory">Models</filename> directory we
+ find the Fontforge projects used to build the font files,
+ which are stored in the <filename
+ class="directory">Images</filename> directory.
</para>
</listitem>
</varlistentry>
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Images/1360x768-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Images/1360x768-final.png
new file mode 100644
index 0000000..27c2170
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Images/1360x768-final.png differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Images/160x600-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Images/160x600-final.png
new file mode 100644
index 0000000..449490b
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Images/160x600-final.png differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Images/200x150-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Images/200x150-final.png
new file mode 100644
index 0000000..951d6b9
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Images/200x150-final.png differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Images/2048x1536-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Images/2048x1536-final.png
new file mode 100644
index 0000000..729bde2
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Images/2048x1536-final.png differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Images/400x300-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Images/400x300-final.png
new file mode 100644
index 0000000..29c7e9f
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Images/400x300-final.png differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Images/490x200-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Images/490x200-final.png
new file mode 100644
index 0000000..4190bed
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Images/490x200-final.png differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Images/510x300-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Images/510x300-final.png
new file mode 100644
index 0000000..5e486e6
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Images/510x300-final.png differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Images/640x300-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Images/640x300-final.png
new file mode 100644
index 0000000..9f803eb
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Images/640x300-final.png differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Images/640x480-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Images/640x480-final.png
new file mode 100644
index 0000000..7a6db61
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Images/640x480-final.png differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Images/744x1052-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Images/744x1052-final.png
new file mode 100644
index 0000000..4197e06
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Images/744x1052-final.png differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Images/800x600-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Images/800x600-final.png
new file mode 100644
index 0000000..884abd4
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Images/800x600-final.png differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Images/800x88-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Images/800x88-final.png
new file mode 100644
index 0000000..3541f15
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Images/800x88-final.png differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/1360x768-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/1360x768-final.png
deleted file mode 100644
index 27c2170..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/1360x768-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/160x600-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/160x600-final.png
deleted file mode 100644
index 449490b..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/160x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/200x150-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/200x150-final.png
deleted file mode 100644
index 951d6b9..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/200x150-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/2048x1536-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/2048x1536-final.png
deleted file mode 100644
index 729bde2..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/2048x1536-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/400x300-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/400x300-final.png
deleted file mode 100644
index 29c7e9f..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/400x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/490x200-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/490x200-final.png
deleted file mode 100644
index 4190bed..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/490x200-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/510x300-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/510x300-final.png
deleted file mode 100644
index 5e486e6..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/510x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/640x300-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/640x300-final.png
deleted file mode 100644
index 9f803eb..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/640x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/640x480-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/640x480-final.png
deleted file mode 100644
index 7a6db61..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/640x480-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/744x1052-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/744x1052-final.png
deleted file mode 100644
index 4197e06..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/744x1052-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/800x600-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/800x600-final.png
deleted file mode 100644
index 884abd4..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/800x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/800x88-final.png b/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/800x88-final.png
deleted file mode 100644
index 3541f15..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Img/Png/800x88-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Models/1360x768.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Models/1360x768.xcf.bz2
new file mode 100644
index 0000000..0a73c06
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Models/1360x768.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Models/160x600.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Models/160x600.xcf.bz2
new file mode 100644
index 0000000..987ba45
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Models/160x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Models/200x150.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Models/200x150.xcf.bz2
new file mode 100644
index 0000000..f30a9a3
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Models/200x150.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Models/400x300.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Models/400x300.xcf.bz2
new file mode 100644
index 0000000..273c450
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Models/400x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Models/490x200.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Models/490x200.xcf.bz2
new file mode 100644
index 0000000..21621e4
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Models/490x200.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Models/510x300.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Models/510x300.xcf.bz2
new file mode 100644
index 0000000..4c7efda
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Models/510x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Models/640x300.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Models/640x300.xcf.bz2
new file mode 100644
index 0000000..7d2d82d
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Models/640x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Models/640x480.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Models/640x480.xcf.bz2
new file mode 100644
index 0000000..aa3bb26
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Models/640x480.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Models/800x600.xcf-flame.def b/Identity/Images/Themes/Flame/1/Backgrounds/Models/800x600.xcf-flame.def
new file mode 100644
index 0000000..c3f077c
--- /dev/null
+++ b/Identity/Images/Themes/Flame/1/Backgrounds/Models/800x600.xcf-flame.def
@@ -0,0 +1,18 @@
+time 0.2
+image_size 800 600 center -1.24242 -0.484848 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
+nbatches 1 white_level 200
+brightness 1 gamma 2 cmap_inter 0
+xform 0 density 1 color 1
+var 0 0 0.64 0.36 0 0 0
+coefs -0.249052 -0.865284 -0.505536 0.696706 0.294436 -0.486678
+xform 1 density 1 color 0
+var 0 0 0.64 0.36 0 0 0
+coefs 0.486958 -0.747844 -0.0663962 0.890023 -0.515725 0.730979
+xform 2 density 1 color 0
+var 0 0 0.64 0.36 0 0 0
+coefs 0.676688 -0.477677 0.571602 -0.258166 0.187789 -0.0563527
+xform 3 density 1 color 0
+var 0 0.64 0 0.36 0 0 0
+coefs 0.367907 -1.20587 0.352269 0.745245 -0.247248 -0.498265
+;
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Models/800x600.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Models/800x600.xcf.bz2
new file mode 100644
index 0000000..d2f6eb5
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Models/800x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Models/800x88.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Models/800x88.xcf.bz2
new file mode 100644
index 0000000..61b1202
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Backgrounds/Models/800x88.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/1360x768.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/1360x768.xcf.bz2
deleted file mode 100644
index 0a73c06..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/1360x768.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/160x600.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/160x600.xcf.bz2
deleted file mode 100644
index 987ba45..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/160x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/200x150.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/200x150.xcf.bz2
deleted file mode 100644
index f30a9a3..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/200x150.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/400x300.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/400x300.xcf.bz2
deleted file mode 100644
index 273c450..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/400x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/490x200.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/490x200.xcf.bz2
deleted file mode 100644
index 21621e4..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/490x200.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/510x300.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/510x300.xcf.bz2
deleted file mode 100644
index 4c7efda..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/510x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/640x300.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/640x300.xcf.bz2
deleted file mode 100644
index 7d2d82d..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/640x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/640x480.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/640x480.xcf.bz2
deleted file mode 100644
index aa3bb26..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/640x480.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/800x600.xcf-flame.def b/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/800x600.xcf-flame.def
deleted file mode 100644
index c3f077c..0000000
--- a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/800x600.xcf-flame.def
+++ /dev/null
@@ -1,18 +0,0 @@
-time 0.2
-image_size 800 600 center -1.24242 -0.484848 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
-nbatches 1 white_level 200
-brightness 1 gamma 2 cmap_inter 0
-xform 0 density 1 color 1
-var 0 0 0.64 0.36 0 0 0
-coefs -0.249052 -0.865284 -0.505536 0.696706 0.294436 -0.486678
-xform 1 density 1 color 0
-var 0 0 0.64 0.36 0 0 0
-coefs 0.486958 -0.747844 -0.0663962 0.890023 -0.515725 0.730979
-xform 2 density 1 color 0
-var 0 0 0.64 0.36 0 0 0
-coefs 0.676688 -0.477677 0.571602 -0.258166 0.187789 -0.0563527
-xform 3 density 1 color 0
-var 0 0.64 0 0.36 0 0 0
-coefs 0.367907 -1.20587 0.352269 0.745245 -0.247248 -0.498265
-;
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/800x600.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/800x600.xcf.bz2
deleted file mode 100644
index d2f6eb5..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/800x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/800x88.xcf.bz2 b/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/800x88.xcf.bz2
deleted file mode 100644
index 61b1202..0000000
Binary files a/Identity/Images/Themes/Flame/1/Backgrounds/Xcf/800x88.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/1/Concept/Models/motif.svgz b/Identity/Images/Themes/Flame/1/Concept/Models/motif.svgz
new file mode 100644
index 0000000..f157306
Binary files /dev/null and b/Identity/Images/Themes/Flame/1/Concept/Models/motif.svgz differ
diff --git a/Identity/Images/Themes/Flame/1/Concept/Tpl/motif.svgz b/Identity/Images/Themes/Flame/1/Concept/Tpl/motif.svgz
deleted file mode 100644
index f157306..0000000
Binary files a/Identity/Images/Themes/Flame/1/Concept/Tpl/motif.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Images/1360x768-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Images/1360x768-final.png
new file mode 100644
index 0000000..15a3d77
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Images/1360x768-final.png differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Images/160x600-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Images/160x600-final.png
new file mode 100644
index 0000000..e5ba7a4
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Images/160x600-final.png differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Images/200x150-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Images/200x150-final.png
new file mode 100644
index 0000000..aebf62e
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Images/200x150-final.png differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Images/400x300-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Images/400x300-final.png
new file mode 100644
index 0000000..9d5ae76
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Images/400x300-final.png differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Images/443x443-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Images/443x443-final.png
new file mode 100644
index 0000000..cb5f3c2
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Images/443x443-final.png differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Images/490x200-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Images/490x200-final.png
new file mode 100644
index 0000000..97c1a5d
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Images/490x200-final.png differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Images/510x300-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Images/510x300-final.png
new file mode 100644
index 0000000..94c4502
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Images/510x300-final.png differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Images/640x300-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Images/640x300-final.png
new file mode 100644
index 0000000..59667a6
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Images/640x300-final.png differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Images/640x480-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Images/640x480-final.png
new file mode 100644
index 0000000..bf8e7a6
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Images/640x480-final.png differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Images/744x1052-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Images/744x1052-final.png
new file mode 100644
index 0000000..1d826cf
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Images/744x1052-final.png differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Images/800x600-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Images/800x600-final.png
new file mode 100644
index 0000000..0e8d745
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Images/800x600-final.png differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Images/800x88-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Images/800x88-final.png
new file mode 100644
index 0000000..9b38df9
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Images/800x88-final.png differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Images/886x443-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Images/886x443-final.png
new file mode 100644
index 0000000..beb1184
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Images/886x443-final.png differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/1360x768-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/1360x768-final.png
deleted file mode 100644
index 15a3d77..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/1360x768-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/160x600-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/160x600-final.png
deleted file mode 100644
index e5ba7a4..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/160x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/200x150-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/200x150-final.png
deleted file mode 100644
index aebf62e..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/200x150-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/400x300-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/400x300-final.png
deleted file mode 100644
index 9d5ae76..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/400x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/443x443-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/443x443-final.png
deleted file mode 100644
index cb5f3c2..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/443x443-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/490x200-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/490x200-final.png
deleted file mode 100644
index 97c1a5d..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/490x200-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/510x300-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/510x300-final.png
deleted file mode 100644
index 94c4502..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/510x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/640x300-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/640x300-final.png
deleted file mode 100644
index 59667a6..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/640x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/640x480-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/640x480-final.png
deleted file mode 100644
index bf8e7a6..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/640x480-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/744x1052-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/744x1052-final.png
deleted file mode 100644
index 1d826cf..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/744x1052-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/800x600-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/800x600-final.png
deleted file mode 100644
index 0e8d745..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/800x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/800x88-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/800x88-final.png
deleted file mode 100644
index 9b38df9..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/800x88-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/886x443-final.png b/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/886x443-final.png
deleted file mode 100644
index beb1184..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Img/Png/886x443-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/1360x768.xcf-flame.def b/Identity/Images/Themes/Flame/2/Backgrounds/Models/1360x768.xcf-flame.def
new file mode 100644
index 0000000..e96193d
--- /dev/null
+++ b/Identity/Images/Themes/Flame/2/Backgrounds/Models/1360x768.xcf-flame.def
@@ -0,0 +1,15 @@
+time 0.2
+image_size 1360 768 center -0.751131 -0.280543 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
+nbatches 1 white_level 200
+brightness 1 gamma 2 cmap_inter 0
+xform 0 density 1 color 1
+var 0 0 0 0 1 0 0
+coefs 0.301841 -0.67335 -0.773104 -0.251116 0.044031 0.136135
+xform 1 density 1 color 0
+var 0 0 0 0 1 0 0
+coefs 0.509564 -0.428975 0.565256 -0.163823 -0.180255 0.167344
+xform 2 density 1 color 0
+var 0 0 1 0 0 0 0
+coefs -0.675703 -0.051893 0.815703 -0.399177 0.308701 -0.15378
+;
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/1360x768.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Models/1360x768.xcf.bz2
new file mode 100644
index 0000000..bd298d6
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Models/1360x768.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/160x600.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Models/160x600.xcf.bz2
new file mode 100644
index 0000000..62e88cc
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Models/160x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/200x150.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Models/200x150.xcf.bz2
new file mode 100644
index 0000000..0956c68
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Models/200x150.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/400x300.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Models/400x300.xcf.bz2
new file mode 100644
index 0000000..05ad951
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Models/400x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/443x443.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Models/443x443.xcf.bz2
new file mode 100644
index 0000000..3a2d344
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Models/443x443.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/490x200.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Models/490x200.xcf.bz2
new file mode 100644
index 0000000..53f0d62
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Models/490x200.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/510x300.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Models/510x300.xcf.bz2
new file mode 100644
index 0000000..9776878
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Models/510x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/640x300.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Models/640x300.xcf.bz2
new file mode 100644
index 0000000..b6b6d82
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Models/640x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/640x480.xcf-flame.def b/Identity/Images/Themes/Flame/2/Backgrounds/Models/640x480.xcf-flame.def
new file mode 100644
index 0000000..e08e567
--- /dev/null
+++ b/Identity/Images/Themes/Flame/2/Backgrounds/Models/640x480.xcf-flame.def
@@ -0,0 +1,16 @@
+time 0.2
+cmap 72
+image_size 640 480 center -0.238683 -0.650206 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
+nbatches 1 white_level 200
+brightness 1 gamma 2 cmap_inter 0
+xform 0 density 1 color 1
+var 0 0 0 0 1 0 0
+coefs 0.301841 -0.67335 -0.773104 -0.251116 0.044031 0.136135
+xform 1 density 1 color 0
+var 0 0 0 0 1 0 0
+coefs 0.509564 -0.428975 0.565256 -0.163823 -0.180255 0.167344
+xform 2 density 1 color 0
+var 0 0 1 0 0 0 0
+coefs -0.675703 -0.051893 0.815703 -0.399177 0.308701 -0.15378
+;
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/640x480.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Models/640x480.xcf.bz2
new file mode 100644
index 0000000..76f6a8c
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Models/640x480.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/744x1052.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Models/744x1052.xcf.bz2
new file mode 100644
index 0000000..3fb7cca
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Models/744x1052.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/800x600.xcf-flame.def b/Identity/Images/Themes/Flame/2/Backgrounds/Models/800x600.xcf-flame.def
new file mode 100644
index 0000000..2beee4f
--- /dev/null
+++ b/Identity/Images/Themes/Flame/2/Backgrounds/Models/800x600.xcf-flame.def
@@ -0,0 +1,22 @@
+time 0.2
+cmap 72
+image_size 800 600 center -0.637555 -0.393013 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
+nbatches 1 white_level 200
+brightness 1 gamma 2 cmap_inter 0
+xform 0 density 1 color 0.2
+var 0 0 0 0 1 0 0
+coefs 0.188801 0.60826 0.316788 -0.55667 -0.2744 0.257933
+xform 1 density 1 color 0
+var 0 0 0 0 1 0 0
+coefs 0.285777 0.0678076 -0.640481 -0.209332 0.598211 -0.456748
+xform 2 density 1 color 0
+var 0 0 0 0 1 0 0
+coefs -0.863712 0.420489 0.631986 -0.820005 -0.505238 0.391544
+xform 3 density 1 color 0.8
+var 0 0 0 0 1 0 0
+coefs 0.640129 -0.344855 0.281745 0.728586 0.144424 0.0895337
+xform 4 density 1 color 0
+var 0 0 0 0 1 0 0
+coefs -0.478209 0.779285 -0.605504 -0.51226 -0.374243 0.0481296
+;
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/800x600.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Models/800x600.xcf.bz2
new file mode 100644
index 0000000..d0198fd
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Models/800x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/800x88.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Models/800x88.xcf.bz2
new file mode 100644
index 0000000..41548d5
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Models/800x88.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Models/886x443.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Models/886x443.xcf.bz2
new file mode 100644
index 0000000..b532bcb
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Backgrounds/Models/886x443.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/1360x768.xcf-flame.def b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/1360x768.xcf-flame.def
deleted file mode 100644
index e96193d..0000000
--- a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/1360x768.xcf-flame.def
+++ /dev/null
@@ -1,15 +0,0 @@
-time 0.2
-image_size 1360 768 center -0.751131 -0.280543 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
-nbatches 1 white_level 200
-brightness 1 gamma 2 cmap_inter 0
-xform 0 density 1 color 1
-var 0 0 0 0 1 0 0
-coefs 0.301841 -0.67335 -0.773104 -0.251116 0.044031 0.136135
-xform 1 density 1 color 0
-var 0 0 0 0 1 0 0
-coefs 0.509564 -0.428975 0.565256 -0.163823 -0.180255 0.167344
-xform 2 density 1 color 0
-var 0 0 1 0 0 0 0
-coefs -0.675703 -0.051893 0.815703 -0.399177 0.308701 -0.15378
-;
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/1360x768.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/1360x768.xcf.bz2
deleted file mode 100644
index bd298d6..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/1360x768.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/160x600.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/160x600.xcf.bz2
deleted file mode 100644
index 62e88cc..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/160x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/200x150.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/200x150.xcf.bz2
deleted file mode 100644
index 0956c68..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/200x150.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/400x300.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/400x300.xcf.bz2
deleted file mode 100644
index 05ad951..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/400x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/443x443.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/443x443.xcf.bz2
deleted file mode 100644
index 3a2d344..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/443x443.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/490x200.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/490x200.xcf.bz2
deleted file mode 100644
index 53f0d62..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/490x200.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/510x300.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/510x300.xcf.bz2
deleted file mode 100644
index 9776878..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/510x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/640x300.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/640x300.xcf.bz2
deleted file mode 100644
index b6b6d82..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/640x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/640x480.xcf-flame.def b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/640x480.xcf-flame.def
deleted file mode 100644
index e08e567..0000000
--- a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/640x480.xcf-flame.def
+++ /dev/null
@@ -1,16 +0,0 @@
-time 0.2
-cmap 72
-image_size 640 480 center -0.238683 -0.650206 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
-nbatches 1 white_level 200
-brightness 1 gamma 2 cmap_inter 0
-xform 0 density 1 color 1
-var 0 0 0 0 1 0 0
-coefs 0.301841 -0.67335 -0.773104 -0.251116 0.044031 0.136135
-xform 1 density 1 color 0
-var 0 0 0 0 1 0 0
-coefs 0.509564 -0.428975 0.565256 -0.163823 -0.180255 0.167344
-xform 2 density 1 color 0
-var 0 0 1 0 0 0 0
-coefs -0.675703 -0.051893 0.815703 -0.399177 0.308701 -0.15378
-;
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/640x480.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/640x480.xcf.bz2
deleted file mode 100644
index 76f6a8c..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/640x480.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/744x1052.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/744x1052.xcf.bz2
deleted file mode 100644
index 3fb7cca..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/744x1052.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/800x600.xcf-flame.def b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/800x600.xcf-flame.def
deleted file mode 100644
index 2beee4f..0000000
--- a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/800x600.xcf-flame.def
+++ /dev/null
@@ -1,22 +0,0 @@
-time 0.2
-cmap 72
-image_size 800 600 center -0.637555 -0.393013 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
-nbatches 1 white_level 200
-brightness 1 gamma 2 cmap_inter 0
-xform 0 density 1 color 0.2
-var 0 0 0 0 1 0 0
-coefs 0.188801 0.60826 0.316788 -0.55667 -0.2744 0.257933
-xform 1 density 1 color 0
-var 0 0 0 0 1 0 0
-coefs 0.285777 0.0678076 -0.640481 -0.209332 0.598211 -0.456748
-xform 2 density 1 color 0
-var 0 0 0 0 1 0 0
-coefs -0.863712 0.420489 0.631986 -0.820005 -0.505238 0.391544
-xform 3 density 1 color 0.8
-var 0 0 0 0 1 0 0
-coefs 0.640129 -0.344855 0.281745 0.728586 0.144424 0.0895337
-xform 4 density 1 color 0
-var 0 0 0 0 1 0 0
-coefs -0.478209 0.779285 -0.605504 -0.51226 -0.374243 0.0481296
-;
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/800x600.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/800x600.xcf.bz2
deleted file mode 100644
index d0198fd..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/800x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/800x88.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/800x88.xcf.bz2
deleted file mode 100644
index 41548d5..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/800x88.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/886x443.xcf.bz2 b/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/886x443.xcf.bz2
deleted file mode 100644
index b532bcb..0000000
Binary files a/Identity/Images/Themes/Flame/2/Backgrounds/Xcf/886x443.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/2/Concept/Models/motif.svgz b/Identity/Images/Themes/Flame/2/Concept/Models/motif.svgz
new file mode 100644
index 0000000..13db356
Binary files /dev/null and b/Identity/Images/Themes/Flame/2/Concept/Models/motif.svgz differ
diff --git a/Identity/Images/Themes/Flame/2/Concept/Tpl/motif.svgz b/Identity/Images/Themes/Flame/2/Concept/Tpl/motif.svgz
deleted file mode 100644
index 13db356..0000000
Binary files a/Identity/Images/Themes/Flame/2/Concept/Tpl/motif.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Images/1360x768-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Images/1360x768-final.png
new file mode 100644
index 0000000..2657b11
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Images/1360x768-final.png differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Images/160x600-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Images/160x600-final.png
new file mode 100644
index 0000000..e2d068e
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Images/160x600-final.png differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Images/200x150-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Images/200x150-final.png
new file mode 100644
index 0000000..edd668f
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Images/200x150-final.png differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Images/400x300-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Images/400x300-final.png
new file mode 100644
index 0000000..e044d9f
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Images/400x300-final.png differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Images/443x443-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Images/443x443-final.png
new file mode 100644
index 0000000..f13f319
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Images/443x443-final.png differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Images/490x200-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Images/490x200-final.png
new file mode 100644
index 0000000..40f160b
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Images/490x200-final.png differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Images/510x300-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Images/510x300-final.png
new file mode 100644
index 0000000..9accfcc
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Images/510x300-final.png differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Images/640x300-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Images/640x300-final.png
new file mode 100644
index 0000000..9d62a7d
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Images/640x300-final.png differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Images/640x480-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Images/640x480-final.png
new file mode 100644
index 0000000..f314a8c
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Images/640x480-final.png differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Images/744x1052-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Images/744x1052-final.png
new file mode 100644
index 0000000..eb1c507
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Images/744x1052-final.png differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Images/800x600-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Images/800x600-final.png
new file mode 100644
index 0000000..886eb17
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Images/800x600-final.png differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Images/800x88-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Images/800x88-final.png
new file mode 100644
index 0000000..93b5c59
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Images/800x88-final.png differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Images/886x443-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Images/886x443-final.png
new file mode 100644
index 0000000..956ba69
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Images/886x443-final.png differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/1360x768-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/1360x768-final.png
deleted file mode 100644
index 2657b11..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/1360x768-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/160x600-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/160x600-final.png
deleted file mode 100644
index e2d068e..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/160x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/200x150-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/200x150-final.png
deleted file mode 100644
index edd668f..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/200x150-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/400x300-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/400x300-final.png
deleted file mode 100644
index e044d9f..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/400x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/443x443-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/443x443-final.png
deleted file mode 100644
index f13f319..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/443x443-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/490x200-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/490x200-final.png
deleted file mode 100644
index 40f160b..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/490x200-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/510x300-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/510x300-final.png
deleted file mode 100644
index 9accfcc..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/510x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/640x300-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/640x300-final.png
deleted file mode 100644
index 9d62a7d..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/640x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/640x480-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/640x480-final.png
deleted file mode 100644
index f314a8c..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/640x480-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/744x1052-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/744x1052-final.png
deleted file mode 100644
index eb1c507..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/744x1052-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/800x600-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/800x600-final.png
deleted file mode 100644
index 886eb17..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/800x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/800x88-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/800x88-final.png
deleted file mode 100644
index 93b5c59..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/800x88-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/886x443-final.png b/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/886x443-final.png
deleted file mode 100644
index 956ba69..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Img/Png/886x443-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/1360x768.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Models/1360x768.xcf-flame.def
new file mode 100644
index 0000000..bd6f59d
--- /dev/null
+++ b/Identity/Images/Themes/Flame/3/Backgrounds/Models/1360x768.xcf-flame.def
@@ -0,0 +1,12 @@
+time 0.2
+image_size 1360 768 center -2 0.283186 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
+nbatches 1 white_level 200
+brightness 1 gamma 2 cmap_inter 0
+xform 0 density 1 color 1
+var 0 0 1 0 0 0 0
+coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
+xform 1 density 1 color 0
+var 0 0 1 0 0 0 0
+coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
+;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/1360x768.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Models/1360x768.xcf.bz2
new file mode 100644
index 0000000..77c282d
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Models/1360x768.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/160x600.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Models/160x600.xcf-flame.def
new file mode 100644
index 0000000..a495c00
--- /dev/null
+++ b/Identity/Images/Themes/Flame/3/Backgrounds/Models/160x600.xcf-flame.def
@@ -0,0 +1,13 @@
+time 0.2
+cmap 72
+image_size 160 600 center -1.56398 0.277228 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
+nbatches 1 white_level 200
+brightness 1 gamma 2 cmap_inter 0
+xform 0 density 1 color 1
+var 0 0 1 0 0 0 0
+coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
+xform 1 density 1 color 0
+var 0 0 1 0 0 0 0
+coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
+;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/160x600.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Models/160x600.xcf.bz2
new file mode 100644
index 0000000..227e52b
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Models/160x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/200x150.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Models/200x150.xcf.bz2
new file mode 100644
index 0000000..21af6a5
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Models/200x150.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/400x300.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Models/400x300.xcf-flame.def
new file mode 100644
index 0000000..17e9082
--- /dev/null
+++ b/Identity/Images/Themes/Flame/3/Backgrounds/Models/400x300.xcf-flame.def
@@ -0,0 +1,13 @@
+time 0.2
+cmap 72
+image_size 400 300 center -1.59825 0.283186 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
+nbatches 1 white_level 200
+brightness 0.6 gamma 2 cmap_inter 0
+xform 0 density 1 color 1
+var 0 0 1 0 0 0 0
+coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
+xform 1 density 1 color 0
+var 0 0 1 0 0 0 0
+coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
+;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/400x300.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Models/400x300.xcf.bz2
new file mode 100644
index 0000000..5688054
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Models/400x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/443x443.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Models/443x443.xcf-flame.def
new file mode 100644
index 0000000..8912195
--- /dev/null
+++ b/Identity/Images/Themes/Flame/3/Backgrounds/Models/443x443.xcf-flame.def
@@ -0,0 +1,13 @@
+time 0.2
+cmap 72
+image_size 443 443 center -1.59024 0.439024 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 2
+nbatches 1 white_level 200
+brightness 0.9 gamma 2 cmap_inter 0
+xform 0 density 1 color 1
+var 0 0 1 0 0 0 0
+coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
+xform 1 density 1 color 0
+var 0 0 1 0 0 0 0
+coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
+;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/443x443.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Models/443x443.xcf.bz2
new file mode 100644
index 0000000..3007e22
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Models/443x443.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/490x200.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Models/490x200.xcf-flame.def
new file mode 100644
index 0000000..9c58cd5
--- /dev/null
+++ b/Identity/Images/Themes/Flame/3/Backgrounds/Models/490x200.xcf-flame.def
@@ -0,0 +1,13 @@
+time 0.2
+cmap 72
+image_size 490 200 center -1.13615 -0.455446 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
+nbatches 1 white_level 200
+brightness 0.9 gamma 2 cmap_inter 0
+xform 0 density 1 color 1
+var 0 0 1 0 0 0 0
+coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
+xform 1 density 1 color 0
+var 0 0 1 0 0 0 0
+coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
+;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/490x200.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Models/490x200.xcf.bz2
new file mode 100644
index 0000000..5c0bd36
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Models/490x200.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/510x300.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Models/510x300.xcf-flame.def
new file mode 100644
index 0000000..301dab9
--- /dev/null
+++ b/Identity/Images/Themes/Flame/3/Backgrounds/Models/510x300.xcf-flame.def
@@ -0,0 +1,13 @@
+time 0.2
+cmap 72
+image_size 510 300 center -0.930693 -0.455446 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
+nbatches 1 white_level 200
+brightness 0.420168 gamma 2 cmap_inter 0
+xform 0 density 1 color 1
+var 0 0 1 0 0 0 0
+coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
+xform 1 density 1 color 0
+var 0 0 1 0 0 0 0
+coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
+;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/510x300.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Models/510x300.xcf.bz2
new file mode 100644
index 0000000..0f90abb
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Models/510x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/640x300.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Models/640x300.xcf-flame.def
new file mode 100644
index 0000000..1eb4e24
--- /dev/null
+++ b/Identity/Images/Themes/Flame/3/Backgrounds/Models/640x300.xcf-flame.def
@@ -0,0 +1,13 @@
+time 0.2
+cmap 72
+image_size 640 300 center -0.930693 -0.455446 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
+nbatches 1 white_level 200
+brightness 0.5 gamma 2 cmap_inter 0
+xform 0 density 1 color 1
+var 0 0 1 0 0 0 0
+coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
+xform 1 density 1 color 0
+var 0 0 1 0 0 0 0
+coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
+;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/640x300.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Models/640x300.xcf.bz2
new file mode 100644
index 0000000..640af8d
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Models/640x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/640x480.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Models/640x480.xcf-flame.def
new file mode 100644
index 0000000..fb0da3c
--- /dev/null
+++ b/Identity/Images/Themes/Flame/3/Backgrounds/Models/640x480.xcf-flame.def
@@ -0,0 +1,13 @@
+time 0.2
+cmap 72
+image_size 640 480 center -1.59825 0.283186 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
+nbatches 1 white_level 200
+brightness 1 gamma 2 cmap_inter 0
+xform 0 density 1 color 1
+var 0 0 1 0 0 0 0
+coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
+xform 1 density 1 color 0
+var 0 0 1 0 0 0 0
+coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
+;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/640x480.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Models/640x480.xcf.bz2
new file mode 100644
index 0000000..d9f127d
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Models/640x480.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/744x1052.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Models/744x1052.xcf-flame.def
new file mode 100644
index 0000000..5b6c117
--- /dev/null
+++ b/Identity/Images/Themes/Flame/3/Backgrounds/Models/744x1052.xcf-flame.def
@@ -0,0 +1,13 @@
+time 0.2
+cmap 72
+image_size 744 1052 center -0.873239 0.366197 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
+nbatches 1 white_level 200
+brightness 0.9 gamma 2 cmap_inter 0
+xform 0 density 1 color 1
+var 0 0 1 0 0 0 0
+coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
+xform 1 density 1 color 0
+var 0 0 1 0 0 0 0
+coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
+;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/744x1052.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Models/744x1052.xcf.bz2
new file mode 100644
index 0000000..a3ae10c
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Models/744x1052.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/800x600.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Models/800x600.xcf-flame.def
new file mode 100644
index 0000000..b6827d5
--- /dev/null
+++ b/Identity/Images/Themes/Flame/3/Backgrounds/Models/800x600.xcf-flame.def
@@ -0,0 +1,13 @@
+time 0.2
+cmap 72
+image_size 800 600 center -1.79221 0.283186 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
+nbatches 1 white_level 200
+brightness 1 gamma 2 cmap_inter 0
+xform 0 density 1 color 1
+var 0 0 1 0 0 0 0
+coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
+xform 1 density 1 color 0
+var 0 0 1 0 0 0 0
+coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
+;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/800x600.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Models/800x600.xcf.bz2
new file mode 100644
index 0000000..c399382
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Models/800x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/800x88.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Models/800x88.xcf-flame.def
new file mode 100644
index 0000000..4c2cbcd
--- /dev/null
+++ b/Identity/Images/Themes/Flame/3/Backgrounds/Models/800x88.xcf-flame.def
@@ -0,0 +1,13 @@
+time 0.2
+cmap 72
+image_size 800 88 center -0.930693 -0.455446 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
+nbatches 1 white_level 200
+brightness 0.420168 gamma 2 cmap_inter 0
+xform 0 density 1 color 1
+var 0 0 1 0 0 0 0
+coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
+xform 1 density 1 color 0
+var 0 0 1 0 0 0 0
+coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
+;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/800x88.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Models/800x88.xcf.bz2
new file mode 100644
index 0000000..974b2e7
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Models/800x88.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/886x443.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Models/886x443.xcf-flame.def
new file mode 100644
index 0000000..cac7919
--- /dev/null
+++ b/Identity/Images/Themes/Flame/3/Backgrounds/Models/886x443.xcf-flame.def
@@ -0,0 +1,13 @@
+time 0.2
+cmap 72
+image_size 886 443 center -2 -0.028169 pixels_per_unit 100
+spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
+nbatches 1 white_level 200
+brightness 1 gamma 2 cmap_inter 0
+xform 0 density 1 color 1
+var 0 0 1 0 0 0 0
+coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
+xform 1 density 1 color 0
+var 0 0 1 0 0 0 0
+coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
+;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Models/886x443.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Models/886x443.xcf.bz2
new file mode 100644
index 0000000..4f2e188
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Backgrounds/Models/886x443.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/1360x768.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/1360x768.xcf-flame.def
deleted file mode 100644
index bd6f59d..0000000
--- a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/1360x768.xcf-flame.def
+++ /dev/null
@@ -1,12 +0,0 @@
-time 0.2
-image_size 1360 768 center -2 0.283186 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
-nbatches 1 white_level 200
-brightness 1 gamma 2 cmap_inter 0
-xform 0 density 1 color 1
-var 0 0 1 0 0 0 0
-coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
-xform 1 density 1 color 0
-var 0 0 1 0 0 0 0
-coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
-;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/1360x768.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/1360x768.xcf.bz2
deleted file mode 100644
index 77c282d..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/1360x768.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/160x600.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/160x600.xcf-flame.def
deleted file mode 100644
index a495c00..0000000
--- a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/160x600.xcf-flame.def
+++ /dev/null
@@ -1,13 +0,0 @@
-time 0.2
-cmap 72
-image_size 160 600 center -1.56398 0.277228 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
-nbatches 1 white_level 200
-brightness 1 gamma 2 cmap_inter 0
-xform 0 density 1 color 1
-var 0 0 1 0 0 0 0
-coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
-xform 1 density 1 color 0
-var 0 0 1 0 0 0 0
-coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
-;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/160x600.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/160x600.xcf.bz2
deleted file mode 100644
index 227e52b..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/160x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/200x150.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/200x150.xcf.bz2
deleted file mode 100644
index 21af6a5..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/200x150.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/400x300.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/400x300.xcf-flame.def
deleted file mode 100644
index 17e9082..0000000
--- a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/400x300.xcf-flame.def
+++ /dev/null
@@ -1,13 +0,0 @@
-time 0.2
-cmap 72
-image_size 400 300 center -1.59825 0.283186 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
-nbatches 1 white_level 200
-brightness 0.6 gamma 2 cmap_inter 0
-xform 0 density 1 color 1
-var 0 0 1 0 0 0 0
-coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
-xform 1 density 1 color 0
-var 0 0 1 0 0 0 0
-coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
-;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/400x300.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/400x300.xcf.bz2
deleted file mode 100644
index 5688054..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/400x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/443x443.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/443x443.xcf-flame.def
deleted file mode 100644
index 8912195..0000000
--- a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/443x443.xcf-flame.def
+++ /dev/null
@@ -1,13 +0,0 @@
-time 0.2
-cmap 72
-image_size 443 443 center -1.59024 0.439024 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 2
-nbatches 1 white_level 200
-brightness 0.9 gamma 2 cmap_inter 0
-xform 0 density 1 color 1
-var 0 0 1 0 0 0 0
-coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
-xform 1 density 1 color 0
-var 0 0 1 0 0 0 0
-coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
-;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/443x443.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/443x443.xcf.bz2
deleted file mode 100644
index 3007e22..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/443x443.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/490x200.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/490x200.xcf-flame.def
deleted file mode 100644
index 9c58cd5..0000000
--- a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/490x200.xcf-flame.def
+++ /dev/null
@@ -1,13 +0,0 @@
-time 0.2
-cmap 72
-image_size 490 200 center -1.13615 -0.455446 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
-nbatches 1 white_level 200
-brightness 0.9 gamma 2 cmap_inter 0
-xform 0 density 1 color 1
-var 0 0 1 0 0 0 0
-coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
-xform 1 density 1 color 0
-var 0 0 1 0 0 0 0
-coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
-;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/490x200.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/490x200.xcf.bz2
deleted file mode 100644
index 5c0bd36..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/490x200.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/510x300.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/510x300.xcf-flame.def
deleted file mode 100644
index 301dab9..0000000
--- a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/510x300.xcf-flame.def
+++ /dev/null
@@ -1,13 +0,0 @@
-time 0.2
-cmap 72
-image_size 510 300 center -0.930693 -0.455446 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
-nbatches 1 white_level 200
-brightness 0.420168 gamma 2 cmap_inter 0
-xform 0 density 1 color 1
-var 0 0 1 0 0 0 0
-coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
-xform 1 density 1 color 0
-var 0 0 1 0 0 0 0
-coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
-;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/510x300.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/510x300.xcf.bz2
deleted file mode 100644
index 0f90abb..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/510x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/640x300.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/640x300.xcf-flame.def
deleted file mode 100644
index 1eb4e24..0000000
--- a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/640x300.xcf-flame.def
+++ /dev/null
@@ -1,13 +0,0 @@
-time 0.2
-cmap 72
-image_size 640 300 center -0.930693 -0.455446 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
-nbatches 1 white_level 200
-brightness 0.5 gamma 2 cmap_inter 0
-xform 0 density 1 color 1
-var 0 0 1 0 0 0 0
-coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
-xform 1 density 1 color 0
-var 0 0 1 0 0 0 0
-coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
-;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/640x300.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/640x300.xcf.bz2
deleted file mode 100644
index 640af8d..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/640x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/640x480.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/640x480.xcf-flame.def
deleted file mode 100644
index fb0da3c..0000000
--- a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/640x480.xcf-flame.def
+++ /dev/null
@@ -1,13 +0,0 @@
-time 0.2
-cmap 72
-image_size 640 480 center -1.59825 0.283186 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
-nbatches 1 white_level 200
-brightness 1 gamma 2 cmap_inter 0
-xform 0 density 1 color 1
-var 0 0 1 0 0 0 0
-coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
-xform 1 density 1 color 0
-var 0 0 1 0 0 0 0
-coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
-;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/640x480.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/640x480.xcf.bz2
deleted file mode 100644
index d9f127d..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/640x480.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/744x1052.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/744x1052.xcf-flame.def
deleted file mode 100644
index 5b6c117..0000000
--- a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/744x1052.xcf-flame.def
+++ /dev/null
@@ -1,13 +0,0 @@
-time 0.2
-cmap 72
-image_size 744 1052 center -0.873239 0.366197 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
-nbatches 1 white_level 200
-brightness 0.9 gamma 2 cmap_inter 0
-xform 0 density 1 color 1
-var 0 0 1 0 0 0 0
-coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
-xform 1 density 1 color 0
-var 0 0 1 0 0 0 0
-coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
-;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/744x1052.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/744x1052.xcf.bz2
deleted file mode 100644
index a3ae10c..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/744x1052.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/800x600.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/800x600.xcf-flame.def
deleted file mode 100644
index b6827d5..0000000
--- a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/800x600.xcf-flame.def
+++ /dev/null
@@ -1,13 +0,0 @@
-time 0.2
-cmap 72
-image_size 800 600 center -1.79221 0.283186 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
-nbatches 1 white_level 200
-brightness 1 gamma 2 cmap_inter 0
-xform 0 density 1 color 1
-var 0 0 1 0 0 0 0
-coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
-xform 1 density 1 color 0
-var 0 0 1 0 0 0 0
-coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
-;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/800x600.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/800x600.xcf.bz2
deleted file mode 100644
index c399382..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/800x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/800x88.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/800x88.xcf-flame.def
deleted file mode 100644
index 4c2cbcd..0000000
--- a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/800x88.xcf-flame.def
+++ /dev/null
@@ -1,13 +0,0 @@
-time 0.2
-cmap 72
-image_size 800 88 center -0.930693 -0.455446 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
-nbatches 1 white_level 200
-brightness 0.420168 gamma 2 cmap_inter 0
-xform 0 density 1 color 1
-var 0 0 1 0 0 0 0
-coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
-xform 1 density 1 color 0
-var 0 0 1 0 0 0 0
-coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
-;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/800x88.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/800x88.xcf.bz2
deleted file mode 100644
index 974b2e7..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/800x88.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/886x443.xcf-flame.def b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/886x443.xcf-flame.def
deleted file mode 100644
index cac7919..0000000
--- a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/886x443.xcf-flame.def
+++ /dev/null
@@ -1,13 +0,0 @@
-time 0.2
-cmap 72
-image_size 886 443 center -2 -0.028169 pixels_per_unit 100
-spatial_oversample 2 spatial_filter_radius 0.75 sample_density 5
-nbatches 1 white_level 200
-brightness 1 gamma 2 cmap_inter 0
-xform 0 density 1 color 1
-var 0 0 1 0 0 0 0
-coefs 0.734221 0.130707 -0.113931 -0.691159 -0.290432 0.0523484
-xform 1 density 1 color 0
-var 0 0 1 0 0 0 0
-coefs 0.687295 -0.294379 -0.316375 -0.437173 0.223018 0.704658
-;
diff --git a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/886x443.xcf.bz2 b/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/886x443.xcf.bz2
deleted file mode 100644
index 4f2e188..0000000
Binary files a/Identity/Images/Themes/Flame/3/Backgrounds/Xcf/886x443.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Flame/3/Concept/Models/motif.svgz b/Identity/Images/Themes/Flame/3/Concept/Models/motif.svgz
new file mode 100644
index 0000000..7331f27
Binary files /dev/null and b/Identity/Images/Themes/Flame/3/Concept/Models/motif.svgz differ
diff --git a/Identity/Images/Themes/Flame/3/Concept/Tpl/motif.svgz b/Identity/Images/Themes/Flame/3/Concept/Tpl/motif.svgz
deleted file mode 100644
index 7331f27..0000000
Binary files a/Identity/Images/Themes/Flame/3/Concept/Tpl/motif.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/1360x768-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/1360x768-final.png
new file mode 100644
index 0000000..1c4a7c7
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/1360x768-final.png differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/160x600-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/160x600-final.png
new file mode 100644
index 0000000..8216513
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/160x600-final.png differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/200x150-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/200x150-final.png
new file mode 100644
index 0000000..11a6112
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/200x150-final.png differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/2048x1536-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/2048x1536-final.png
new file mode 100644
index 0000000..36bb1f3
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/2048x1536-final.png differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/400x300-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/400x300-final.png
new file mode 100644
index 0000000..18af3b0
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/400x300-final.png differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/490x200-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/490x200-final.png
new file mode 100644
index 0000000..f584000
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/490x200-final.png differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/510x300-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/510x300-final.png
new file mode 100644
index 0000000..88283b2
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/510x300-final.png differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/640x300-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/640x300-final.png
new file mode 100644
index 0000000..852fb63
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/640x300-final.png differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/640x480-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/640x480-final.png
new file mode 100644
index 0000000..579882b
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/640x480-final.png differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/800x600-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/800x600-final.png
new file mode 100644
index 0000000..e379dd6
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/800x600-final.png differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/800x88-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/800x88-final.png
new file mode 100644
index 0000000..c9e1f5c
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Images/800x88-final.png differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/1360x768-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/1360x768-final.png
deleted file mode 100644
index 1c4a7c7..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/1360x768-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/160x600-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/160x600-final.png
deleted file mode 100644
index 8216513..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/160x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/200x150-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/200x150-final.png
deleted file mode 100644
index 11a6112..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/200x150-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/2048x1536-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/2048x1536-final.png
deleted file mode 100644
index 36bb1f3..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/2048x1536-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/400x300-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/400x300-final.png
deleted file mode 100644
index 18af3b0..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/400x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/490x200-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/490x200-final.png
deleted file mode 100644
index f584000..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/490x200-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/510x300-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/510x300-final.png
deleted file mode 100644
index 88283b2..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/510x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/640x300-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/640x300-final.png
deleted file mode 100644
index 852fb63..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/640x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/640x480-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/640x480-final.png
deleted file mode 100644
index 579882b..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/640x480-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/800x600-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/800x600-final.png
deleted file mode 100644
index e379dd6..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/800x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/800x88-final.png b/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/800x88-final.png
deleted file mode 100644
index c9e1f5c..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Img/Png/800x88-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/1360x768.svgz b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/1360x768.svgz
new file mode 100644
index 0000000..84705ce
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/1360x768.svgz differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/1360x768.xcf.bz2 b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/1360x768.xcf.bz2
new file mode 100644
index 0000000..e46b8d3
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/1360x768.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/2048x1536.xcf.bz2 b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/2048x1536.xcf.bz2
new file mode 100644
index 0000000..d4daac7
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/2048x1536.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/490x200.xcf.bz2 b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/490x200.xcf.bz2
new file mode 100644
index 0000000..6d8bfce
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/490x200.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/530x240.xcf.bz2 b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/530x240.xcf.bz2
new file mode 100644
index 0000000..3e91947
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/530x240.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/800x600.svgz b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/800x600.svgz
new file mode 100644
index 0000000..9df485b
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/800x600.svgz differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/800x600.xcf.bz2 b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/800x600.xcf.bz2
new file mode 100644
index 0000000..e2dfe62
Binary files /dev/null and b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/800x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/color-adjustment.curves b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/color-adjustment.curves
new file mode 100644
index 0000000..d906492
--- /dev/null
+++ b/Identity/Images/Themes/Jesuits/1/Backgrounds/Models/color-adjustment.curves
@@ -0,0 +1,6 @@
+# GIMP Curves File
+0 0 -1 -1 -1 -1 -1 -1 -1 49 81 34 -1 41 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
+0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
+0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
+0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
+0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Svg/1360x768.svgz b/Identity/Images/Themes/Jesuits/1/Backgrounds/Svg/1360x768.svgz
deleted file mode 100644
index 84705ce..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Svg/1360x768.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Svg/800x600.svgz b/Identity/Images/Themes/Jesuits/1/Backgrounds/Svg/800x600.svgz
deleted file mode 100644
index 9df485b..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Svg/800x600.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/1360x768.xcf.bz2 b/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/1360x768.xcf.bz2
deleted file mode 100644
index e46b8d3..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/1360x768.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/2048x1536.xcf.bz2 b/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/2048x1536.xcf.bz2
deleted file mode 100644
index d4daac7..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/2048x1536.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/490x200.xcf.bz2 b/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/490x200.xcf.bz2
deleted file mode 100644
index 6d8bfce..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/490x200.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/530x240.xcf.bz2 b/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/530x240.xcf.bz2
deleted file mode 100644
index 3e91947..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/530x240.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/800x600.xcf.bz2 b/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/800x600.xcf.bz2
deleted file mode 100644
index e2dfe62..0000000
Binary files a/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/800x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/color-adjustment.curves b/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/color-adjustment.curves
deleted file mode 100644
index d906492..0000000
--- a/Identity/Images/Themes/Jesuits/1/Backgrounds/Xcf/color-adjustment.curves
+++ /dev/null
@@ -1,6 +0,0 @@
-# GIMP Curves File
-0 0 -1 -1 -1 -1 -1 -1 -1 49 81 34 -1 41 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
-0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
-0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
-0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
-0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Images/160x600-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Images/160x600-final.png
new file mode 100644
index 0000000..a2389ed
Binary files /dev/null and b/Identity/Images/Themes/Modern/1/Backgrounds/Images/160x600-final.png differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Images/200x150-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Images/200x150-final.png
new file mode 100644
index 0000000..b7d8379
Binary files /dev/null and b/Identity/Images/Themes/Modern/1/Backgrounds/Images/200x150-final.png differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Images/2048x1536-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Images/2048x1536-final.png
new file mode 100644
index 0000000..729bde2
Binary files /dev/null and b/Identity/Images/Themes/Modern/1/Backgrounds/Images/2048x1536-final.png differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Images/400x300-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Images/400x300-final.png
new file mode 100644
index 0000000..3303dfc
Binary files /dev/null and b/Identity/Images/Themes/Modern/1/Backgrounds/Images/400x300-final.png differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Images/490x200-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Images/490x200-final.png
new file mode 100644
index 0000000..cf36dd1
Binary files /dev/null and b/Identity/Images/Themes/Modern/1/Backgrounds/Images/490x200-final.png differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Images/510x300-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Images/510x300-final.png
new file mode 100644
index 0000000..72e474e
Binary files /dev/null and b/Identity/Images/Themes/Modern/1/Backgrounds/Images/510x300-final.png differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Images/640x300-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Images/640x300-final.png
new file mode 100644
index 0000000..54dbbbd
Binary files /dev/null and b/Identity/Images/Themes/Modern/1/Backgrounds/Images/640x300-final.png differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Images/640x480-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Images/640x480-final.png
new file mode 100644
index 0000000..e97933e
Binary files /dev/null and b/Identity/Images/Themes/Modern/1/Backgrounds/Images/640x480-final.png differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Images/744x1052-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Images/744x1052-final.png
new file mode 100644
index 0000000..4197e06
Binary files /dev/null and b/Identity/Images/Themes/Modern/1/Backgrounds/Images/744x1052-final.png differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Images/800x600-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Images/800x600-final.png
new file mode 100644
index 0000000..59fa33b
Binary files /dev/null and b/Identity/Images/Themes/Modern/1/Backgrounds/Images/800x600-final.png differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Images/800x88-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Images/800x88-final.png
new file mode 100644
index 0000000..06b5809
Binary files /dev/null and b/Identity/Images/Themes/Modern/1/Backgrounds/Images/800x88-final.png differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/160x600-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/160x600-final.png
deleted file mode 100644
index 619da7e..0000000
Binary files a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/160x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/200x150-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/200x150-final.png
deleted file mode 100644
index d5a1c49..0000000
Binary files a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/200x150-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/2048x1536-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/2048x1536-final.png
deleted file mode 100644
index 729bde2..0000000
Binary files a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/2048x1536-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/400x300-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/400x300-final.png
deleted file mode 100644
index a54a073..0000000
Binary files a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/400x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/490x200-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/490x200-final.png
deleted file mode 100644
index 6837ac4..0000000
Binary files a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/490x200-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/510x300-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/510x300-final.png
deleted file mode 100644
index b47358e..0000000
Binary files a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/510x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/640x300-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/640x300-final.png
deleted file mode 100644
index c467278..0000000
Binary files a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/640x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/640x480-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/640x480-final.png
deleted file mode 100644
index ef9fb1d..0000000
Binary files a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/640x480-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/744x1052-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/744x1052-final.png
deleted file mode 100644
index 4197e06..0000000
Binary files a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/744x1052-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/800x600-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/800x600-final.png
deleted file mode 100644
index 4d169aa..0000000
Binary files a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/800x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/800x88-final.png b/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/800x88-final.png
deleted file mode 100644
index 7b84baa..0000000
Binary files a/Identity/Images/Themes/Modern/1/Backgrounds/Img/Png/800x88-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Models/800x600.svgz b/Identity/Images/Themes/Modern/1/Backgrounds/Models/800x600.svgz
new file mode 100755
index 0000000..e73ba74
Binary files /dev/null and b/Identity/Images/Themes/Modern/1/Backgrounds/Models/800x600.svgz differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Models/800x600.xcf.bz2 b/Identity/Images/Themes/Modern/1/Backgrounds/Models/800x600.xcf.bz2
new file mode 100755
index 0000000..fb56917
Binary files /dev/null and b/Identity/Images/Themes/Modern/1/Backgrounds/Models/800x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Tpl/800x600.svgz b/Identity/Images/Themes/Modern/1/Backgrounds/Tpl/800x600.svgz
deleted file mode 100755
index e7eb195..0000000
Binary files a/Identity/Images/Themes/Modern/1/Backgrounds/Tpl/800x600.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/1/Backgrounds/Xcf/800x600.xcf.bz2 b/Identity/Images/Themes/Modern/1/Backgrounds/Xcf/800x600.xcf.bz2
deleted file mode 100755
index fb56917..0000000
Binary files a/Identity/Images/Themes/Modern/1/Backgrounds/Xcf/800x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/1/Concept/Models/motif.svgz b/Identity/Images/Themes/Modern/1/Concept/Models/motif.svgz
new file mode 100755
index 0000000..30cf63d
Binary files /dev/null and b/Identity/Images/Themes/Modern/1/Concept/Models/motif.svgz differ
diff --git a/Identity/Images/Themes/Modern/1/Concept/Tpl/motif.svgz b/Identity/Images/Themes/Modern/1/Concept/Tpl/motif.svgz
deleted file mode 100755
index 9bbc7be..0000000
Binary files a/Identity/Images/Themes/Modern/1/Concept/Tpl/motif.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/1/Palettes/grub.gpl b/Identity/Images/Themes/Modern/1/Palettes/grub.gpl
index 30b80fc..56d0d6a 100644
--- a/Identity/Images/Themes/Modern/1/Palettes/grub.gpl
+++ b/Identity/Images/Themes/Modern/1/Palettes/grub.gpl
@@ -1,18 +1,18 @@
GIMP Palette
-Name: CentOS-Modern-1-Grub
+Name: Grub-Modern-1
Columns: 14
#
- 25 58 103 193a67
- 25 62 117 193e75
- 16 70 143 10468f
- 23 69 133 174585
- 32 70 126 20467e
- 39 78 137 274e89
- 28 82 155 1c529b
- 38 85 150 265596
- 54 84 128 365480
- 36 89 162 2459a2
- 56 101 167 3865a7
- 98 121 155 62799b
-156 173 194 9cadc2
-245 248 248 f5f8f8
+ 0 1 0 000100
+ 1 0 8 010008
+ 0 0 19 000013
+ 0 0 28 00001c
+ 1 0 37 010025
+ 1 0 47 01002f
+ 0 1 66 000142
+ 2 0 80 020050
+ 1 0 99 010063
+ 4 0 119 040077
+ 0 0 132 000084
+ 0 0 144 000090
+ 0 2 169 0002a9
+ 0 4 210 0004d2
diff --git a/Identity/Images/Themes/Modern/1/Palettes/syslinux.gpl b/Identity/Images/Themes/Modern/1/Palettes/syslinux.gpl
index 1384ae8..a0cfdf7 100644
--- a/Identity/Images/Themes/Modern/1/Palettes/syslinux.gpl
+++ b/Identity/Images/Themes/Modern/1/Palettes/syslinux.gpl
@@ -1,20 +1,20 @@
GIMP Palette
-Name: CentOS-Modern-1-Syslinux
+Name: Syslinux-Modern-1
Columns: 16
#
- 23 43 75 172b4b
- 21 51 94 15335e
- 25 58 104 193a68
- 3 66 140 03428c
- 23 67 125 17437d
- 31 66 117 1f4275
- 19 74 148 134a94
+ 0 1 0 000100
+ 0 0 7 000007
+ 0 1 23 000117
+ 0 1 33 000121
+ 1 0 46 01002e
+ 0 0 63 00003f
+ 2 0 82 020052
+ 5 0 106 05006a
255 255 255 ffffff
- 37 75 132 254b84
- 32 79 144 204f90
- 33 85 158 21559e
- 59 89 132 3b5984
- 47 94 163 2f5ea3
- 81 98 123 51627b
- 67 109 169 436da9
-144 157 173 909dad
+ 0 0 127 00007f
+ 0 0 148 000094
+ 0 1 167 0001a7
+ 0 0 182 0000b6
+ 0 3 221 0003dd
+ 63 63 68 3f3f44
+154 154 161 9a9aa1
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Images/1360x768-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Images/1360x768-final.png
new file mode 100644
index 0000000..0ee2d3f
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Images/1360x768-final.png differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Images/160x600-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Images/160x600-final.png
new file mode 100644
index 0000000..fb7b0a6
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Images/160x600-final.png differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Images/200x150-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Images/200x150-final.png
new file mode 100644
index 0000000..c267631
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Images/200x150-final.png differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Images/400x300-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Images/400x300-final.png
new file mode 100644
index 0000000..0be88ea
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Images/400x300-final.png differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Images/490x200-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Images/490x200-final.png
new file mode 100644
index 0000000..1586514
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Images/490x200-final.png differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Images/510x300-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Images/510x300-final.png
new file mode 100644
index 0000000..bc1bec7
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Images/510x300-final.png differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Images/640x300-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Images/640x300-final.png
new file mode 100644
index 0000000..1e1bfc7
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Images/640x300-final.png differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Images/640x480-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Images/640x480-final.png
new file mode 100644
index 0000000..c960e0a
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Images/640x480-final.png differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Images/744x1052-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Images/744x1052-final.png
new file mode 100644
index 0000000..f8adb07
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Images/744x1052-final.png differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Images/800x600-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Images/800x600-final.png
new file mode 100644
index 0000000..be1cecb
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Images/800x600-final.png differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Images/800x88-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Images/800x88-final.png
new file mode 100644
index 0000000..c4384f8
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Images/800x88-final.png differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/1360x768-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/1360x768-final.png
deleted file mode 100644
index 0ee2d3f..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/1360x768-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/160x600-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/160x600-final.png
deleted file mode 100644
index fb7b0a6..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/160x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/200x150-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/200x150-final.png
deleted file mode 100644
index c267631..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/200x150-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/400x300-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/400x300-final.png
deleted file mode 100644
index 0be88ea..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/400x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/490x200-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/490x200-final.png
deleted file mode 100644
index 1586514..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/490x200-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/510x300-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/510x300-final.png
deleted file mode 100644
index bc1bec7..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/510x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/640x300-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/640x300-final.png
deleted file mode 100644
index 1e1bfc7..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/640x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/640x480-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/640x480-final.png
deleted file mode 100644
index c960e0a..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/640x480-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/744x1052-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/744x1052-final.png
deleted file mode 100644
index f8adb07..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/744x1052-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/800x600-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/800x600-final.png
deleted file mode 100644
index be1cecb..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/800x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/800x88-final.png b/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/800x88-final.png
deleted file mode 100644
index c4384f8..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Img/Png/800x88-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Models/1360x768.svgz b/Identity/Images/Themes/Modern/2/Backgrounds/Models/1360x768.svgz
new file mode 100644
index 0000000..a82c1fd
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Models/1360x768.svgz differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Models/1360x768.xcf.bz2 b/Identity/Images/Themes/Modern/2/Backgrounds/Models/1360x768.xcf.bz2
new file mode 100644
index 0000000..52b0643
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Models/1360x768.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Models/640x300.xcf.bz2 b/Identity/Images/Themes/Modern/2/Backgrounds/Models/640x300.xcf.bz2
new file mode 100644
index 0000000..cb84fcd
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Models/640x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Models/640x480.xcf.bz2 b/Identity/Images/Themes/Modern/2/Backgrounds/Models/640x480.xcf.bz2
new file mode 100644
index 0000000..11166c7
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Models/640x480.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Models/744x1052.xcf.bz2 b/Identity/Images/Themes/Modern/2/Backgrounds/Models/744x1052.xcf.bz2
new file mode 100644
index 0000000..5775172
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Models/744x1052.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Models/800x600.xcf.bz2 b/Identity/Images/Themes/Modern/2/Backgrounds/Models/800x600.xcf.bz2
new file mode 100644
index 0000000..1eeffe5
Binary files /dev/null and b/Identity/Images/Themes/Modern/2/Backgrounds/Models/800x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Models/color-adjustment.curves b/Identity/Images/Themes/Modern/2/Backgrounds/Models/color-adjustment.curves
new file mode 100644
index 0000000..3834f8f
--- /dev/null
+++ b/Identity/Images/Themes/Modern/2/Backgrounds/Models/color-adjustment.curves
@@ -0,0 +1,6 @@
+# GIMP Curves File
+0 0 -1 -1 -1 0 -1 0 -1 0 -1 4 95 27 -1 16 -1 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
+0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
+0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
+0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
+0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Svg/1360x768.svgz b/Identity/Images/Themes/Modern/2/Backgrounds/Svg/1360x768.svgz
deleted file mode 100644
index a82c1fd..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Svg/1360x768.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/1360x768.xcf.bz2 b/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/1360x768.xcf.bz2
deleted file mode 100644
index 52b0643..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/1360x768.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/640x300.xcf.bz2 b/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/640x300.xcf.bz2
deleted file mode 100644
index cb84fcd..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/640x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/640x480.xcf.bz2 b/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/640x480.xcf.bz2
deleted file mode 100644
index 11166c7..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/640x480.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/744x1052.xcf.bz2 b/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/744x1052.xcf.bz2
deleted file mode 100644
index 5775172..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/744x1052.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/800x600.xcf.bz2 b/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/800x600.xcf.bz2
deleted file mode 100644
index 1eeffe5..0000000
Binary files a/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/800x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/color-adjustment.curves b/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/color-adjustment.curves
deleted file mode 100644
index 3834f8f..0000000
--- a/Identity/Images/Themes/Modern/2/Backgrounds/Xcf/color-adjustment.curves
+++ /dev/null
@@ -1,6 +0,0 @@
-# GIMP Curves File
-0 0 -1 -1 -1 0 -1 0 -1 0 -1 4 95 27 -1 16 -1 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
-0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
-0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
-0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
-0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
diff --git a/Identity/Images/Themes/Pipes/1/Backgrounds/Images/1360x768-final.png b/Identity/Images/Themes/Pipes/1/Backgrounds/Images/1360x768-final.png
new file mode 100644
index 0000000..e12d42a
Binary files /dev/null and b/Identity/Images/Themes/Pipes/1/Backgrounds/Images/1360x768-final.png differ
diff --git a/Identity/Images/Themes/Pipes/1/Backgrounds/Images/200x150-final.png b/Identity/Images/Themes/Pipes/1/Backgrounds/Images/200x150-final.png
new file mode 100644
index 0000000..565228a
Binary files /dev/null and b/Identity/Images/Themes/Pipes/1/Backgrounds/Images/200x150-final.png differ
diff --git a/Identity/Images/Themes/Pipes/1/Backgrounds/Images/800x600-final.png b/Identity/Images/Themes/Pipes/1/Backgrounds/Images/800x600-final.png
new file mode 100644
index 0000000..d1640eb
Binary files /dev/null and b/Identity/Images/Themes/Pipes/1/Backgrounds/Images/800x600-final.png differ
diff --git a/Identity/Images/Themes/Pipes/1/Backgrounds/Img/Png/1360x768-final.png b/Identity/Images/Themes/Pipes/1/Backgrounds/Img/Png/1360x768-final.png
deleted file mode 100644
index e12d42a..0000000
Binary files a/Identity/Images/Themes/Pipes/1/Backgrounds/Img/Png/1360x768-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Pipes/1/Backgrounds/Img/Png/200x150-final.png b/Identity/Images/Themes/Pipes/1/Backgrounds/Img/Png/200x150-final.png
deleted file mode 100644
index 565228a..0000000
Binary files a/Identity/Images/Themes/Pipes/1/Backgrounds/Img/Png/200x150-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Pipes/1/Backgrounds/Img/Png/800x600-final.png b/Identity/Images/Themes/Pipes/1/Backgrounds/Img/Png/800x600-final.png
deleted file mode 100644
index d1640eb..0000000
Binary files a/Identity/Images/Themes/Pipes/1/Backgrounds/Img/Png/800x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/Pipes/1/Backgrounds/Models/1360x768.svgz b/Identity/Images/Themes/Pipes/1/Backgrounds/Models/1360x768.svgz
new file mode 100644
index 0000000..92f1d6c
Binary files /dev/null and b/Identity/Images/Themes/Pipes/1/Backgrounds/Models/1360x768.svgz differ
diff --git a/Identity/Images/Themes/Pipes/1/Backgrounds/Models/1360x768.xcf.bz2 b/Identity/Images/Themes/Pipes/1/Backgrounds/Models/1360x768.xcf.bz2
new file mode 100644
index 0000000..6432666
Binary files /dev/null and b/Identity/Images/Themes/Pipes/1/Backgrounds/Models/1360x768.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Pipes/1/Backgrounds/Models/800x600.svgz b/Identity/Images/Themes/Pipes/1/Backgrounds/Models/800x600.svgz
new file mode 100644
index 0000000..3804e45
Binary files /dev/null and b/Identity/Images/Themes/Pipes/1/Backgrounds/Models/800x600.svgz differ
diff --git a/Identity/Images/Themes/Pipes/1/Backgrounds/Models/800x600.xcf.bz2 b/Identity/Images/Themes/Pipes/1/Backgrounds/Models/800x600.xcf.bz2
new file mode 100644
index 0000000..124cc13
Binary files /dev/null and b/Identity/Images/Themes/Pipes/1/Backgrounds/Models/800x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/Pipes/1/Backgrounds/Tpl/1360x768.svgz b/Identity/Images/Themes/Pipes/1/Backgrounds/Tpl/1360x768.svgz
deleted file mode 100644
index 92f1d6c..0000000
Binary files a/Identity/Images/Themes/Pipes/1/Backgrounds/Tpl/1360x768.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/Pipes/1/Backgrounds/Tpl/800x600.svgz b/Identity/Images/Themes/Pipes/1/Backgrounds/Tpl/800x600.svgz
deleted file mode 100644
index 3804e45..0000000
Binary files a/Identity/Images/Themes/Pipes/1/Backgrounds/Tpl/800x600.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/Pipes/1/Backgrounds/Xcf/1360x768.xcf.bz2 b/Identity/Images/Themes/Pipes/1/Backgrounds/Xcf/1360x768.xcf.bz2
deleted file mode 100644
index 6432666..0000000
Binary files a/Identity/Images/Themes/Pipes/1/Backgrounds/Xcf/1360x768.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Pipes/1/Backgrounds/Xcf/800x600.xcf.bz2 b/Identity/Images/Themes/Pipes/1/Backgrounds/Xcf/800x600.xcf.bz2
deleted file mode 100644
index 124cc13..0000000
Binary files a/Identity/Images/Themes/Pipes/1/Backgrounds/Xcf/800x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/Pipes/1/Concept/Models/motif.svgz b/Identity/Images/Themes/Pipes/1/Concept/Models/motif.svgz
new file mode 100644
index 0000000..3163b40
Binary files /dev/null and b/Identity/Images/Themes/Pipes/1/Concept/Models/motif.svgz differ
diff --git a/Identity/Images/Themes/Pipes/1/Concept/Tpl/motif.svgz b/Identity/Images/Themes/Pipes/1/Concept/Tpl/motif.svgz
deleted file mode 100644
index 3163b40..0000000
Binary files a/Identity/Images/Themes/Pipes/1/Concept/Tpl/motif.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/1360x768-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/1360x768-final.png
new file mode 100644
index 0000000..ecf9425
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/1360x768-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/160x600-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/160x600-final.png
new file mode 100644
index 0000000..4cf4294
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/160x600-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/200x150-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/200x150-final.png
new file mode 100644
index 0000000..8ef172d
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/200x150-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/2048x1536-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/2048x1536-final.png
new file mode 100644
index 0000000..c88dba0
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/2048x1536-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/400x300-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/400x300-final.png
new file mode 100644
index 0000000..501a0f4
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/400x300-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/443x443-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/443x443-final.png
new file mode 100644
index 0000000..98d2793
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/443x443-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/490x200-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/490x200-final.png
new file mode 100644
index 0000000..fa7f8b5
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/490x200-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/510x300-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/510x300-final.png
new file mode 100644
index 0000000..dd042fa
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/510x300-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/640x300-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/640x300-final.png
new file mode 100644
index 0000000..c6b6d0c
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/640x300-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/640x480-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/640x480-final.png
new file mode 100644
index 0000000..53cdf15
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/640x480-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/744x1052-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/744x1052-final.png
new file mode 100644
index 0000000..7d21570
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/744x1052-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/800x600-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/800x600-final.png
new file mode 100644
index 0000000..aeef6d1
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/800x600-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/800x88-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/800x88-final.png
new file mode 100644
index 0000000..a19a6a6
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/800x88-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/886x443-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/886x443-final.png
new file mode 100644
index 0000000..eb0d722
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Images/886x443-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/1360x768-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/1360x768-final.png
deleted file mode 100644
index ecf9425..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/1360x768-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/160x600-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/160x600-final.png
deleted file mode 100644
index 4cf4294..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/160x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/200x150-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/200x150-final.png
deleted file mode 100644
index 8ef172d..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/200x150-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/2048x1536-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/2048x1536-final.png
deleted file mode 100644
index c88dba0..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/2048x1536-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/400x300-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/400x300-final.png
deleted file mode 100644
index 501a0f4..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/400x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/443x443-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/443x443-final.png
deleted file mode 100644
index 98d2793..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/443x443-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/490x200-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/490x200-final.png
deleted file mode 100644
index fa7f8b5..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/490x200-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/510x300-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/510x300-final.png
deleted file mode 100644
index dd042fa..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/510x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/640x300-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/640x300-final.png
deleted file mode 100644
index c6b6d0c..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/640x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/640x480-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/640x480-final.png
deleted file mode 100644
index 53cdf15..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/640x480-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/744x1052-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/744x1052-final.png
deleted file mode 100644
index 7d21570..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/744x1052-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/800x600-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/800x600-final.png
deleted file mode 100644
index aeef6d1..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/800x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/800x88-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/800x88-final.png
deleted file mode 100644
index a19a6a6..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/800x88-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/886x443-final.png b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/886x443-final.png
deleted file mode 100644
index eb0d722..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Img/Png/886x443-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/1360x768.svgz b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/1360x768.svgz
new file mode 100644
index 0000000..00169c3
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/1360x768.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/1360x768.xcf.bz2 b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/1360x768.xcf.bz2
new file mode 100644
index 0000000..9012299
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/1360x768.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/160x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/160x600.xcf.bz2
new file mode 100644
index 0000000..df9b67f
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/160x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/2048x1536.svgz b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/2048x1536.svgz
new file mode 100644
index 0000000..f1dddf9
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/2048x1536.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/2048x1536.xcf.bz2 b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/2048x1536.xcf.bz2
new file mode 100644
index 0000000..da8be72
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/2048x1536.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/510x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/510x300.xcf.bz2
new file mode 100644
index 0000000..fda54c9
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/510x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/744x1052.xcf.bz2 b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/744x1052.xcf.bz2
new file mode 100644
index 0000000..4d4d9f8
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/744x1052.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/800x600.svgz b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/800x600.svgz
new file mode 100644
index 0000000..7d9eaf3
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/800x600.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/800x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/800x600.xcf.bz2
new file mode 100644
index 0000000..efe706d
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/800x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/800x88.xcf.bz2 b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/800x88.xcf.bz2
new file mode 100644
index 0000000..db0393e
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/800x88.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/color-adjustment.curves b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/color-adjustment.curves
new file mode 100644
index 0000000..7a910ad
--- /dev/null
+++ b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Models/color-adjustment.curves
@@ -0,0 +1,6 @@
+# GIMP Curves File
+0 0 -1 -1 -1 -1 -1 -1 -1 53 -1 37 98 34 -1 44 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
+0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
+0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
+0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
+0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Tpl/1360x768.svgz b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Tpl/1360x768.svgz
deleted file mode 100644
index 00169c3..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Tpl/1360x768.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Tpl/2048x1536.svgz b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Tpl/2048x1536.svgz
deleted file mode 100644
index f1dddf9..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Tpl/2048x1536.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Tpl/800x600.svgz b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Tpl/800x600.svgz
deleted file mode 100644
index 7d9eaf3..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Tpl/800x600.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/1360x768.xcf.bz2 b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/1360x768.xcf.bz2
deleted file mode 100644
index 9012299..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/1360x768.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/160x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/160x600.xcf.bz2
deleted file mode 100644
index df9b67f..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/160x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/2048x1536.xcf.bz2 b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/2048x1536.xcf.bz2
deleted file mode 100644
index da8be72..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/2048x1536.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/510x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/510x300.xcf.bz2
deleted file mode 100644
index fda54c9..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/510x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/744x1052.xcf.bz2 b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/744x1052.xcf.bz2
deleted file mode 100644
index 4d4d9f8..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/744x1052.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/800x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/800x600.xcf.bz2
deleted file mode 100644
index efe706d..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/800x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/800x88.xcf.bz2 b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/800x88.xcf.bz2
deleted file mode 100644
index db0393e..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/800x88.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/color-adjustment.curves b/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/color-adjustment.curves
deleted file mode 100644
index 7a910ad..0000000
--- a/Identity/Images/Themes/TreeFlower/1/Backgrounds/Xcf/color-adjustment.curves
+++ /dev/null
@@ -1,6 +0,0 @@
-# GIMP Curves File
-0 0 -1 -1 -1 -1 -1 -1 -1 53 -1 37 98 34 -1 44 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
-0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
-0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
-0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
-0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 255 255
diff --git a/Identity/Images/Themes/TreeFlower/1/Concept/Models/motif.svgz b/Identity/Images/Themes/TreeFlower/1/Concept/Models/motif.svgz
new file mode 100644
index 0000000..4cef1a8
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/1/Concept/Models/motif.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/1/Concept/Tpl/motif.svgz b/Identity/Images/Themes/TreeFlower/1/Concept/Tpl/motif.svgz
deleted file mode 100644
index 4cef1a8..0000000
Binary files a/Identity/Images/Themes/TreeFlower/1/Concept/Tpl/motif.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/1360x768-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/1360x768-final.png
new file mode 100644
index 0000000..d99ec6c
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/1360x768-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/160x600-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/160x600-final.png
new file mode 100644
index 0000000..f0253b9
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/160x600-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/200x150-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/200x150-final.png
new file mode 100644
index 0000000..ca877a2
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/200x150-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/2048x1536-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/2048x1536-final.png
new file mode 100644
index 0000000..363306d
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/2048x1536-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/400x300-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/400x300-final.png
new file mode 100644
index 0000000..467c4a6
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/400x300-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/443x443-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/443x443-final.png
new file mode 100644
index 0000000..bc4f06b
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/443x443-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/490x200-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/490x200-final.png
new file mode 100644
index 0000000..0555d45
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/490x200-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/510x300-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/510x300-final.png
new file mode 100644
index 0000000..6fadac3
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/510x300-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/640x300-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/640x300-final.png
new file mode 100644
index 0000000..f1020b8
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/640x300-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/640x480-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/640x480-final.png
new file mode 100644
index 0000000..94cadaa
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/640x480-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/744x1052-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/744x1052-final.png
new file mode 100644
index 0000000..64424c9
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/744x1052-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/800x600-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/800x600-final.png
new file mode 100644
index 0000000..8ab7a0c
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/800x600-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/800x88-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/800x88-final.png
new file mode 100644
index 0000000..df84bbd
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/800x88-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/886x443-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/886x443-final.png
new file mode 100644
index 0000000..7d30c73
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Images/886x443-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/1360x768-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/1360x768-final.png
deleted file mode 100644
index d99ec6c..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/1360x768-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/160x600-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/160x600-final.png
deleted file mode 100644
index f0253b9..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/160x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/200x150-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/200x150-final.png
deleted file mode 100644
index ca877a2..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/200x150-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/2048x1536-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/2048x1536-final.png
deleted file mode 100644
index 363306d..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/2048x1536-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/400x300-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/400x300-final.png
deleted file mode 100644
index 467c4a6..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/400x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/443x443-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/443x443-final.png
deleted file mode 100644
index bc4f06b..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/443x443-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/490x200-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/490x200-final.png
deleted file mode 100644
index 0555d45..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/490x200-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/510x300-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/510x300-final.png
deleted file mode 100644
index 6fadac3..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/510x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/640x300-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/640x300-final.png
deleted file mode 100644
index f1020b8..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/640x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/640x480-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/640x480-final.png
deleted file mode 100644
index 94cadaa..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/640x480-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/744x1052-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/744x1052-final.png
deleted file mode 100644
index 64424c9..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/744x1052-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/800x600-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/800x600-final.png
deleted file mode 100644
index 8ab7a0c..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/800x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/800x88-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/800x88-final.png
deleted file mode 100644
index df84bbd..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/800x88-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/886x443-final.png b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/886x443-final.png
deleted file mode 100644
index 7d30c73..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Img/Png/886x443-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/1360x768.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/1360x768.svgz
new file mode 100644
index 0000000..4386f3b
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/1360x768.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/1360x768.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/1360x768.xcf.bz2
new file mode 100644
index 0000000..8f051b2
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/1360x768.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/160x600.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/160x600.svgz
new file mode 100644
index 0000000..f6d57d4
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/160x600.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/160x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/160x600.xcf.bz2
new file mode 100644
index 0000000..d492ae4
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/160x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/200x150.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/200x150.svgz
new file mode 100644
index 0000000..248978d
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/200x150.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/200x150.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/200x150.xcf.bz2
new file mode 100644
index 0000000..a1f2359
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/200x150.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/2048x1536.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/2048x1536.svgz
new file mode 100644
index 0000000..e013781
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/2048x1536.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/2048x1536.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/2048x1536.xcf.bz2
new file mode 100644
index 0000000..6d68c9e
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/2048x1536.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/400x300.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/400x300.svgz
new file mode 100644
index 0000000..7aea66b
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/400x300.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/400x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/400x300.xcf.bz2
new file mode 100644
index 0000000..5d8489a
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/400x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/443x443.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/443x443.svgz
new file mode 100644
index 0000000..877d36d
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/443x443.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/443x443.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/443x443.xcf.bz2
new file mode 100644
index 0000000..0954807
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/443x443.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/490x200.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/490x200.svgz
new file mode 100644
index 0000000..873cf75
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/490x200.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/490x200.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/490x200.xcf.bz2
new file mode 100644
index 0000000..e176795
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/490x200.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/510x300.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/510x300.svgz
new file mode 100644
index 0000000..eae3896
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/510x300.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/510x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/510x300.xcf.bz2
new file mode 100644
index 0000000..9594935
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/510x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/640x300.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/640x300.svgz
new file mode 100644
index 0000000..0b01cf1
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/640x300.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/640x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/640x300.xcf.bz2
new file mode 100644
index 0000000..8f10586
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/640x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/640x480.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/640x480.svgz
new file mode 100755
index 0000000..c2037c9
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/640x480.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/640x480.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/640x480.xcf.bz2
new file mode 100644
index 0000000..f6ed1b7
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/640x480.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/744x1050.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/744x1050.xcf.bz2
new file mode 100644
index 0000000..6eb9563
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/744x1050.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/744x1052.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/744x1052.svgz
new file mode 100644
index 0000000..baa9e38
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/744x1052.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/800x600.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/800x600.svgz
new file mode 100755
index 0000000..f4bc8c2
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/800x600.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/800x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/800x600.xcf.bz2
new file mode 100644
index 0000000..2b3d580
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/800x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/800x88.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/800x88.svgz
new file mode 100644
index 0000000..1565fa1
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/800x88.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/800x88.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/800x88.xcf.bz2
new file mode 100644
index 0000000..fb3fa06
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/800x88.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/886x443.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/886x443.svgz
new file mode 100644
index 0000000..1410df5
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/886x443.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/886x443.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/886x443.xcf.bz2
new file mode 100644
index 0000000..cbdad2c
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Models/886x443.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/1360x768.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/1360x768.svgz
deleted file mode 100644
index 4386f3b..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/1360x768.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/160x600.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/160x600.svgz
deleted file mode 100644
index f6d57d4..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/160x600.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/200x150.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/200x150.svgz
deleted file mode 100644
index 248978d..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/200x150.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/2048x1536.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/2048x1536.svgz
deleted file mode 100644
index e013781..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/2048x1536.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/400x300.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/400x300.svgz
deleted file mode 100644
index 7aea66b..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/400x300.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/443x443.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/443x443.svgz
deleted file mode 100644
index 877d36d..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/443x443.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/490x200.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/490x200.svgz
deleted file mode 100644
index 873cf75..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/490x200.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/510x300.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/510x300.svgz
deleted file mode 100644
index eae3896..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/510x300.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/640x300.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/640x300.svgz
deleted file mode 100644
index 0b01cf1..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/640x300.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/640x480.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/640x480.svgz
deleted file mode 100755
index c2037c9..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/640x480.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/744x1052.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/744x1052.svgz
deleted file mode 100644
index baa9e38..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/744x1052.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/800x600.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/800x600.svgz
deleted file mode 100755
index f4bc8c2..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/800x600.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/800x88.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/800x88.svgz
deleted file mode 100644
index 1565fa1..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/800x88.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/886x443.svgz b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/886x443.svgz
deleted file mode 100644
index 1410df5..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Tpl/886x443.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/1360x768.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/1360x768.xcf.bz2
deleted file mode 100644
index 8f051b2..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/1360x768.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/160x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/160x600.xcf.bz2
deleted file mode 100644
index d492ae4..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/160x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/200x150.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/200x150.xcf.bz2
deleted file mode 100644
index a1f2359..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/200x150.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/2048x1536.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/2048x1536.xcf.bz2
deleted file mode 100644
index 6d68c9e..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/2048x1536.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/400x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/400x300.xcf.bz2
deleted file mode 100644
index 5d8489a..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/400x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/443x443.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/443x443.xcf.bz2
deleted file mode 100644
index 0954807..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/443x443.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/490x200.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/490x200.xcf.bz2
deleted file mode 100644
index e176795..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/490x200.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/510x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/510x300.xcf.bz2
deleted file mode 100644
index 9594935..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/510x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/640x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/640x300.xcf.bz2
deleted file mode 100644
index 8f10586..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/640x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/640x480.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/640x480.xcf.bz2
deleted file mode 100644
index f6ed1b7..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/640x480.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/744x1050.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/744x1050.xcf.bz2
deleted file mode 100644
index 6eb9563..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/744x1050.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/800x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/800x600.xcf.bz2
deleted file mode 100644
index 2b3d580..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/800x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/800x88.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/800x88.xcf.bz2
deleted file mode 100644
index fb3fa06..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/800x88.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/886x443.xcf.bz2 b/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/886x443.xcf.bz2
deleted file mode 100644
index cbdad2c..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Backgrounds/Xcf/886x443.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Concept/Models/motif.svgz b/Identity/Images/Themes/TreeFlower/2/Concept/Models/motif.svgz
new file mode 100644
index 0000000..ca7478f
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/2/Concept/Models/motif.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/2/Concept/Tpl/motif.svgz b/Identity/Images/Themes/TreeFlower/2/Concept/Tpl/motif.svgz
deleted file mode 100644
index ca7478f..0000000
Binary files a/Identity/Images/Themes/TreeFlower/2/Concept/Tpl/motif.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/1360x768-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/1360x768-final.png
new file mode 100644
index 0000000..7dd7792
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/1360x768-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/160x600-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/160x600-final.png
new file mode 100644
index 0000000..b62f0ef
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/160x600-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/200x150-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/200x150-final.png
new file mode 100644
index 0000000..affe332
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/200x150-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/2048x1536-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/2048x1536-final.png
new file mode 100644
index 0000000..c5b88c5
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/2048x1536-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/400x300-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/400x300-final.png
new file mode 100644
index 0000000..546d1a3
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/400x300-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/443x443-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/443x443-final.png
new file mode 100644
index 0000000..338e6b1
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/443x443-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/490x200-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/490x200-final.png
new file mode 100644
index 0000000..aee4777
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/490x200-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/510x300-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/510x300-final.png
new file mode 100644
index 0000000..493278d
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/510x300-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/640x300-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/640x300-final.png
new file mode 100644
index 0000000..dba7a07
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/640x300-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/640x480-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/640x480-final.png
new file mode 100644
index 0000000..d9ca079
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/640x480-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/744x1052-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/744x1052-final.png
new file mode 100644
index 0000000..5449b6a
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/744x1052-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/800x600-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/800x600-final.png
new file mode 100644
index 0000000..337299d
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/800x600-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/800x88-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/800x88-final.png
new file mode 100644
index 0000000..f0ba1a7
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/800x88-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/886x443-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/886x443-final.png
new file mode 100644
index 0000000..f9c7642
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Images/886x443-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/1360x768-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/1360x768-final.png
deleted file mode 100644
index 7dd7792..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/1360x768-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/160x600-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/160x600-final.png
deleted file mode 100644
index b62f0ef..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/160x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/200x150-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/200x150-final.png
deleted file mode 100644
index affe332..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/200x150-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/2048x1536-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/2048x1536-final.png
deleted file mode 100644
index c5b88c5..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/2048x1536-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/400x300-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/400x300-final.png
deleted file mode 100644
index 546d1a3..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/400x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/443x443-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/443x443-final.png
deleted file mode 100644
index 338e6b1..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/443x443-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/490x200-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/490x200-final.png
deleted file mode 100644
index aee4777..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/490x200-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/510x300-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/510x300-final.png
deleted file mode 100644
index 493278d..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/510x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/640x300-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/640x300-final.png
deleted file mode 100644
index dba7a07..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/640x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/640x480-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/640x480-final.png
deleted file mode 100644
index d9ca079..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/640x480-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/744x1052-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/744x1052-final.png
deleted file mode 100644
index 5449b6a..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/744x1052-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/800x600-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/800x600-final.png
deleted file mode 100644
index 337299d..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/800x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/800x88-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/800x88-final.png
deleted file mode 100644
index f0ba1a7..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/800x88-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/886x443-final.png b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/886x443-final.png
deleted file mode 100644
index f9c7642..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Img/Png/886x443-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/1360x768.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/1360x768.svgz
new file mode 100644
index 0000000..745b70a
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/1360x768.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/1360x768.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/1360x768.xcf.bz2
new file mode 100644
index 0000000..af590c8
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/1360x768.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/160x600.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/160x600.svgz
new file mode 100644
index 0000000..1c9b9aa
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/160x600.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/160x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/160x600.xcf.bz2
new file mode 100644
index 0000000..980eea6
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/160x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/200x150.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/200x150.svgz
new file mode 100644
index 0000000..59024ea
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/200x150.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/200x150.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/200x150.xcf.bz2
new file mode 100644
index 0000000..45e2aca
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/200x150.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/2048x1536.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/2048x1536.svgz
new file mode 100644
index 0000000..17e6a98
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/2048x1536.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/2048x1536.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/2048x1536.xcf.bz2
new file mode 100644
index 0000000..fef0205
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/2048x1536.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/400x300.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/400x300.svgz
new file mode 100644
index 0000000..218d1df
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/400x300.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/400x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/400x300.xcf.bz2
new file mode 100644
index 0000000..0ba14db
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/400x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/443x443.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/443x443.svgz
new file mode 100644
index 0000000..711ffe6
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/443x443.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/443x443.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/443x443.xcf.bz2
new file mode 100644
index 0000000..a7c61d3
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/443x443.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/490x200.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/490x200.svgz
new file mode 100644
index 0000000..0002891
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/490x200.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/490x200.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/490x200.xcf.bz2
new file mode 100644
index 0000000..279ae57
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/490x200.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/510x300.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/510x300.svgz
new file mode 100644
index 0000000..6c8bbaa
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/510x300.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/510x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/510x300.xcf.bz2
new file mode 100644
index 0000000..9791acf
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/510x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/640x300.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/640x300.svgz
new file mode 100644
index 0000000..718b66f
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/640x300.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/640x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/640x300.xcf.bz2
new file mode 100644
index 0000000..5f78883
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/640x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/640x480.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/640x480.svgz
new file mode 100755
index 0000000..50bf368
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/640x480.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/640x480.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/640x480.xcf.bz2
new file mode 100644
index 0000000..1550d2a
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/640x480.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/744x1052.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/744x1052.svgz
new file mode 100644
index 0000000..e10b71d
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/744x1052.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/744x1052.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/744x1052.xcf.bz2
new file mode 100644
index 0000000..82c0825
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/744x1052.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/800x600.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/800x600.svgz
new file mode 100755
index 0000000..95b5814
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/800x600.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/800x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/800x600.xcf.bz2
new file mode 100644
index 0000000..6f30c21
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/800x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/800x88.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/800x88.svgz
new file mode 100644
index 0000000..d35805a
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/800x88.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/800x88.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/800x88.xcf.bz2
new file mode 100644
index 0000000..fbbe25a
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/800x88.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/886x443.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/886x443.svgz
new file mode 100644
index 0000000..500f836
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/886x443.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/886x443.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/886x443.xcf.bz2
new file mode 100644
index 0000000..c0c9329
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Models/886x443.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/1360x768.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/1360x768.svgz
deleted file mode 100644
index 745b70a..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/1360x768.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/160x600.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/160x600.svgz
deleted file mode 100644
index 1c9b9aa..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/160x600.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/200x150.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/200x150.svgz
deleted file mode 100644
index 59024ea..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/200x150.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/2048x1536.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/2048x1536.svgz
deleted file mode 100644
index 17e6a98..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/2048x1536.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/400x300.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/400x300.svgz
deleted file mode 100644
index 218d1df..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/400x300.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/443x443.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/443x443.svgz
deleted file mode 100644
index 711ffe6..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/443x443.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/490x200.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/490x200.svgz
deleted file mode 100644
index 0002891..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/490x200.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/510x300.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/510x300.svgz
deleted file mode 100644
index 6c8bbaa..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/510x300.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/640x300.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/640x300.svgz
deleted file mode 100644
index 718b66f..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/640x300.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/640x480.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/640x480.svgz
deleted file mode 100755
index 50bf368..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/640x480.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/744x1052.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/744x1052.svgz
deleted file mode 100644
index e10b71d..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/744x1052.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/800x600.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/800x600.svgz
deleted file mode 100755
index 95b5814..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/800x600.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/800x88.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/800x88.svgz
deleted file mode 100644
index d35805a..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/800x88.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/886x443.svgz b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/886x443.svgz
deleted file mode 100644
index 500f836..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Tpl/886x443.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/1360x768.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/1360x768.xcf.bz2
deleted file mode 100644
index af590c8..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/1360x768.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/160x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/160x600.xcf.bz2
deleted file mode 100644
index 980eea6..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/160x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/200x150.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/200x150.xcf.bz2
deleted file mode 100644
index 45e2aca..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/200x150.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/2048x1536.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/2048x1536.xcf.bz2
deleted file mode 100644
index fef0205..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/2048x1536.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/400x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/400x300.xcf.bz2
deleted file mode 100644
index 0ba14db..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/400x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/443x443.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/443x443.xcf.bz2
deleted file mode 100644
index a7c61d3..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/443x443.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/490x200.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/490x200.xcf.bz2
deleted file mode 100644
index 279ae57..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/490x200.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/510x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/510x300.xcf.bz2
deleted file mode 100644
index 9791acf..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/510x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/640x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/640x300.xcf.bz2
deleted file mode 100644
index 5f78883..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/640x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/640x480.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/640x480.xcf.bz2
deleted file mode 100644
index 1550d2a..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/640x480.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/744x1052.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/744x1052.xcf.bz2
deleted file mode 100644
index 82c0825..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/744x1052.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/800x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/800x600.xcf.bz2
deleted file mode 100644
index 6f30c21..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/800x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/800x88.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/800x88.xcf.bz2
deleted file mode 100644
index fbbe25a..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/800x88.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/886x443.xcf.bz2 b/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/886x443.xcf.bz2
deleted file mode 100644
index c0c9329..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Backgrounds/Xcf/886x443.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Concept/Models/motif.svgz b/Identity/Images/Themes/TreeFlower/3/Concept/Models/motif.svgz
new file mode 100644
index 0000000..1da0101
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/3/Concept/Models/motif.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/3/Concept/Tpl/motif.svgz b/Identity/Images/Themes/TreeFlower/3/Concept/Tpl/motif.svgz
deleted file mode 100644
index 1da0101..0000000
Binary files a/Identity/Images/Themes/TreeFlower/3/Concept/Tpl/motif.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/1360x768-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/1360x768-final.png
new file mode 100644
index 0000000..fb0475c
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/1360x768-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/160x600-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/160x600-final.png
new file mode 100644
index 0000000..ac005b5
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/160x600-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/200x150-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/200x150-final.png
new file mode 100644
index 0000000..d3a98dc
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/200x150-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/2048x1536-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/2048x1536-final.png
new file mode 100644
index 0000000..729bde2
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/2048x1536-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/400x300-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/400x300-final.png
new file mode 100644
index 0000000..9457fc8
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/400x300-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/490x200-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/490x200-final.png
new file mode 100644
index 0000000..848daa1
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/490x200-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/510x300-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/510x300-final.png
new file mode 100644
index 0000000..6185c07
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/510x300-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/640x300-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/640x300-final.png
new file mode 100644
index 0000000..10f06d1
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/640x300-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/640x480-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/640x480-final.png
new file mode 100644
index 0000000..9537695
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/640x480-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/744x1052-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/744x1052-final.png
new file mode 100644
index 0000000..4197e06
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/744x1052-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/800x600-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/800x600-final.png
new file mode 100644
index 0000000..694eb37
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/800x600-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/800x88-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/800x88-final.png
new file mode 100644
index 0000000..2cf81f3
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Images/800x88-final.png differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/1360x768-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/1360x768-final.png
deleted file mode 100644
index fb0475c..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/1360x768-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/160x600-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/160x600-final.png
deleted file mode 100644
index ac005b5..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/160x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/200x150-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/200x150-final.png
deleted file mode 100644
index d3a98dc..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/200x150-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/2048x1536-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/2048x1536-final.png
deleted file mode 100644
index 729bde2..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/2048x1536-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/400x300-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/400x300-final.png
deleted file mode 100644
index 9457fc8..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/400x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/490x200-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/490x200-final.png
deleted file mode 100644
index 848daa1..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/490x200-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/510x300-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/510x300-final.png
deleted file mode 100644
index 6185c07..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/510x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/640x300-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/640x300-final.png
deleted file mode 100644
index 10f06d1..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/640x300-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/640x480-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/640x480-final.png
deleted file mode 100644
index 9537695..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/640x480-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/744x1052-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/744x1052-final.png
deleted file mode 100644
index 4197e06..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/744x1052-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/800x600-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/800x600-final.png
deleted file mode 100644
index 694eb37..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/800x600-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/800x88-final.png b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/800x88-final.png
deleted file mode 100644
index 2cf81f3..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Img/Png/800x88-final.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/1360x768.svgz b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/1360x768.svgz
new file mode 100755
index 0000000..2ea641d
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/1360x768.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/1360x768.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/1360x768.xcf.bz2
new file mode 100644
index 0000000..ea8e7e0
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/1360x768.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/160x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/160x600.xcf.bz2
new file mode 100644
index 0000000..4624ced
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/160x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/400x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/400x300.xcf.bz2
new file mode 100644
index 0000000..0d8e560
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/400x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/490x200.svgz b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/490x200.svgz
new file mode 100644
index 0000000..91f2169
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/490x200.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/490x200.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/490x200.xcf.bz2
new file mode 100644
index 0000000..6d3a7ae
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/490x200.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/510x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/510x300.xcf.bz2
new file mode 100644
index 0000000..57571a1
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/510x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/640x300.svgz b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/640x300.svgz
new file mode 100755
index 0000000..4aaba0d
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/640x300.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/640x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/640x300.xcf.bz2
new file mode 100644
index 0000000..436a929
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/640x300.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/640x480.svgz b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/640x480.svgz
new file mode 100755
index 0000000..a9be7f9
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/640x480.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/640x480.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/640x480.xcf.bz2
new file mode 100644
index 0000000..1ce3788
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/640x480.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/800x600.svgz b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/800x600.svgz
new file mode 100755
index 0000000..cf1bbe1
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/800x600.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/800x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/800x600.xcf.bz2
new file mode 100644
index 0000000..10d73a3
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/800x600.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/800x88.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/800x88.xcf.bz2
new file mode 100644
index 0000000..69e072a
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Models/800x88.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Tpl/1360x768.svgz b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Tpl/1360x768.svgz
deleted file mode 100755
index 2ea641d..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Tpl/1360x768.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Tpl/490x200.svgz b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Tpl/490x200.svgz
deleted file mode 100644
index 91f2169..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Tpl/490x200.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Tpl/640x300.svgz b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Tpl/640x300.svgz
deleted file mode 100755
index 4aaba0d..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Tpl/640x300.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Tpl/640x480.svgz b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Tpl/640x480.svgz
deleted file mode 100755
index a9be7f9..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Tpl/640x480.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Tpl/800x600.svgz b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Tpl/800x600.svgz
deleted file mode 100755
index cf1bbe1..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Tpl/800x600.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/1360x768.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/1360x768.xcf.bz2
deleted file mode 100644
index ea8e7e0..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/1360x768.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/160x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/160x600.xcf.bz2
deleted file mode 100644
index 4624ced..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/160x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/400x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/400x300.xcf.bz2
deleted file mode 100644
index 0d8e560..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/400x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/490x200.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/490x200.xcf.bz2
deleted file mode 100644
index 6d3a7ae..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/490x200.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/510x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/510x300.xcf.bz2
deleted file mode 100644
index 57571a1..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/510x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/640x300.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/640x300.xcf.bz2
deleted file mode 100644
index 436a929..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/640x300.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/640x480.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/640x480.xcf.bz2
deleted file mode 100644
index 1ce3788..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/640x480.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/800x600.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/800x600.xcf.bz2
deleted file mode 100644
index 10d73a3..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/800x600.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/800x88.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/800x88.xcf.bz2
deleted file mode 100644
index 69e072a..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Backgrounds/Xcf/800x88.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Concept/Models/motif.svgz b/Identity/Images/Themes/TreeFlower/4/Concept/Models/motif.svgz
new file mode 100644
index 0000000..065a5f1
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Concept/Models/motif.svgz differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Concept/Tpl/motif.svgz b/Identity/Images/Themes/TreeFlower/4/Concept/Tpl/motif.svgz
deleted file mode 100644
index 065a5f1..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Concept/Tpl/motif.svgz and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Patterns/Images/line-1.png b/Identity/Images/Themes/TreeFlower/4/Patterns/Images/line-1.png
new file mode 100644
index 0000000..c246f5b
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Patterns/Images/line-1.png differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Patterns/Images/line-2.png b/Identity/Images/Themes/TreeFlower/4/Patterns/Images/line-2.png
new file mode 100644
index 0000000..712b004
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Patterns/Images/line-2.png differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Patterns/Img/line-1.png b/Identity/Images/Themes/TreeFlower/4/Patterns/Img/line-1.png
deleted file mode 100644
index c246f5b..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Patterns/Img/line-1.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Patterns/Img/line-2.png b/Identity/Images/Themes/TreeFlower/4/Patterns/Img/line-2.png
deleted file mode 100644
index 712b004..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Patterns/Img/line-2.png and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Patterns/Models/line-1.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Patterns/Models/line-1.xcf.bz2
new file mode 100644
index 0000000..1d4b9ba
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Patterns/Models/line-1.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Patterns/Models/line-2.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Patterns/Models/line-2.xcf.bz2
new file mode 100644
index 0000000..ab016fe
Binary files /dev/null and b/Identity/Images/Themes/TreeFlower/4/Patterns/Models/line-2.xcf.bz2 differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Patterns/Xcf/line-1.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Patterns/Xcf/line-1.xcf.bz2
deleted file mode 100644
index 1d4b9ba..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Patterns/Xcf/line-1.xcf.bz2 and /dev/null differ
diff --git a/Identity/Images/Themes/TreeFlower/4/Patterns/Xcf/line-2.xcf.bz2 b/Identity/Images/Themes/TreeFlower/4/Patterns/Xcf/line-2.xcf.bz2
deleted file mode 100644
index ab016fe..0000000
Binary files a/Identity/Images/Themes/TreeFlower/4/Patterns/Xcf/line-2.xcf.bz2 and /dev/null differ
diff --git a/Identity/Models/Brands/Logos/centos.org.cu/images.conf b/Identity/Models/Brands/Logos/centos.org.cu/images.conf
deleted file mode 100644
index 7c87c3e..0000000
--- a/Identity/Models/Brands/Logos/centos.org.cu/images.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file contains the information used to build The CentOS Logo in
-# different sizes, colors and formats.
-
-[centos.png]
-models = "Identity/Models/Brands/Symbols/centos-symbol-forlogos.svgz Identity/Models/Brands/Types/centos-org.cu.svgz"
-formats = "xpm pdf jpg tif"
-heights = "16 20 22 24 32 36 38 40 48 64 72 78 96 112 124 128 148 164 196 200 512"
-fgcolors = "000000 ffffff"
-bgcolors = "ffffff-0"
-command = "/usr/bin/convert +append"
-
-[centos-artwork.png]
-models = "Identity/Models/Brands/Symbols/centos-symbol-forlogos.svgz Identity/Models/Brands/Types/centos-org.cu.svgz Identity/Models/Brands/Types/artwork.svgz"
-formats = "xpm pdf jpg tif"
-heights = "16 20 22 24 32 36 38 40 48 64 72 78 96 112 124 128 148 164 196 200 512"
-fgcolors = "000000 ffffff"
-bgcolors = "ffffff-0"
-command = "/usr/bin/convert +append"
-
-[centos-wiki.png]
-models = "Identity/Models/Brands/Symbols/centos-symbol-forlogos.svgz Identity/Models/Brands/Types/centos-org.cu.svgz Identity/Models/Brands/Types/wiki.svgz"
-formats = "xpm pdf jpg tif"
-heights = "16 20 22 24 32 36 38 40 48 64 72 78 96 112 124 128 148 164 196 200 512"
-fgcolors = "000000 ffffff"
-bgcolors = "ffffff-0"
-command = "/usr/bin/convert +append"
-
-[centos-bugs.png]
-models = "Identity/Models/Brands/Symbols/centos-symbol-forlogos.svgz Identity/Models/Brands/Types/centos-org.cu.svgz Identity/Models/Brands/Types/bugs.svgz"
-formats = "xpm pdf jpg tif"
-heights = "16 20 22 24 32 36 38 40 48 64 72 78 96 112 124 128 148 164 196 200 512"
-fgcolors = "000000 ffffff"
-bgcolors = "ffffff-0"
-command = "/usr/bin/convert +append"
-
-[centos-people.png]
-models = "Identity/Models/Brands/Symbols/centos-symbol-forlogos.svgz Identity/Models/Brands/Types/centos-org.cu.svgz Identity/Models/Brands/Types/people.svgz"
-formats = "xpm pdf jpg tif"
-heights = "16 20 22 24 32 36 38 40 48 64 72 78 96 112 124 128 148 164 196 200 512"
-fgcolors = "000000 ffffff"
-bgcolors = "ffffff-0"
-command = "/usr/bin/convert +append"
diff --git a/Identity/Models/Brands/Logos/centos.org/images.conf b/Identity/Models/Brands/Logos/centos.org/images.conf
deleted file mode 100644
index a1b8370..0000000
--- a/Identity/Models/Brands/Logos/centos.org/images.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file contains the information used to build The CentOS Logo in
-# different sizes, colors and formats.
-
-[centos.png]
-models = "Identity/Models/Brands/Symbols/centos-symbol-forlogos.svgz Identity/Models/Brands/Types/centos.svgz"
-formats = "xpm pdf jpg tif"
-heights = "16 20 22 24 32 36 38 40 48 64 72 78 96 112 124 128 148 164 196 200 512"
-fgcolors = "000000 ffffff"
-bgcolors = "ffffff-0"
-command = "/usr/bin/convert +append"
-
-[centos-artwork.png]
-models = "Identity/Models/Brands/Symbols/centos-symbol-forlogos.svgz Identity/Models/Brands/Types/centos.svgz Identity/Models/Brands/Types/artwork.svgz"
-formats = "xpm pdf jpg tif"
-heights = "16 20 22 24 32 36 38 40 48 64 72 78 96 112 124 128 148 164 196 200 512"
-fgcolors = "000000 ffffff"
-bgcolors = "ffffff-0"
-command = "/usr/bin/convert +append"
-
-[centos-wiki.png]
-models = "Identity/Models/Brands/Symbols/centos-symbol-forlogos.svgz Identity/Models/Brands/Types/centos.svgz Identity/Models/Brands/Types/wiki.svgz"
-formats = "xpm pdf jpg tif"
-heights = "16 20 22 24 32 36 38 40 48 64 72 78 96 112 124 128 148 164 196 200 512"
-fgcolors = "000000 ffffff"
-bgcolors = "ffffff-0"
-command = "/usr/bin/convert +append"
-
-[centos-bugs.png]
-models = "Identity/Models/Brands/Symbols/centos-symbol-forlogos.svgz Identity/Models/Brands/Types/centos.svgz Identity/Models/Brands/Types/bugs.svgz"
-formats = "xpm pdf jpg tif"
-heights = "16 20 22 24 32 36 38 40 48 64 72 78 96 112 124 128 148 164 196 200 512"
-fgcolors = "000000 ffffff"
-bgcolors = "ffffff-0"
-command = "/usr/bin/convert +append"
diff --git a/Identity/Models/Brands/Symbols/centos-symbol-forlogos.svgz b/Identity/Models/Brands/Symbols/centos-symbol-forlogos.svgz
deleted file mode 100644
index 5685050..0000000
Binary files a/Identity/Models/Brands/Symbols/centos-symbol-forlogos.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Symbols/centos-symbol-nomargin.svgz b/Identity/Models/Brands/Symbols/centos-symbol-nomargin.svgz
deleted file mode 100644
index c6431ab..0000000
Binary files a/Identity/Models/Brands/Symbols/centos-symbol-nomargin.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Types/Webenv/centos.org.cu/centos.svgz b/Identity/Models/Brands/Types/Webenv/centos.org.cu/centos.svgz
new file mode 100644
index 0000000..3372ffa
Binary files /dev/null and b/Identity/Models/Brands/Types/Webenv/centos.org.cu/centos.svgz differ
diff --git a/Identity/Models/Brands/Types/artwork.svgz b/Identity/Models/Brands/Types/artwork.svgz
deleted file mode 100644
index 1c75af0..0000000
Binary files a/Identity/Models/Brands/Types/artwork.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Types/bugs.svgz b/Identity/Models/Brands/Types/bugs.svgz
deleted file mode 100644
index 4b25634..0000000
Binary files a/Identity/Models/Brands/Types/bugs.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Types/centos-5-msg.svgz b/Identity/Models/Brands/Types/centos-5-msg.svgz
deleted file mode 100644
index cb1b40e..0000000
Binary files a/Identity/Models/Brands/Types/centos-5-msg.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Types/centos-5.svgz b/Identity/Models/Brands/Types/centos-5.svgz
deleted file mode 100644
index 737f761..0000000
Binary files a/Identity/Models/Brands/Types/centos-5.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Types/centos-6-msg.svgz b/Identity/Models/Brands/Types/centos-6-msg.svgz
deleted file mode 100644
index fa670d2..0000000
Binary files a/Identity/Models/Brands/Types/centos-6-msg.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Types/centos-7-msg.svgz b/Identity/Models/Brands/Types/centos-7-msg.svgz
deleted file mode 100644
index 8d9ce7c..0000000
Binary files a/Identity/Models/Brands/Types/centos-7-msg.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Types/centos-org.cu.svgz b/Identity/Models/Brands/Types/centos-org.cu.svgz
deleted file mode 100644
index cbc7eb6..0000000
Binary files a/Identity/Models/Brands/Types/centos-org.cu.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Types/centos.svgz b/Identity/Models/Brands/Types/centos.svgz
deleted file mode 100644
index 3c3a8e9..0000000
Binary files a/Identity/Models/Brands/Types/centos.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Types/cranberry.svgz b/Identity/Models/Brands/Types/cranberry.svgz
deleted file mode 100644
index 63911e3..0000000
Binary files a/Identity/Models/Brands/Types/cranberry.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Types/dasha.svgz b/Identity/Models/Brands/Types/dasha.svgz
deleted file mode 100644
index 9d226fa..0000000
Binary files a/Identity/Models/Brands/Types/dasha.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Types/livecd.svgz b/Identity/Models/Brands/Types/livecd.svgz
deleted file mode 100644
index 409924d..0000000
Binary files a/Identity/Models/Brands/Types/livecd.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Types/pandora.svgz b/Identity/Models/Brands/Types/pandora.svgz
deleted file mode 100644
index df736e4..0000000
Binary files a/Identity/Models/Brands/Types/pandora.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Types/people.svgz b/Identity/Models/Brands/Types/people.svgz
deleted file mode 100644
index 641bd0e..0000000
Binary files a/Identity/Models/Brands/Types/people.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Types/wiki.svgz b/Identity/Models/Brands/Types/wiki.svgz
deleted file mode 100644
index 8afac7a..0000000
Binary files a/Identity/Models/Brands/Types/wiki.svgz and /dev/null differ
diff --git a/Identity/Models/Brands/Types/xfs-support.svgz b/Identity/Models/Brands/Types/xfs-support.svgz
deleted file mode 100644
index 9250955..0000000
Binary files a/Identity/Models/Brands/Types/xfs-support.svgz and /dev/null differ
diff --git a/Identity/Models/Themes/Default/Concept/motif.svgz b/Identity/Models/Themes/Default/Concept/motif.svgz
index 1e0f432..cfc5545 100644
Binary files a/Identity/Models/Themes/Default/Concept/motif.svgz and b/Identity/Models/Themes/Default/Concept/motif.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Anaconda/01-welcome.svgz b/Identity/Models/Themes/Default/Distro/5/Anaconda/01-welcome.svgz
index 02f08b2..85c296e 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Anaconda/01-welcome.svgz and b/Identity/Models/Themes/Default/Distro/5/Anaconda/01-welcome.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Anaconda/02-donate.svgz b/Identity/Models/Themes/Default/Distro/5/Anaconda/02-donate.svgz
index fbf4cde..306ad05 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Anaconda/02-donate.svgz and b/Identity/Models/Themes/Default/Distro/5/Anaconda/02-donate.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Anaconda/03-yum.svgz b/Identity/Models/Themes/Default/Distro/5/Anaconda/03-yum.svgz
index ac46478..d34eb5d 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Anaconda/03-yum.svgz and b/Identity/Models/Themes/Default/Distro/5/Anaconda/03-yum.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Anaconda/04-repos.svgz b/Identity/Models/Themes/Default/Distro/5/Anaconda/04-repos.svgz
index 8f758a1..cf569ca 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Anaconda/04-repos.svgz and b/Identity/Models/Themes/Default/Distro/5/Anaconda/04-repos.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Anaconda/05-centosplus.svgz b/Identity/Models/Themes/Default/Distro/5/Anaconda/05-centosplus.svgz
index 9c3977f..63fcb80 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Anaconda/05-centosplus.svgz and b/Identity/Models/Themes/Default/Distro/5/Anaconda/05-centosplus.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Anaconda/06-support.svgz b/Identity/Models/Themes/Default/Distro/5/Anaconda/06-support.svgz
index 91ec433..434ea64 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Anaconda/06-support.svgz and b/Identity/Models/Themes/Default/Distro/5/Anaconda/06-support.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Anaconda/07-docs.svgz b/Identity/Models/Themes/Default/Distro/5/Anaconda/07-docs.svgz
index e8da394..c727fff 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Anaconda/07-docs.svgz and b/Identity/Models/Themes/Default/Distro/5/Anaconda/07-docs.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Anaconda/08-wiki.svgz b/Identity/Models/Themes/Default/Distro/5/Anaconda/08-wiki.svgz
index de8c1ba..c0f9c09 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Anaconda/08-wiki.svgz and b/Identity/Models/Themes/Default/Distro/5/Anaconda/08-wiki.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Anaconda/09-virtualization.svgz b/Identity/Models/Themes/Default/Distro/5/Anaconda/09-virtualization.svgz
index 7f5132e..d635e3b 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Anaconda/09-virtualization.svgz and b/Identity/Models/Themes/Default/Distro/5/Anaconda/09-virtualization.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Anaconda/anaconda_header.svgz b/Identity/Models/Themes/Default/Distro/5/Anaconda/anaconda_header.svgz
index 5212faa..2077efb 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Anaconda/anaconda_header.svgz and b/Identity/Models/Themes/Default/Distro/5/Anaconda/anaconda_header.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Anaconda/branding.conf b/Identity/Models/Themes/Default/Distro/5/Anaconda/branding.conf
index 3640cca..003cb54 100644
--- a/Identity/Models/Themes/Default/Distro/5/Anaconda/branding.conf
+++ b/Identity/Models/Themes/Default/Distro/5/Anaconda/branding.conf
@@ -7,13 +7,16 @@
# -----------------------------------------------------------------------
[types]
+anaconda_header.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+20+44"
+anaconda_header.svgz = "Types/Numbers/ffffff/ffffff-0/48/5.png:x48+160+20"
-anaconda_header.svgz = "Types/White/48/=BRAND=-5.png:x48+20+20"
-first.svgz = "Types/White/32/=BRAND=-5.png:x32+30+219"
-splash.svgz = "Types/White/48/=BRAND=-5-msg.png:x48+30+138"
+first.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+30+225"
+first.svgz = "Types/Numbers/ffffff/ffffff-0/48/5.png:x48+170+201"
-[symbols]
+splash.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+30+156"
+splash.svgz = "Types/Numbers/ffffff/ffffff-0/48/5.png:x48+170+132"
-anaconda_header.svgz = "Symbols/48/=BRAND=.png:x48+732+20"
-first.svgz = "Symbols/48/=BRAND=.png:x48+30+20"
-splash.svgz = "Symbols/48/=BRAND=.png:x48+30+20"
+[symbols]
+anaconda_header.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+732+20"
+first.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+30+20"
+splash.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+30+20"
diff --git a/Identity/Models/Themes/Default/Distro/5/Anaconda/first.svgz b/Identity/Models/Themes/Default/Distro/5/Anaconda/first.svgz
index 85fb158..3754ea7 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Anaconda/first.svgz and b/Identity/Models/Themes/Default/Distro/5/Anaconda/first.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Anaconda/splash.svgz b/Identity/Models/Themes/Default/Distro/5/Anaconda/splash.svgz
index bda3435..b03be40 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Anaconda/splash.svgz and b/Identity/Models/Themes/Default/Distro/5/Anaconda/splash.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Firstboot/branding.conf b/Identity/Models/Themes/Default/Distro/5/Firstboot/branding.conf
index 3b3ba52..7f3bd52 100644
--- a/Identity/Models/Themes/Default/Distro/5/Firstboot/branding.conf
+++ b/Identity/Models/Themes/Default/Distro/5/Firstboot/branding.conf
@@ -8,9 +8,10 @@
[types]
-splash-small.svgz = "Types/White/48/=BRAND=-5-msg.png:x48+30+138"
+splash-small.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+30+156"
+splash-small.svgz = "Types/Numbers/ffffff/ffffff-0/48/5.png:x48+170+132"
[symbols]
-firstboot-left.svgz = "Symbols/48/=BRAND=.png:x48+10+542"
-splash-small.svgz = "Symbols/48/=BRAND=.png:x48+30+20"
+firstboot-left.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+10+542"
+splash-small.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+30+20"
diff --git a/Identity/Models/Themes/Default/Distro/5/Firstboot/firstboot-left.svgz b/Identity/Models/Themes/Default/Distro/5/Firstboot/firstboot-left.svgz
index cd099af..886f8b9 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Firstboot/firstboot-left.svgz and b/Identity/Models/Themes/Default/Distro/5/Firstboot/firstboot-left.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Firstboot/splash-small.svgz b/Identity/Models/Themes/Default/Distro/5/Firstboot/splash-small.svgz
index 86652f7..3114b8a 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Firstboot/splash-small.svgz and b/Identity/Models/Themes/Default/Distro/5/Firstboot/splash-small.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Gdm/branding.conf b/Identity/Models/Themes/Default/Distro/5/Gdm/branding.conf
index 8e33aac..1f50da7 100644
--- a/Identity/Models/Themes/Default/Distro/5/Gdm/branding.conf
+++ b/Identity/Models/Themes/Default/Distro/5/Gdm/branding.conf
@@ -8,4 +8,4 @@
[symbols]
-screenshot.svgz = "Symbols/16/=BRAND=.png:x16+5+5"
+screenshot.svgz = "Symbols/Default/ffffff/ffffff-0/16/centos.png:x16+5+5"
diff --git a/Identity/Models/Themes/Default/Distro/5/Gdm/screenshot.svgz b/Identity/Models/Themes/Default/Distro/5/Gdm/screenshot.svgz
index dea577b..6e08896 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Gdm/screenshot.svgz and b/Identity/Models/Themes/Default/Distro/5/Gdm/screenshot.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Grub/splash.svgz b/Identity/Models/Themes/Default/Distro/5/Grub/splash.svgz
index 600e26f..abf1d5e 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Grub/splash.svgz and b/Identity/Models/Themes/Default/Distro/5/Grub/splash.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Gsplash/branding.conf b/Identity/Models/Themes/Default/Distro/5/Gsplash/branding.conf
index bdc5825..3acada7 100644
--- a/Identity/Models/Themes/Default/Distro/5/Gsplash/branding.conf
+++ b/Identity/Models/Themes/Default/Distro/5/Gsplash/branding.conf
@@ -8,8 +8,9 @@
[types]
-gnome-splash.svgz = "Types/White/48/=BRAND=-5.png:x48+10+170"
+gnome-splash.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+10+190"
+gnome-splash.svgz = "Types/Numbers/ffffff/ffffff-0/48/5.png:x48+150+166"
[symbols]
-gnome-splash.svgz = "Symbols/48/=BRAND=.png:x48+10+10"
+gnome-splash.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+10+10"
diff --git a/Identity/Models/Themes/Default/Distro/5/Gsplash/gnome-splash.svgz b/Identity/Models/Themes/Default/Distro/5/Gsplash/gnome-splash.svgz
index 97d97ed..9b99b30 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Gsplash/gnome-splash.svgz and b/Identity/Models/Themes/Default/Distro/5/Gsplash/gnome-splash.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Kdm/branding.conf b/Identity/Models/Themes/Default/Distro/5/Kdm/branding.conf
index 8e33aac..1f50da7 100644
--- a/Identity/Models/Themes/Default/Distro/5/Kdm/branding.conf
+++ b/Identity/Models/Themes/Default/Distro/5/Kdm/branding.conf
@@ -8,4 +8,4 @@
[symbols]
-screenshot.svgz = "Symbols/16/=BRAND=.png:x16+5+5"
+screenshot.svgz = "Symbols/Default/ffffff/ffffff-0/16/centos.png:x16+5+5"
diff --git a/Identity/Models/Themes/Default/Distro/5/Kdm/screenshot.svgz b/Identity/Models/Themes/Default/Distro/5/Kdm/screenshot.svgz
index eb9a6d6..afc8bc3 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Kdm/screenshot.svgz and b/Identity/Models/Themes/Default/Distro/5/Kdm/screenshot.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Ksplash/branding.conf b/Identity/Models/Themes/Default/Distro/5/Ksplash/branding.conf
index c24c9f4..69665aa 100644
--- a/Identity/Models/Themes/Default/Distro/5/Ksplash/branding.conf
+++ b/Identity/Models/Themes/Default/Distro/5/Ksplash/branding.conf
@@ -8,8 +8,9 @@
[types]
-splash_top.svgz = "Types/White/48/=BRAND=-5.png:x48+10+165"
+splash_top.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+10+189"
+splash_top.svgz = "Types/Numbers/ffffff/ffffff-0/48/5.png:x48+150+165"
[symbols]
-splash_top.svgz = "Symbols/48/=BRAND=.png:x48+10+10"
+splash_top.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+10+10"
diff --git a/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_active_bar.svgz b/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_active_bar.svgz
index 05afb7c..9ab5bb8 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_active_bar.svgz and b/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_active_bar.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_bottom.svgz b/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_bottom.svgz
index 7153d64..09dda34 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_bottom.svgz and b/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_bottom.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_inactive_bar.svgz b/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_inactive_bar.svgz
index e8f1f9c..3c5598e 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_inactive_bar.svgz and b/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_inactive_bar.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_top.svgz b/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_top.svgz
index a14353c..71ea855 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_top.svgz and b/Identity/Models/Themes/Default/Distro/5/Ksplash/splash_top.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Rhgb/branding.conf b/Identity/Models/Themes/Default/Distro/5/Rhgb/branding.conf
index 0cb2619..3afa814 100644
--- a/Identity/Models/Themes/Default/Distro/5/Rhgb/branding.conf
+++ b/Identity/Models/Themes/Default/Distro/5/Rhgb/branding.conf
@@ -8,9 +8,10 @@
[types]
-system-logo.svgz = "Types/White/38/=BRAND=-5.png:x38+18+5"
+system-logo.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+0+24"
+system-logo.svgz = "Types/Numbers/ffffff/ffffff-0/48/5.png:x48+135+0"
[symbols]
-large-computer.svgz = "Symbols/48/=BRAND=.png:x48+30+30"
-main-logo.svgz = "Symbols/124/=BRAND=.png:x124+186.5+21"
+large-computer.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+30+30"
+main-logo.svgz = "Symbols/Default/ffffff/ffffff-0/124/centos.png:x124+186.5+21"
diff --git a/Identity/Models/Themes/Default/Distro/5/Rhgb/large-computer.svgz b/Identity/Models/Themes/Default/Distro/5/Rhgb/large-computer.svgz
index 7bdfef1..365a593 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Rhgb/large-computer.svgz and b/Identity/Models/Themes/Default/Distro/5/Rhgb/large-computer.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Rhgb/main-logo.svgz b/Identity/Models/Themes/Default/Distro/5/Rhgb/main-logo.svgz
index 8e9e809..584c5f1 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Rhgb/main-logo.svgz and b/Identity/Models/Themes/Default/Distro/5/Rhgb/main-logo.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Rhgb/system-logo.svgz b/Identity/Models/Themes/Default/Distro/5/Rhgb/system-logo.svgz
index e99a7aa..69eaf12 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Rhgb/system-logo.svgz and b/Identity/Models/Themes/Default/Distro/5/Rhgb/system-logo.svgz differ
diff --git a/Identity/Models/Themes/Default/Distro/5/Syslinux/branding.conf b/Identity/Models/Themes/Default/Distro/5/Syslinux/branding.conf
index 1919657..96a25c2 100644
--- a/Identity/Models/Themes/Default/Distro/5/Syslinux/branding.conf
+++ b/Identity/Models/Themes/Default/Distro/5/Syslinux/branding.conf
@@ -8,4 +8,5 @@
[types]
-syslinux-splash.svgz = "Types/White/96/=BRAND=-5-msg.png:x96+20+184"
+syslinux-splash.svgz = "Types/Default/ffffff/ffffff-0/48/centos.png:x48+20+232"
+syslinux-splash.svgz = "Types/Numbers/ffffff/ffffff-0/96/5.png:x96+300+184"
diff --git a/Identity/Models/Themes/Default/Distro/5/Syslinux/syslinux-splash.svgz b/Identity/Models/Themes/Default/Distro/5/Syslinux/syslinux-splash.svgz
index f6c8ee5..21a76c8 100644
Binary files a/Identity/Models/Themes/Default/Distro/5/Syslinux/syslinux-splash.svgz and b/Identity/Models/Themes/Default/Distro/5/Syslinux/syslinux-splash.svgz differ
diff --git a/Identity/Models/Themes/Default/Media/branding.conf b/Identity/Models/Themes/Default/Media/branding.conf
index 6cb88c1..38fee1e 100644
--- a/Identity/Models/Themes/Default/Media/branding.conf
+++ b/Identity/Models/Themes/Default/Media/branding.conf
@@ -8,31 +8,31 @@
[types]
-sleeve-installcd-1.svg = "Types/White/24/centos.png:x24+100+588"
-sleeve-installcd-2.svg = "Types/White/24/centos.png:x24+100+588"
-sleeve-installcd-3.svg = "Types/White/24/centos.png:x24+100+588"
-sleeve-installcd-4.svg = "Types/White/24/centos.png:x24+100+588"
-sleeve-installcd-5.svg = "Types/White/24/centos.png:x24+100+588"
-sleeve-installcd-6.svg = "Types/White/24/centos.png:x24+100+588"
-sleeve-installdvd-1.svg = "Types/White/24/centos.png:x24+100+588"
-sleeve-livecd-1.svg = "Types/White/24/centos.png:x24+100+588"
-sleeve-livedvd-1.svg = "Types/White/24/centos.png:x24+100+588"
+sleeve-installcd-1.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+100+588"
+sleeve-installcd-2.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+100+588"
+sleeve-installcd-3.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+100+588"
+sleeve-installcd-4.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+100+588"
+sleeve-installcd-5.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+100+588"
+sleeve-installcd-6.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+100+588"
+sleeve-installdvd-1.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+100+588"
+sleeve-livecd-1.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+100+588"
+sleeve-livedvd-1.svgz = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+100+588"
[symbols]
-label-installcd-1.svg = "Symbols/48/centos.png:x48+272.289+255:x48+737.811+255"
-label-installcd-2.svg = "Symbols/48/centos.png:x48+272.289+255:x48+737.811+255"
-label-installcd-3.svg = "Symbols/48/centos.png:x48+272.289+255:x48+737.811+255"
-label-installdvd-1.svg = "Symbols/48/centos.png:x48+272.289+255:x48+737.811+255"
-label-livecd-1.svg = "Symbols/48/centos.png:x48+272.289+255:x48+737.811+255"
-label-livedvd-1.svg = "Symbols/48/centos.png:x48+272.289+255:x48+737.811+255"
-sleeve-installcd-1.svg = "Symbols/48/centos.png:x48+905+224:x48+100+520"
-sleeve-installcd-2.svg = "Symbols/48/centos.png:x48+905+224:x48+100+520"
-sleeve-installcd-3.svg = "Symbols/48/centos.png:x48+905+224:x48+100+520"
-sleeve-installcd-4.svg = "Symbols/48/centos.png:x48+905+224:x48+100+520"
-sleeve-installcd-5.svg = "Symbols/48/centos.png:x48+905+224:x48+100+520"
-sleeve-installcd-6.svg = "Symbols/48/centos.png:x48+905+224:x48+100+520"
-sleeve-installdvd-1.svg = "Symbols/48/centos.png:x48+905+224:x48+100+520"
-sleeve-installcd-1.svg = "Symbols/48/centos.png:x48+905+224:x48+100+520"
-sleeve-livecd-1.svg = "Symbols/48/centos.png:x48+905+224:x48+100+520"
-sleeve-livedvd-1.svg = "Symbols/48/centos.png:x48+905+224:x48+100+520"
+label-installcd-1.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+272.289+255:x48+737.811+255"
+label-installcd-2.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+272.289+255:x48+737.811+255"
+label-installcd-3.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+272.289+255:x48+737.811+255"
+label-installdvd-1.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+272.289+255:x48+737.811+255"
+label-livecd-1.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+272.289+255:x48+737.811+255"
+label-livedvd-1.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+272.289+255:x48+737.811+255"
+sleeve-installcd-1.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+905+224:x48+100+520"
+sleeve-installcd-2.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+905+224:x48+100+520"
+sleeve-installcd-3.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+905+224:x48+100+520"
+sleeve-installcd-4.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+905+224:x48+100+520"
+sleeve-installcd-5.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+905+224:x48+100+520"
+sleeve-installcd-6.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+905+224:x48+100+520"
+sleeve-installdvd-1.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+905+224:x48+100+520"
+sleeve-installcd-1.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+905+224:x48+100+520"
+sleeve-livecd-1.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+905+224:x48+100+520"
+sleeve-livedvd-1.svgz = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+905+224:x48+100+520"
diff --git a/Identity/Models/Themes/Default/Media/label-installcd-1.svgz b/Identity/Models/Themes/Default/Media/label-installcd-1.svgz
index 5baf446..6d59403 100644
Binary files a/Identity/Models/Themes/Default/Media/label-installcd-1.svgz and b/Identity/Models/Themes/Default/Media/label-installcd-1.svgz differ
diff --git a/Identity/Models/Themes/Default/Media/label-installcd-2.svgz b/Identity/Models/Themes/Default/Media/label-installcd-2.svgz
index 5637437..5f6cb80 100644
Binary files a/Identity/Models/Themes/Default/Media/label-installcd-2.svgz and b/Identity/Models/Themes/Default/Media/label-installcd-2.svgz differ
diff --git a/Identity/Models/Themes/Default/Media/label-installcd-3.svgz b/Identity/Models/Themes/Default/Media/label-installcd-3.svgz
index 54c637b..3cabfdf 100644
Binary files a/Identity/Models/Themes/Default/Media/label-installcd-3.svgz and b/Identity/Models/Themes/Default/Media/label-installcd-3.svgz differ
diff --git a/Identity/Models/Themes/Default/Media/label-installdvd-1.svgz b/Identity/Models/Themes/Default/Media/label-installdvd-1.svgz
index 31bb5d4..d40bcac 100644
Binary files a/Identity/Models/Themes/Default/Media/label-installdvd-1.svgz and b/Identity/Models/Themes/Default/Media/label-installdvd-1.svgz differ
diff --git a/Identity/Models/Themes/Default/Media/label-livecd-1.svgz b/Identity/Models/Themes/Default/Media/label-livecd-1.svgz
index f3c504d..abfa49a 100644
Binary files a/Identity/Models/Themes/Default/Media/label-livecd-1.svgz and b/Identity/Models/Themes/Default/Media/label-livecd-1.svgz differ
diff --git a/Identity/Models/Themes/Default/Media/label-livedvd-1.svgz b/Identity/Models/Themes/Default/Media/label-livedvd-1.svgz
index db263a8..b086d2c 100644
Binary files a/Identity/Models/Themes/Default/Media/label-livedvd-1.svgz and b/Identity/Models/Themes/Default/Media/label-livedvd-1.svgz differ
diff --git a/Identity/Models/Themes/Default/Media/sleeve-installcd-1.svgz b/Identity/Models/Themes/Default/Media/sleeve-installcd-1.svgz
index c44445b..9198070 100644
Binary files a/Identity/Models/Themes/Default/Media/sleeve-installcd-1.svgz and b/Identity/Models/Themes/Default/Media/sleeve-installcd-1.svgz differ
diff --git a/Identity/Models/Themes/Default/Media/sleeve-installcd-2.svgz b/Identity/Models/Themes/Default/Media/sleeve-installcd-2.svgz
index 3ba4647..babcf89 100644
Binary files a/Identity/Models/Themes/Default/Media/sleeve-installcd-2.svgz and b/Identity/Models/Themes/Default/Media/sleeve-installcd-2.svgz differ
diff --git a/Identity/Models/Themes/Default/Media/sleeve-installcd-3.svgz b/Identity/Models/Themes/Default/Media/sleeve-installcd-3.svgz
index e301bc0..dcf723b 100644
Binary files a/Identity/Models/Themes/Default/Media/sleeve-installcd-3.svgz and b/Identity/Models/Themes/Default/Media/sleeve-installcd-3.svgz differ
diff --git a/Identity/Models/Themes/Default/Media/sleeve-installcd-4.svgz b/Identity/Models/Themes/Default/Media/sleeve-installcd-4.svgz
index 4ad53b1..f253b84 100644
Binary files a/Identity/Models/Themes/Default/Media/sleeve-installcd-4.svgz and b/Identity/Models/Themes/Default/Media/sleeve-installcd-4.svgz differ
diff --git a/Identity/Models/Themes/Default/Media/sleeve-installcd-5.svgz b/Identity/Models/Themes/Default/Media/sleeve-installcd-5.svgz
index 1875916..0704d9d 100644
Binary files a/Identity/Models/Themes/Default/Media/sleeve-installcd-5.svgz and b/Identity/Models/Themes/Default/Media/sleeve-installcd-5.svgz differ
diff --git a/Identity/Models/Themes/Default/Media/sleeve-installcd-6.svgz b/Identity/Models/Themes/Default/Media/sleeve-installcd-6.svgz
index c3d6b07..3e77916 100644
Binary files a/Identity/Models/Themes/Default/Media/sleeve-installcd-6.svgz and b/Identity/Models/Themes/Default/Media/sleeve-installcd-6.svgz differ
diff --git a/Identity/Models/Themes/Default/Media/sleeve-installdvd-1.svgz b/Identity/Models/Themes/Default/Media/sleeve-installdvd-1.svgz
index 8600cd6..7951ff5 100644
Binary files a/Identity/Models/Themes/Default/Media/sleeve-installdvd-1.svgz and b/Identity/Models/Themes/Default/Media/sleeve-installdvd-1.svgz differ
diff --git a/Identity/Models/Themes/Default/Media/sleeve-livecd-1.svgz b/Identity/Models/Themes/Default/Media/sleeve-livecd-1.svgz
index fdede14..72e4615 100644
Binary files a/Identity/Models/Themes/Default/Media/sleeve-livecd-1.svgz and b/Identity/Models/Themes/Default/Media/sleeve-livecd-1.svgz differ
diff --git a/Identity/Models/Themes/Default/Media/sleeve-livedvd-1.svgz b/Identity/Models/Themes/Default/Media/sleeve-livedvd-1.svgz
index b2ef07a..f5d19b7 100644
Binary files a/Identity/Models/Themes/Default/Media/sleeve-livedvd-1.svgz and b/Identity/Models/Themes/Default/Media/sleeve-livedvd-1.svgz differ
diff --git a/Identity/Models/Themes/Default/Posters/744x1052.svgz b/Identity/Models/Themes/Default/Posters/744x1052.svgz
index a540d01..88a96bd 100644
Binary files a/Identity/Models/Themes/Default/Posters/744x1052.svgz and b/Identity/Models/Themes/Default/Posters/744x1052.svgz differ
diff --git a/Identity/Models/Themes/Default/Posters/branding.conf b/Identity/Models/Themes/Default/Posters/branding.conf
index 5c58031..b56d322 100644
--- a/Identity/Models/Themes/Default/Posters/branding.conf
+++ b/Identity/Models/Themes/Default/Posters/branding.conf
@@ -6,6 +6,10 @@
# $Id: branding.conf 4948 2011-11-13 14:06:56Z al $
# -----------------------------------------------------------------------
-[logos]
+[types]
+744x1052.svgz = "Types/Default/ffffff/ffffff-0/96/centos.png:x96+127+600"
+744x1052.svgz = "Types/Default/ffffff/ffffff-0/96/message.png:x96+127+716"
+744x1052.svgz = "Types/Default/ffffff/ffffff-0/96/url.png:x96+127+832"
-744x1052.svg = "Logos/White/72/centos.png:x72+20+973"
+[symbols]
+744x1052.svgz = "Symbols/Default/ffffff/ffffff-0/512/centos.png:x512+116+50"
diff --git a/Scripts/Bash/Functions/Commons/cli_getConfigValue.sh b/Scripts/Bash/Functions/Commons/cli_getConfigValue.sh
index 7d494ee..08065ae 100755
--- a/Scripts/Bash/Functions/Commons/cli_getConfigValue.sh
+++ b/Scripts/Bash/Functions/Commons/cli_getConfigValue.sh
@@ -44,7 +44,7 @@ function cli_getConfigValue {
# Parse configuration lines to retrieve the values of variable
# names.
local CONFIG_VALUE=$(echo $CONFIG_LINES \
- | gawk 'BEGIN{FS="="}; { print $2 }' \
+ | cut -d= -f2- \
| sed -r -e 's/"//g' -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' )
# Output values related to variable name.
diff --git a/Scripts/Bash/Functions/Commons/cli_getPathComponent.sh b/Scripts/Bash/Functions/Commons/cli_getPathComponent.sh
index 4c21378..cb262dd 100755
--- a/Scripts/Bash/Functions/Commons/cli_getPathComponent.sh
+++ b/Scripts/Bash/Functions/Commons/cli_getPathComponent.sh
@@ -32,7 +32,7 @@ function cli_getPathComponent {
local ARGSS=''
# Define long options.
- local ARGSL='release,release-major,release-minor,release-pattern,architecture,architecture-pattern,motif,motif-name,motif-release,motif-pattern'
+ local ARGSL='release,release-major,release-minor,release-pattern,architecture,architecture-pattern,motif,motif-name,motif-release,motif-pattern,repo-dir'
# Define release pattern.
local RELEASE="(([[:digit:]]+)(\.([[:digit:]]+))?)"
@@ -127,6 +127,12 @@ function cli_getPathComponent {
break
;;
+ --repo-dir )
+ echo "${LOCATION}" | sed "s,${TCAR_WORKDIR}/,,"
+ shift 1
+ break
+ ;;
+
esac
done
diff --git a/Scripts/Bash/Functions/Locale/locale_updateMessageXmlDocbookWithEntities.sh b/Scripts/Bash/Functions/Locale/locale_updateMessageXmlDocbookWithEntities.sh
index e5f6cf1..352e5b9 100755
--- a/Scripts/Bash/Functions/Locale/locale_updateMessageXmlDocbookWithEntities.sh
+++ b/Scripts/Bash/Functions/Locale/locale_updateMessageXmlDocbookWithEntities.sh
@@ -43,8 +43,8 @@ function locale_updateMessageXmlDocbookWithEntities {
cp ${TEMPLATE} ${INSTANCE}
# Expand common contents inside instance.
- cli_exportFunctions "Render/Docbook/docbook_expandLicenses"
- docbook_expandLicenses ${INSTANCE}
+ cli_exportFunctions "Render/Docbook/docbook_setExpansionLicenses"
+ docbook_setExpansionLicenses ${INSTANCE}
# When translated instances are rendered, system entities (e.g.,
# `%entity-name;') don't appear in the translated instance (it
@@ -53,8 +53,8 @@ function locale_updateMessageXmlDocbookWithEntities {
# successfully and automate the whole creation of system entities,
# don't let this duty ion users'. Instead, make centos-art.sh
# script responsible of it.
- cli_exportFunctions "Render/Docbook/docbook_expandSystemEntities"
- docbook_expandSystemEntities ${INSTANCE}
+ cli_exportFunctions "Render/Docbook/docbook_setExpansionSystemEntities"
+ docbook_setExpansionSystemEntities ${INSTANCE}
# Create portable object template from instance. Validate
# translated instance before processing it. This step is very
diff --git a/Scripts/Bash/Functions/Prepare/prepare.sh b/Scripts/Bash/Functions/Prepare/prepare.sh
index b185750..f9d8fc2 100755
--- a/Scripts/Bash/Functions/Prepare/prepare.sh
+++ b/Scripts/Bash/Functions/Prepare/prepare.sh
@@ -37,6 +37,11 @@ function prepare {
# Interpret arguments and options passed through command-line.
prepare_getOptions
+ # Redefine positional parameters using ARGUMENTS. At this point,
+ # option arguments have been removed from ARGUMENTS variable and
+ # only non-option arguments remain in it.
+ eval set -- "$ARGUMENTS"
+
# Execute action names based on whether they were provided or not.
if [[ $ACTIONNAMS == '' ]];then
@@ -54,7 +59,7 @@ function prepare {
# When action names are provided, loop through them and
# execute them one by one.
for ACTIONNAM in $ACTIONNAMS;do
- ${ACTIONNAM}
+ ${ACTIONNAM} $@
done
fi
diff --git a/Scripts/Bash/Functions/Prepare/prepare_getOptions.sh b/Scripts/Bash/Functions/Prepare/prepare_getOptions.sh
index e6f67b0..7fc5c50 100755
--- a/Scripts/Bash/Functions/Prepare/prepare_getOptions.sh
+++ b/Scripts/Bash/Functions/Prepare/prepare_getOptions.sh
@@ -31,7 +31,7 @@ function prepare_getOptions {
local ARGSS="h,q"
# Define long options we want to support.
- local ARGSL="help,quiet,answer-yes,packages,locales,links,images,manuals,set-environment,see-environment,synchronize"
+ local ARGSL="help,quiet,answer-yes,packages,locales,links,images,manuals,directories,set-environment,see-environment,synchronize"
# Redefine ARGUMENTS using getopt(1) command parser.
cli_parseArguments
@@ -95,14 +95,34 @@ function prepare_getOptions {
shift 1
;;
+ --directories )
+ ACTIONNAMS="${ACTIONNAMS} prepare_updateDirectoryStructure"
+ shift 1
+ ;;
+
--synchronize )
FLAG_SYNCHRONIZE="true"
shift 1
;;
- * )
+ -- )
+ # Remove the `--' argument from the list of arguments
+ # in order for processing non-option arguments
+ # correctly. At this point all option arguments have
+ # been processed already but the `--' argument still
+ # remains to mark ending of option arguments and
+ # beginning of non-option arguments. The `--' argument
+ # needs to be removed here in order to avoid
+ # centos-art.sh script to process it as a path inside
+ # the repository, which obviously is not.
+ shift 1
break
+ ;;
+
esac
done
+ # Redefine ARGUMENTS variable using current positional parameters.
+ cli_parseArgumentsReDef "$@"
+
}
diff --git a/Scripts/Bash/Functions/Render/Conf/conf.sh b/Scripts/Bash/Functions/Render/Conf/conf.sh
index 1400101..269e016 100755
--- a/Scripts/Bash/Functions/Render/Conf/conf.sh
+++ b/Scripts/Bash/Functions/Render/Conf/conf.sh
@@ -29,14 +29,9 @@ function conf {
local MODEL=''
local -a MODELS
local FORMAT=''
- local FORMATS=''
local HEIGHT=''
- local HEIGHTS=''
local FGCOLOR=''
- local FGCOLORS=''
local BGCOLOR=''
- local BGCOLORS=''
- local COMMAND=''
# Define list with all section names. These are the final file
# names we want to produce images for.
@@ -55,17 +50,26 @@ function conf {
# Retrieve formats you want to produce the image for. This
# variable contains one or more image format supported by
# ImageMagick. For example, `xpm', `jpg', 'tiff', etc.
- FORMATS=$(cli_getConfigValue "$TEMPLATE" "$FILENAME" "formats")
+ local FORMATS=$(cli_getConfigValue "$TEMPLATE" "$FILENAME" "formats")
+ if [[ -z ${FORMATS} ]];then
+ FORMATS="xpm pdf jpg tif"
+ fi
# Retrieve heights you want to produce the image for. This
# variable contains one or more numerical values. For example,
# `16', `24', `32', etc.
- HEIGHTS=$(cli_getConfigValue "$TEMPLATE" "$FILENAME" "heights")
+ local HEIGHTS=$(cli_getConfigValue "$TEMPLATE" "$FILENAME" "heights")
+ if [[ -z ${HEIGHTS} ]];then
+ HEIGHTS="16 20 22 24 32 36 38 40 48 64 72 78 96 112 124 128 148 164 196 200 512"
+ fi
# Retrieve foreground colors you want to produce the image
# for. This variable contains one or more color number in
# hexadecimal format. For example, `000000', `ffffff', etc.
- FGCOLORS=$(cli_getConfigValue "$TEMPLATE" "$FILENAME" "fgcolors")
+ local FGCOLORS=$(cli_getConfigValue "$TEMPLATE" "$FILENAME" "fgcolors")
+ if [[ -z ${FGCOLORS} ]];then
+ FGCOLORS="000000"
+ fi
# Retrieve background colors you want to produce the image
# for. This variable contains one or more color number in
@@ -73,11 +77,17 @@ function conf {
# Opacity is specified between 0.0 and 1.0 where 0.0 is full
# transparency and 1.0 full opacity. For example, the
# following values are accepted: `000000-0', `ffffff-1', etc.
- BGCOLORS=$(cli_getConfigValue "$TEMPLATE" "$FILENAME" "bgcolors")
+ local BGCOLORS=$(cli_getConfigValue "$TEMPLATE" "$FILENAME" "bgcolors")
+ if [[ -z ${BGCOLORS} ]];then
+ BGCOLORS="000000-0"
+ fi
# Retrieve command-line you want execute to produce the image.
# For example, `/usr/bin/convert +append'
- COMMAND=$(cli_getConfigValue "$TEMPLATE" "$FILENAME" "command")
+ local COMMAND=$(cli_getConfigValue "$TEMPLATE" "$FILENAME" "command")
+ if [[ -z ${COMMAND} ]];then
+ COMMAND=/bin/cp
+ fi
for FGCOLOR in $FGCOLORS;do
@@ -95,7 +105,7 @@ function conf {
cli_checkFiles ${HEIGHT} --match="^[[:digit:]]+$"
# Do base rendition actions.
- conf_doBaseActions
+ conf_setBaseRendition
done
done
diff --git a/Scripts/Bash/Functions/Render/Conf/conf_doBaseActions.sh b/Scripts/Bash/Functions/Render/Conf/conf_doBaseActions.sh
deleted file mode 100755
index e838540..0000000
--- a/Scripts/Bash/Functions/Render/Conf/conf_doBaseActions.sh
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/bash
-#
-# conf_doBaseActions.sh -- This function standardizes base actions
-# related to image production through configuration files.
-#
-# Copyright (C) 2009-2013 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function conf_doBaseActions {
-
- local COUNTER=0
- local EXPORTID="CENTOSARTWORK"
- local -a MODEL_INSTANCES
- local -a IMAGE_COMMANDS
-
- # Define absolute path to output location. This is the location
- # inside the working copy all images will be stored in.
- local OUTPUT=${OUTPUT}/${FGCOLOR}/${BGCOLOR}/${HEIGHT}/${FILENAME}
-
- # Define which command will be used to output the template
- # content. This is required because template files might be found
- # as compressed files inside the repository.
- local VIEWER="/bin/cat"
-
- while [[ $COUNTER -lt ${#MODELS[*]} ]];do
-
- # Verify existence and extension of design models.
- cli_checkFiles ${MODELS[$COUNTER]} -f --match='\.(svgz|svg)$'
-
- # Define file name for design model instances.
- MODEL_INSTANCES[$COUNTER]=${TMPDIR}/$(basename ${MODELS[$COUNTER]})
-
- # Define file name for image instances.
- IMAGE_INSTANCES[$COUNTER]=${TMPDIR}/$(basename ${MODELS[$COUNTER]} \
- | sed -r 's/\.(svgz|svg)$/.png/')
-
- # Redefine command used to read design models.
- if [[ $(file -b -i ${MODELS[$COUNTER]}) =~ '^application/x-gzip$' ]];then
- VIEWER="/bin/zcat"
- fi
-
- # Create uncompressed design model instances in order to make
- # color replacements without affecting original design models.
- $VIEWER ${MODELS[$COUNTER]} > ${MODEL_INSTANCES[$COUNTER]}
-
- # Make your best to be sure the design model instance you are
- # processing is a valid scalable vector graphic.
- cli_checkFiles ${MODEL_INSTANCES[$COUNTER]} --mime="text/xml"
-
- # Make color replacements to each design model instance before
- # render them using Inkscape.
- if [[ ${FGCOLOR} != '000000' ]];then
- sed -i -r "s/((fill|stroke):#)000000/\1${FGCOLOR}/g" ${MODEL_INSTANCES[$COUNTER]}
- fi
-
- # Create list of Inkscape commands based for each design model
- # set in the configuration file.
- IMAGE_COMMANDS[${COUNTER}]="${MODEL_INSTANCES[$COUNTER]} \
- --export-id=${EXPORTID} \
- --export-png=${IMAGE_INSTANCES[$COUNTER]} \
- --export-background=$(echo ${BGCOLOR} | cut -d'-' -f1) \
- --export-background-opacity=$(echo ${BGCOLOR} | cut -d'-' -f2) \
- --export-height=${HEIGHT}"
-
- # Create PNG image based on design models.
- inkscape ${IMAGE_COMMANDS[$COUNTER]} > /dev/null
-
- COUNTER=$(( $COUNTER + 1 ))
-
- done
-
- # Verify existence of output directory.
- if [[ ! -d $(dirname ${OUTPUT}) ]];then
- mkdir -p $(dirname ${OUTPUT})
- fi
-
- # Apply command to PNG images produced from design models to
- # construct the final PNG image.
- cli_printMessage "${OUTPUT}" --as-creating-line
- ${COMMAND} ${IMAGE_INSTANCES[*]} ${OUTPUT}
-
- # Create path for different image formats creation using PNG image
- # extension as reference.
- TARGET=$(echo ${OUTPUT} | sed -r "s/\.png$//")
-
- # Convert images from PNG to those formats specified in the
- # configuration file.
- for FORMAT in ${FORMATS};do
- cli_printMessage "${TARGET}.${FORMAT}" --as-creating-line
- convert ${OUTPUT} ${TARGET}.${FORMAT}
- done
-
-}
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook.sh b/Scripts/Bash/Functions/Render/Docbook/docbook.sh
index 293dda1..0cb4d7f 100755
--- a/Scripts/Bash/Functions/Render/Docbook/docbook.sh
+++ b/Scripts/Bash/Functions/Render/Docbook/docbook.sh
@@ -41,7 +41,7 @@ function docbook {
cp ${TEMPLATE} ${INSTANCE}
# Expand common contents inside instance.
- docbook_expandLicenses ${INSTANCE}
+ docbook_setExpansionLicenses ${INSTANCE}
# When translated instances are rendered, system entities (e.g.,
# `%entity-name;') don't appear in the translated instance (it
@@ -50,7 +50,7 @@ function docbook {
# successfully and automate the whole creation of system entities,
# don't let this duty ion users'. Instead, make centos-art.sh
# script responsible of it.
- docbook_expandSystemEntities ${INSTANCE}
+ docbook_setExpansionSystemEntities ${INSTANCE}
# Print validating action.
cli_printMessage "${INSTANCE}" --as-validating-line
@@ -77,20 +77,20 @@ function docbook {
# design model instance in order to produce the translated design
# model instance.
if [[ -f ${TRANSLATION} ]];then
- docbook_doTranslation ${INSTANCE}
+ docbook_setTranslation ${INSTANCE}
fi
# Convert DocBook source files to other formats.
- docbook_convertToXhtmlChunk ${INSTANCE}
- docbook_convertToXhtml ${INSTANCE}
- docbook_convertToText
+ docbook_setConversionXhtmlChunks ${INSTANCE}
+ docbook_setConversionXhtml ${INSTANCE}
+ docbook_setConversionText
# NOTE: The current transformation from DocBook to PDF fails when
# we started to use DocBook <index /> tags inside DocBook files.
# Probably we need to test what happen when a newer release of XSL
# is used. Thus, comment production of PDF files until it can be
# produced correctly.
- #docbook_convertToPdfFromXml
+ #docbook_setConversionXml2Pdf
# NOTE: From version 5.0 on, DocBook specification is no longer a
# SGML specification but an XML specification only. Thus,
@@ -98,9 +98,9 @@ function docbook {
# supported in `centos-art.sh' script.
# Perform format post-rendition.
- docbook_doPostActions
+ docbook_setPostRendition
# Perform format last-rendition.
- docbook_doLastActions
+ docbook_setLastRendition
}
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_convertToPdfFromXml.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_convertToPdfFromXml.sh
deleted file mode 100755
index 0b2c886..0000000
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_convertToPdfFromXml.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-#
-# docbook_convertToPdfFromXml.sh -- This function transforms DocBook
-# files which have set the XML DTD in them. To produce PDF from
-# DocBook XML DTD, we need an XSLT engine (e.g., through `xsltproc'
-# command) to produce formatting objects (FO), which then must be
-# processed with an FO engine (e.g., through `pdfxmltex' command,
-# which uses PassiveTex) to produce the PDF output.
-#
-# In this configuration and using default configuration settings, I've
-# presented the following problems:
-#
-# 1. Something is wrong with headings. They are not expanded along the
-# whole page-body. They seem to be rendered in a reduced width (1 inch
-# approximately). This provokes the heading to be broken in a
-# two-to-five letters column and sometimes it overlaps the sectioning
-# titles (e.g., chapter, section). I tried to customize the value of
-# `header.column.widths' and `page.margin.top' but it seems to be not
-# there where I need to touch.
-#
-# 2. TOC's indentation is not rendered. Even the `toc.indent.width'
-# property is set to 24 by default.
-#
-# 3. Inside lists, when items are more than one line, the indentation
-# seems to work for the first line only. All other lines in the same
-# item are not indented and begin completely unaligned.
-#
-# 4. Long file paths near the end of page-body aren't hyphenated.
-# Even the `hyphenate' property is set to `true' by default.
-#
-# In this configuration and using default configuration settings, I've
-# presented the following advantages:
-#
-# 1. It is possible to produce localized PDF outputs through
-# `xml2po', the default way of producing localized content inside
-# the `centos-art.sh' script.
-#
-# To make the whole process transparent, a temporal directory is
-# created for intermediate works and final files are moved then to
-# their final location.
-#
-# Copyright (C) 2009-2013 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function docbook_convertToPdfFromXml {
-
- # Print action message.
- cli_printMessage "${FILE}.pdf" --as-creating-line
-
- local -a STYLE_TEMPLATE
- local -a STYLE_INSTANCE
- local STYLE_INSTANCE_FINAL=''
-
- # Define absolute path to DocBook source file. This is the
- # repository documentation manual file where DOCTYPE and ENTITY
- # definition lines are set.
- local SRC=${INSTANCE}
-
- # Define absolute path to PDF target file. This is the final
- # location the PDF file produced as result of DocBook to PDF
- # transformation will be stored in.
- local DST="${FILE}.pdf"
-
- # Define file name of formatting object (.fo) file. This file is
- # an intermediate file needed to produced the PDF.
- local FO=$(echo ${INSTANCE} | sed -r 's/docbook$/fo/g')
-
- # Define file name of PDF file. This is the file we were looking
- # for and the one moved, once produced.
- local PDF=$(echo ${INSTANCE} | sed -r 's/docbook$/pdf/g')
-
- # Prepare XSL final instances used in transformations.
- docbook_prepareStyles "${DOCBOOK_XSL}/docbook2fo.xsl"
-
- # Create link to `Images' directory. This is the directory where
- # images used by documentation are stored in. Be sure to remove
- # previous links first to prevent a recursive creation of links.
- ln -sf ${TCAR_WORKDIR}/Identity/Images/Webenv $(dirname ${INSTANCE})/Images
-
- # Create formatting object suppressing output from stderr.
- xsltproc --output ${FO} ${STYLE_INSTANCE_FINAL} ${SRC} 2> /dev/null
-
- # Create PDF format from formatting object. Because we are using
- # relative path to access `Images', it is necessary to move the
- # directory stack into the temporal directory where instance files
- # are created. Otherwise, the location used to load images will
- # fail.
- if [[ $? -eq 0 ]];then
- pushd $(dirname ${INSTANCE}) > /dev/null
- xmlto -o $(dirname ${FILE}) pdf ${FO}
- popd > /dev/null
- else
- cli_printMessage "`gettext "Cannot produce the PDF file."`" --as-error-line
- fi
-
-}
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_convertToText.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_convertToText.sh
deleted file mode 100755
index a1d7d45..0000000
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_convertToText.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-#
-# svg_convertToText.sh -- This function takes the XHTML file produced
-# by docbook_convertToXhtml and produces one plain-text file (i.e.,
-# without markup inside).
-#
-# Copyright (C) 2009-2013 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function docbook_convertToText {
-
- # Verify existence of HTML file. If `.xhtml' file doesn't exist
- # don't create text file. The `.xhtml' file is required in order
- # to create the `.txt' file.
- if [[ ! -f ${FILE}.xhtml ]];then
- return
- fi
-
- local COMMAND=''
- local OPTIONS=''
-
- # Define the command path to text-based web browser and options
- # used to produce plain-text files. Most of these programs have a
- # dump option that print formatted plain-text versions of given
- # HTML file to stdout.
- if [[ -x '/usr/bin/lynx' ]];then
- COMMAND='/usr/bin/lynx'
- OPTIONS='-force_html -nolist -width 70 -dump'
- elif [[ -x '/usr/bin/elinks' ]];then
- COMMAND='/usr/bin/elinks'
- OPTIONS='-force_html -no-numbering -no-references -width 70 -dump'
- elif [[ -x '/usr/bin/w3m' ]];then
- COMMAND='/usr/bin/w3m'
- OPTIONS='-dump'
- fi
-
- if [[ $COMMAND != '' ]];then
-
- # Print action message.
- if [[ -f ${FILE}.txt ]];then
- cli_printMessage "${FILE}.txt" --as-updating-line
- else
- cli_printMessage "${FILE}.txt" --as-creating-line
- fi
-
- # Convert from HTML to plain-text without markup.
- ${COMMAND} ${OPTIONS} ${FILE}.xhtml > ${FILE}.txt
-
- else
- cli_printMessage "`gettext "No way to convert from XHTML to plain-text found."`" --as-error-line
- fi
-
-}
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_convertToXhtml.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_convertToXhtml.sh
deleted file mode 100755
index d750d8e..0000000
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_convertToXhtml.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-#
-# docbook_convertToXhtml.sh -- This function uses DocBook XML as input
-# and applies XSL stylesheets to produce a big XHTML files as output.
-# The procedure was taken from the documentation of
-# `docbook-style-xsl-1.69.1-5.1' package, which says: ---To publish
-# HTML from your XML documents, you just need an XSL engine.---.
-#
-# Copyright (C) 2009-2013 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function docbook_convertToXhtml {
-
- local -a STYLE_TEMPLATE
- local -a STYLE_INSTANCE
- local STYLE_INSTANCE_FINAL=''
-
- # Print action message.
- if [[ -f ${FILE}.xhtml ]];then
- cli_printMessage "${FILE}.xhtml" --as-updating-line
- else
- cli_printMessage "${FILE}.xhtml" --as-creating-line
- fi
-
- # Define absolute path to DocBook source file. This is the
- # repository documentation manual file where DOCTYPE and ENTITY
- # definition lines are set.
- local SRC=${1}
-
- # Define absolute path to PDF target file. This is the final
- # location the PDF file produced as result of DocBook to PDF
- # transformation will be stored in.
- local DST="${FILE}.xhtml"
-
- # Prepare XSL final instances used in transformations.
- docbook_prepareStyles $(cli_getFilesList \
- ${DOCBOOK_XSL} --pattern='^.*/docbook2xhtml-(single|common)\.xsl$')
-
- # Transform DocBook XML to XHTML supressing all stderr output.
- xsltproc --output ${DST} ${STYLE_INSTANCE_FINAL} ${SRC} &> /dev/null
-
- # Remove previous links first to prevent a recursive creation of
- # links.
- if [[ -a $(dirname ${DST})/Css ]];then
- rm $(dirname ${DST})/Css
- fi
- if [[ -a $(dirname ${DST})/Images ]];then
- rm $(dirname ${DST})/Images
- fi
-
- # Create `css' and `images' directories. In order to save disk
- # space, these directories are linked (symbolically) to their
- # respective locations inside the working copy.
- ln -fs ${TCAR_WORKDIR}/Identity/Webenv/Themes/Default/Docbook/1.69.1/Css $(dirname $DST)/Css
- ln -fs ${TCAR_WORKDIR}/Identity/Images/Webenv $(dirname $DST)/Images
-
- # Remove XSL instance files.
- rm ${STYLE_INSTANCE[*]}
-
-}
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_convertToXhtmlChunk.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_convertToXhtmlChunk.sh
deleted file mode 100755
index 43933c9..0000000
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_convertToXhtmlChunk.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-#
-# docbook_convertToXhtmlChunk.sh -- This function uses DocBook XML as
-# input and applies XSL stylesheets to produce a directory with many
-# XHTML files as output. The procedure was taken from the
-# documentation of `docbook-style-xsl-1.69.1-5.1' package, which says:
-# ---To publish HTML from your XML documents, you just need an XSLT
-# engine.---.
-#
-# Copyright (C) 2009-2013 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function docbook_convertToXhtmlChunk {
-
- local -a STYLE_TEMPLATE
- local -a STYLE_INSTANCE
- local STYLE_INSTANCE_FINAL=''
-
- # Define absolute path to DocBook source file. This is the
- # repository documentation manual file where DOCTYPE and ENTITY
- # definition lines are set.
- local SRC=${1}
-
- # Define absolute path to PDF target file. This is the final
- # location the PDF file produced as result of DocBook to PDF
- # transformation will be stored in.
- local DST="${FILE}-xhtml/"
-
- # Clean up output directory. This is required in order to prevent
- # old files from remaining therein when they are no longer needed.
- if [[ -d ${DST} ]];then
- rm -r "${DST}"
- fi
- mkdir ${DST}
-
- # Print action message.
- cli_printMessage "${FILE}-xhtml" --as-creating-line
-
- # Prepare XSL final instances used in transformations.
- docbook_prepareStyles $(cli_getFilesList \
- ${DOCBOOK_XSL} --pattern='^.*/docbook2xhtml-(chunks|common)\.xsl$')
-
- # Transform DocBook XML to XHTML supressing all stderr output.
- xsltproc --output ${DST} ${STYLE_INSTANCE_FINAL} ${SRC} &> /dev/null
-
- # Create `css' and `images' directories. In order to save disk
- # space, these directories are linked (symbolically) to their
- # respective locations inside the working copy. Be sure to remove
- # previous links first to prevent a recursive creation of links.
- ln -sf ${TCAR_WORKDIR}/Identity/Webenv/Themes/Default/Docbook/1.69.1/Css ${DST}/Css
- ln -sf ${TCAR_WORKDIR}/Identity/Images/Webenv ${DST}/Images
-
- # Remove XSL instance files.
- rm ${STYLE_INSTANCE[*]}
-
-}
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_doLastActions.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_doLastActions.sh
deleted file mode 100755
index 3a33cfd..0000000
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_doLastActions.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-#
-# docbook_doLastActions.sh -- This function performs last-rendition
-# actions for DocBook files. These are the actions that take
-# base-rendition and post-rendition output as input to produce output
-# from it.
-#
-# Copyright (C) 2009-2013 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function docbook_doLastActions {
-
- # Presently, there is no last-rendition action for DocBook base
- # rendition but the function should exist for consistency with
- # other formats.
- return
-
-}
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_doPostActions.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_doPostActions.sh
deleted file mode 100755
index b78f8db..0000000
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_doPostActions.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-#
-# docbook_doPostActions.sh -- This function performs post-rendition
-# actions for DocBook files. These are the actions that take
-# base-rendition output as input to producing output from it.
-#
-# Copyright (C) 2009-2013 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function docbook_doPostActions {
-
- # Presently, there is no post-rendition action for DocBook base
- # rendition but the function should exist for consistency with
- # other formats.
- return
-
-}
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_doTranslation.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_doTranslation.sh
deleted file mode 100755
index ee53baa..0000000
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_doTranslation.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-#
-# docbook_doTranslation.sh -- This function standardizes the way
-# translation files are applied to DocBook design models in order to
-# produce the translated instance that is used to expand translation
-# markers and produce different output formats.
-#
-# Assuming no translation file exists, an untranslated instance is
-# taken from the design model and created (i.e., just a copy) from it.
-# Using a design model instance (translated or not) is required in
-# order to expand translation markers safely.
-#
-# Copyright (C) 2009-2013 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function docbook_doTranslation {
-
- # Print final location of translation file.
- cli_printMessage "${TRANSLATION}" --as-translation-line
-
- # Create translation instance to combine both template translation
- # and licenses translations.
- local TRANSLATION_INSTANCE=${TMPDIR}/messages.po
-
- # Define path to DocBook locales using models as reference.
- local DOCBOOK_LOCALES=$(cli_getLocalizationDir "$DOCBOOK_MODELS")
-
- # Define list of all locale files you want to combine. This
- # include the localization files related to all different kind of
- # licenses you want to use in the main documentation file and the
- # localization file of the main documentation file, as well.
- local DOCBOOK_PO_FILES="${TCAR_WORKDIR}/Locales/Documentation/Models/Docbook/Default/Licenses/Gfdl/${CLI_LANG_LC}/messages.po \
- ${TCAR_WORKDIR}/Locales/Documentation/Models/Docbook/Default/Licenses/Gpl/${CLI_LANG_LC}/messages.po \
- ${TRANSLATION}"
-
- # Be sure the files we want to combine do exist.
- cli_checkFiles -e ${DOCBOOK_PO_FILES}
-
- # Combine license translations with template translation in order
- # to reuse licenses translations in template files without
- # including them in template portable objects. In the case of
- # DocBook templates, translations related to licenses are required
- # because license content is expanded at execution time inside the
- # DocBook instance used by XSL processor during transformation.
- msgcat --output=${TRANSLATION_INSTANCE} \
- --width=70 --no-location --use-first ${DOCBOOK_PO_FILES}
-
- # At this point the translation instance with both licenses and
- # manual translations have been saved. Now it is required to
- # expand entities so it could be possible to create a translated
- # instance with all the content inside.
-
- # Print action message.
- cli_printMessage "${INSTANCE}" --as-translating-line
-
- # Create the translated instance of design model instance with all
- # entities and translation markers expanded.
- xml2po -a -l ${CLI_LANG_LL} \
- -p ${TRANSLATION_INSTANCE} \
- -o ${INSTANCE}-${CLI_LANG_LL}.tmp ${INSTANCE}
-
- # Rename final instance so it can be treated as just instance.
- mv ${INSTANCE}-${CLI_LANG_LL}.tmp ${INSTANCE}
-
- # Remove .xml2po.mo temporal file.
- if [[ -f ${PWD}/.xml2po.mo ]];then
- rm ${PWD}/.xml2po.mo
- fi
-
- # Verify instance existence.
- cli_checkFiles -e $INSTANCE
-
-}
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_expandLicenses.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_expandLicenses.sh
deleted file mode 100755
index e7192c6..0000000
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_expandLicenses.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-#
-# docbook_expandLicenses.sh -- This function modifies the final
-# DocBook instance to add license information. We are doing this way
-# because using XInclude doesn't work and we want to reuse license
-# information in all documents. So, if we cannot link the files, we
-# modify the final instance and append the license information to it.
-# Later, to reuse translation messages, the locale functionality takes
-# care of merging po files related to licenses into documentation po
-# file so changes made to licenses translations will also be available
-# to documentation manuals in different languages.
-#
-# Copyright (C) 2009-2013 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function docbook_expandLicenses {
-
- local INSTANCE=$1
-
- # Define absolute path to DocBook models.
- local DOCBOOK_MODELS="${TCAR_WORKDIR}/Documentation/Models/Docbook"
-
- # Define list of files holding licenses you want to include. Note
- # even this files are not inside the documentation structure
- # itself, they are connected with it. The files holding license
- # information does contain id information used inside the
- # documentation structure at cross references.
- local LICENSES="${DOCBOOK_MODELS}/Default/Licenses/Gpl/gpl.docbook \
- ${DOCBOOK_MODELS}/Default/Licenses/Gfdl/gfdl.docbook"
-
- # Define top level structure in the instance. This is the tag
- # defined in the second field of DOCTYPE definition.
- local DOCTYPE=$(egrep '^<!DOCTYPE ' $INSTANCE | egrep '^<!DOCTYPE' \
- | gawk '{ print $2 }')
-
- # Define temporal file to store license block.
- local BLOCK=$(cli_getTemporalFile "licenses.docbook")
-
- # Build license block into memory.
- BLOCK="<!-- Licenses -->\n"
- BLOCK="${BLOCK}\n<part id=\"licenses\">\n"
- BLOCK="${BLOCK}\n<title>`gettext "Licenses"`</title>\n"
- BLOCK="${BLOCK}\n$(cat ${LICENSES} | sed -r '/<\?xml/,/]>/d')\n"
- BLOCK="${BLOCK}\n</part>\n"
- BLOCK="${BLOCK}\n<!-- Back matter -->\n"
-
- # Expand the licenses section. Remove everything in-between
- # Licenses and Back matter comment. Recreate the comments to
- # support further actualizations and concatenate license
- # information without their document type definitions preamble.
- # This is required in order to prevent validation errors and reuse
- # (through locale functionality) the translation messages already
- # available for these license files. Finally, close any open tag.
- sed -r -i -e "/<!-- Licenses -->/,/<!-- Back matter -->/c$(echo ${BLOCK})" $INSTANCE
-
-}
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_expandSystemEntities.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_expandSystemEntities.sh
deleted file mode 100755
index 13cc248..0000000
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_expandSystemEntities.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-#
-# docbook_expandSystemEntities.sh -- This function expands system
-# entities required by DocBook projects stored under
-# `Documentation/Manuals' directory.
-#
-# Copyright (C) 2009-2013 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function docbook_expandSystemEntities {
-
- # Define absolute path to instance where all operations will take
- # place in.
- local INSTANCE=$1
-
- # Define absolute path to both common and specific system
- # entities.
- local ENTITIES_PATHS="$(cli_getFilesList ${TCAR_WORKDIR}/Documentation/Models/Docbook/Default/Book $(dirname ${TEMPLATE}) \
- --pattern='^.*/[[:alpha:]-]+\.ent$' --maxdepth=1 --mindepth=1 --type='f')"
-
- # Build definition of both common and specific system entities.
- local ENTITIES="$(\
- for ENTITY_PATH in $ENTITIES_PATHS;do
- local ENTITY_NAME=$(basename ${ENTITY_PATH})
- echo '\n\t<!ENTITY % '${ENTITY_NAME}' SYSTEM "'${ENTITY_PATH}'">\n'
- echo '\t%'${ENTITY_NAME}';'
- done)"
-
- # Define both xml and docbook public definition.
- local PREAMBLE="<?xml version=\"1.0\" ?>"
- PREAMBLE="${PREAMBLE}\n<!DOCTYPE book PUBLIC \"-//OASIS//DTD DocBook XML V4.4//EN\" "
- PREAMBLE="${PREAMBLE}\n\t\"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd\" ["
- PREAMBLE="${PREAMBLE}\n${ENTITIES}"
- PREAMBLE="${PREAMBLE}\n\t]>"
-
- # Remove both xml and docbook preamble from instance and insert
- # it again with definitions of required common and specific system
- # entities.
- sed -r -i "1,2c$(echo $PREAMBLE)" ${INSTANCE}
-
-}
diff --git a/Scripts/Bash/Functions/Render/Docbook/docbook_prepareStyles.sh b/Scripts/Bash/Functions/Render/Docbook/docbook_prepareStyles.sh
deleted file mode 100755
index 6363e32..0000000
--- a/Scripts/Bash/Functions/Render/Docbook/docbook_prepareStyles.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-#
-# docbook_prepareStyles.sh -- This function prepares styles' final
-# instances used in transformations based on XSL or DSL templates.
-# There are translation markers inside the XSL and DSL templates that
-# need to be expanded before they can be used for transformations.
-# This function creates temporal instances of XSL and DSL templates
-# with translation markers expanded inside so as for transformation
-# commands (e.g., `xmltproc' or `openjade' through `docbook2pdf') to
-# use as style defintion.
-#
-# Copyright (C) 2009-2013 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function docbook_prepareStyles {
-
- local STYLE_TEMPLATE_FILE=''
- local STYLE_TEMPLATE_FILES=$@
- local STYLE_INSTANCE_COMMON=''
- local COUNT=0
-
- for STYLE_TEMPLATE_FILE in $STYLE_TEMPLATE_FILES;do
-
- STYLE_TEMPLATE[((++${#STYLE_TEMPLATE[*]}))]="${STYLE_TEMPLATE_FILE}"
- STYLE_INSTANCE[((++${#STYLE_INSTANCE[*]}))]="$(cli_getTemporalFile ${STYLE_TEMPLATE_FILE})"
-
- # Keep track of array's real index value. Remember, it starts
- # at zero but counting starts at 1 instead. So, substracting 1
- # from counting we have the real index value we need to work
- # with the information stored in the array.
- COUNT=$(( ${#STYLE_INSTANCE[*]} - 1 ))
-
- # Create style instance from style template.
- cp ${STYLE_TEMPLATE[$COUNT]} ${STYLE_INSTANCE[$COUNT]}
-
- # Define both final an common style instances based on style
- # templates.
- if [[ $STYLE_TEMPLATE_FILE =~ 'docbook2fo\.xsl$' ]];then
- STYLE_INSTANCE_FINAL=${STYLE_INSTANCE[$COUNT]}
- elif [[ $STYLE_TEMPLATE_FILE =~ 'docbook2pdf\.dsl$' ]];then
- STYLE_INSTANCE_FINAL=${STYLE_INSTANCE[${COUNT}]}
- elif [[ $STYLE_TEMPLATE_FILE =~ 'docbook2xhtml-(chunks|single)\.xsl$' ]];then
- STYLE_INSTANCE_FINAL=${STYLE_INSTANCE[${COUNT}]}
- elif [[ $STYLE_TEMPLATE_FILE =~ 'docbook2xhtml-common\.xsl$' ]];then
- STYLE_INSTANCE_COMMON=${STYLE_INSTANCE[${COUNT}]}
- fi
-
- done
-
- # Verify style final instance. This is the file used by
- # transformation command (`xsltproc' or `openjade') to produce the
- # specified output. We cannot continue without it.
- cli_checkFiles -e $STYLE_INSTANCE_FINAL
-
- # Expand common translation markers in the common style instance,
- # if it exists.
- if [[ -f $STYLE_INSTANCE_COMMON ]];then
- cli_expandTMarkers $STYLE_INSTANCE_COMMON
- fi
-
- # Expand specific translation markers in final style instance.
- sed -r -i "s!=STYLE_XHTML_COMMON=!${STYLE_INSTANCE_COMMON}!" ${STYLE_INSTANCE_FINAL}
-
-}
diff --git a/Scripts/Bash/Functions/Render/Svg/svg.sh b/Scripts/Bash/Functions/Render/Svg/svg.sh
index 6629859..df419c6 100755
--- a/Scripts/Bash/Functions/Render/Svg/svg.sh
+++ b/Scripts/Bash/Functions/Render/Svg/svg.sh
@@ -40,11 +40,11 @@ function svg {
svg_checkModelExportId "$INSTANCE" "$EXPORTID"
# Check existence of external files. Inside design templates and
- # their instances, external files are used to refere the
- # background information required by the design template. If such
- # background information is not available the image is produced
- # without background information. This is something that need to
- # be avoided.
+ # their instances, external files are used to refer the background
+ # information required by the design template. If such background
+ # information is not available the image is produced without
+ # background information. This is something that need to be
+ # avoided.
svg_checkModelAbsref "$INSTANCE"
# Render template instance using inkscape and save the output.
diff --git a/Scripts/Bash/Functions/Render/Svg/svg_convertPngToBranded.sh b/Scripts/Bash/Functions/Render/Svg/svg_convertPngToBranded.sh
index a663571..8ffba47 100755
--- a/Scripts/Bash/Functions/Render/Svg/svg_convertPngToBranded.sh
+++ b/Scripts/Bash/Functions/Render/Svg/svg_convertPngToBranded.sh
@@ -54,7 +54,7 @@ function svg_convertPngToBranded {
# execution. Instead, continue with the next action in the list.
# This is required in order to perform massive rendition inside
# structures like themes where components might or might not have
- # `branding.conf' files associted. For example, the `Concept'
+ # `branding.conf' files associated. For example, the `Concept'
# component doesn't have branding information associated but most
# elements inside `Distro' component do.
if [[ ! -f "$BRANDING_CONF_FILE" ]];then
@@ -83,8 +83,7 @@ function svg_convertPngToBranded {
# the image put over the PNG image produced as result of
# design models base rendition.
BRANDFILE=${TCAR_WORKDIR}/Identity/Images/Brands/$(echo $BRANDING_CONF_VALUE \
- | gawk 'BEGIN{ FS=":" } { print $1 }' \
- | sed -r "s/=BRAND=/${TCAR_BRAND}/g")
+ | gawk 'BEGIN{ FS=":" } { print $1 }' )
# Verify absolute path to image file used as brand. Assuming
# no brand image file is found, continue with the next
diff --git a/Scripts/Bash/Functions/Render/Svg/svg_convertPngToBrands.sh b/Scripts/Bash/Functions/Render/Svg/svg_convertPngToBrands.sh
deleted file mode 100755
index 1a337c8..0000000
--- a/Scripts/Bash/Functions/Render/Svg/svg_convertPngToBrands.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-#
-# svg_convertPngToBrands.sh -- This function provides post-rendition
-# actions to produce brand images in different sizes and formats from
-# the same SVG design model.
-#
-# Copyright (C) 2009-2013 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function svg_convertPngToBrands {
-
- # Define height dimensions you want to produce brands for.
- local SIZE=""
- local SIZES="16 20 22 24 32 36 38 40 48 64 72 78 96 112 124 128 148 164 196 200 512"
-
- # Define image formats you want to produce brands for.
- local FORMAT=""
- local FORMATS="xpm pdf jpg tif"
-
- for SIZE in ${SIZES};do
-
- # Redefine absolute path to file location where size-specific
- # images will be stored in.
- local FINALFILE=$(dirname $FILE)/${SIZE}/$(basename $FILE)
-
- # Prepare directory where size-specific images will be stored
- # in. If it doesn't exist create it.
- if [[ ! -d $(dirname $FINALFILE) ]];then
- mkdir -p $(dirname $FINALFILE)
- fi
-
- # Print action message.
- cli_printMessage "${FINALFILE}.png" --as-creating-line
-
- # Create size-specific PNG image ommiting all output.
- inkscape $INSTANCE --export-id=$EXPORTID \
- --export-png=${FINALFILE}.png --export-height=${SIZE} \
- &> /dev/null
-
- for FORMAT in ${FORMATS};do
-
- # Print action message.
- cli_printMessage "${FINALFILE}.${FORMAT}" --as-creating-line
-
- # Convert size-specific PNG image into different formats.
- convert ${FINALFILE}.png ${FINALFILE}.${FORMAT}
-
- done
-
- # Create copy of size-specific image in 2 colors.
- cli_printMessage "${FINALFILE}.xbm" --as-creating-line
- convert -colorspace gray -colors 2 ${FINALFILE}.png ${FINALFILE}.xbm
-
- # Create copy of size-specific image with emboss effect.
- cli_printMessage "${FINALFILE}-emboss.png" --as-creating-line
- convert -emboss 1 ${FINALFILE}.png ${FINALFILE}-emboss.png
-
- done
-
-}
diff --git a/Scripts/Bash/Functions/Render/Svg/svg_doPostActions.sh b/Scripts/Bash/Functions/Render/Svg/svg_doPostActions.sh
index b95e0ce..86b998e 100755
--- a/Scripts/Bash/Functions/Render/Svg/svg_doPostActions.sh
+++ b/Scripts/Bash/Functions/Render/Svg/svg_doPostActions.sh
@@ -73,9 +73,6 @@ function svg_doPostActions {
POSTACTIONS[((++${#POSTACTIONS[*]}))]='convertPngTo:jpg pdf'
fi
- elif [[ $TEMPLATE =~ "Identity/Models/Brands/.+\.${RENDER_EXTENSION}$" ]];then
- POSTACTIONS[((++${#POSTACTIONS[*]}))]='convertPngToBrands'
-
elif [[ $TEMPLATE =~ "Identity/Models/Icons/.+\.${RENDER_EXTENSION}$" ]];then
POSTACTIONS[((++${#POSTACTIONS[*]}))]='convertPngToIcons'
diff --git a/Scripts/Bash/Functions/Render/render.sh b/Scripts/Bash/Functions/Render/render.sh
index 63b5eb1..d271baa 100755
--- a/Scripts/Bash/Functions/Render/render.sh
+++ b/Scripts/Bash/Functions/Render/render.sh
@@ -74,7 +74,9 @@ function render {
# Initialize list of supported file extensions. These file
# extensions are used to build the list of source files we'll use
- # to create images from.
+ # to create images from. The order in which these extensions are
+ # listed here determines the order in which they are process if
+ # more than one is found in the same location.
local RENDER_EXTENSIONS='svgz svg docbook conf'
# Initialize the rendition format name as an empty value. The name
@@ -104,13 +106,13 @@ function render {
ACTIONVAL=$(cli_checkRepoDirSource ${ACTIONVAL})
# Verify non-option arguments passed to centos-art.sh
- # command-line. It should point to a path inside the
- # repository which is not under version control (because is
- # used to stored rendered content). In case the directory
- # doesn't exist, create it and continue.
- if [[ ! -d ${ACTIONVAL} ]];then
- mkdir -p ${ACTIONVAL}
- fi
+ # command-line. The path provided as argument must exist in
+ # the repository. Otherwise, it would be possible to create
+ # arbitrary directories inside the repository without any
+ # meaning. In order to be sure all required directories are
+ # available in the repository it is necessary use the prepare
+ # functionality.
+ #cli_checkFiles ${ACTIONVAL} -d
# Define render-able directories and the way they are
# produced. To describe the way render-able directories are
@@ -118,11 +120,13 @@ function render {
# and describe the production through an action name
# (ACTIONNAM).
if [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/Identity/Images/Themes" ]];then
- ACTIONNAM="render_doThemeActions"
+ ACTIONNAM="render_setThemes"
+ elif [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/Identity/Images/Brands" ]];then
+ ACTIONNAM="render_setBrands"
elif [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/Identity/Images" ]];then
- ACTIONNAM="render_doBaseActions"
+ ACTIONNAM="render_setBaseRendition"
elif [[ $ACTIONVAL =~ "^${TCAR_WORKDIR}/Documentation/Manuals/(Docbook|Svg)/[[:alnum:]-]+" ]];then
- ACTIONNAM="render_doBaseActions"
+ ACTIONNAM="render_setBaseRendition"
else
cli_printMessage "`gettext "The path provided doesn't support rendition."`" --as-error-line
fi
diff --git a/Scripts/Bash/Functions/Render/render_doBaseActions.sh b/Scripts/Bash/Functions/Render/render_doBaseActions.sh
deleted file mode 100755
index af830a8..0000000
--- a/Scripts/Bash/Functions/Render/render_doBaseActions.sh
+++ /dev/null
@@ -1,257 +0,0 @@
-#!/bin/bash
-#
-# render_doBaseActions.sh -- This function performs base-rendition
-# action for all files.
-#
-# Copyright (C) 2009-2013 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function render_doBaseActions {
-
- local -a FILES
- local FILE=''
- local OUTPUT=''
- local TEMPLATE=''
- local TEMPLATES=''
- local PARENTDIR=''
- local TRANSLATION=''
- local EXTERNALFILE=''
- local EXTERNALFILES=''
- local THIS_FILE_DIR=''
- local NEXT_FILE_DIR=''
- local RENDER_EXTENSION=''
- local EXPORTID=''
- local COUNT=0
-
- # Verify default directory where design models are stored in.
- cli_checkFiles -e "${TCAR_WORKDIR}/Identity/Models/Themes/${FLAG_THEME_MODEL}"
-
- # Redefine parent directory for current workplace.
- PARENTDIR=$(basename "${ACTIONVAL}")
-
- # Loop through list of supported file extensions.
- for RENDER_EXTENSION in ${RENDER_EXTENSIONS};do
-
- # Redefine rendition format name based on supported file
- # extension.
- if [[ $RENDER_EXTENSION =~ '^(svgz|svg)$' ]];then
- RENDER_FORMAT='svg'
- elif [[ $RENDER_EXTENSION =~ '^(docbook)$' ]];then
- RENDER_FORMAT='docbook'
- elif [[ $RENDER_EXTENSION =~ '^(conf)$' ]];then
- RENDER_FORMAT='conf'
- else
- cli_printMessage "`eval_gettext "The \\\"\\\$RENDER_EXTENSION\\\" file extension is not supported yet."`" --as-error-line
- fi
-
- # Redefine specific function export id.
- EXPORTID="${CLI_FUNCDIRNAM}/$(cli_getRepoName ${RENDER_FORMAT} -d)/$(cli_getRepoName ${RENDER_FORMAT} -f)"
-
- # Define base location of template files using paths passed to
- # centos-art.sh script as argument to.
- render_getDirTemplate
-
- # Verify whether or not the source location of the path
- # provided as argument to centos-art.sh script accepts or not
- # localization messages. Don't produce localized content for
- # repository components that don't accept it.
- if [[ ! ${CLI_LANG_LC} =~ '^en' ]];then
- cli_runFnEnvironment locale --is-localizable ${TEMPLATE}
- fi
-
- # Define the list of files to process. Use an array variable
- # to store the list of files to process. This make possible to
- # realize verifications like: is the current base directory
- # equal to the next one in the list of files to process?
- # Questions like this let us to know when centos-art.sh is
- # leaving a directory structure and entering another. This
- # information is required in order for centos-art.sh to know
- # when to apply last-rendition actions.
- #
- # Another issue is that some directories might be named as if
- # they were files (e.g., using a render able extension like
- # .docbook). In these situations we need to avoid such
- # directories from being interpreted as a render able file.
- # For this, pass the `--type="f"' option when building the
- # list of files to process in order to retrieve regular files
- # only.
- #
- # Another issue to consider here is that, in some cases, both
- # templates and outputs might be in the same location. In
- # these cases localized content are stored in the same
- # location where template files are retrieved from and we need
- # to avoid using localized content from being interpreted as
- # design models. In that sake, build the list of files to
- # process using the files directly stored in the directory
- # passed as argument to centos-art.sh command-line. Don't go
- # recursively here.
- #
- # Another issue to consider here, is the way of restricting
- # the list of files to process. We cannot expand the pattern
- # specified by FLAG_FILTER with a `.*' here (e.g.,
- # "${FLAG_FILTER}.*\.${RENDER_EXTENSION}") because that would
- # suppress any possibility from the user to specify just one
- # file name in locations where more than one file with the
- # same name as prefix exists (e.g., `repository.docbook',
- # `repository-preamble.docbook' and
- # `repository-parts.docbook'). Instead, pass filtering
- # control to the user whom can use regular expression markup
- # in the `--filter' option to decide whether to match
- # `repository.docbook' only (e.g., through
- # `--filter="repository"') or `repository-preamble.docbook'
- # and `repository-parts.docbook' but not `repository.docbook'
- # (e.g., through `--filter="repository-.*"').
- if [[ ${RENDER_FORMAT} =~ "^docbook$" ]];then
-
- # When the render format is docbook, don't build a list of
- # files to process. Instead, build the absolute path of
- # the main file used to render docbook from models to
- # final output manuals. This file must be stored directly
- # inside the main manual's directory and named as it but
- # with all letters in lowercase.
- for FILE in $(cli_getFilesList ${TEMPLATE} \
- --maxdepth="1" --mindepth="1" \
- --pattern="^.*$(cli_getRepoName ${TEMPLATE} -f)\.${RENDER_EXTENSION}$" \
- --type="f");do
- FILES[((++${#FILES[*]}))]=$FILE
- done
-
- else
-
- # For all other cases, build a list of files to process
- # using the path value pass as argument.
- for FILE in $(cli_getFilesList ${TEMPLATE} \
- --pattern="^.+/${FLAG_FILTER}.*\.${RENDER_EXTENSION}$" \
- --type="f");do
- FILES[((++${#FILES[*]}))]=$FILE
- done
-
- fi
-
- # Verify list of files to process. Assuming no file was found,
- # evaluate the next supported file extension.
- if [[ ${#FILES[*]} -eq 0 ]];then
- continue
- fi
-
- # Initialize format-specific functionalities.
- cli_exportFunctions "${EXPORTID}"
-
- # Start processing the base rendition list of FILES. Fun part
- # approaching :-).
- while [[ $COUNT -lt ${#FILES[*]} ]];do
-
- # Define base file.
- FILE=${FILES[$COUNT]}
-
- # Define the base directory path for the current file being
- # process.
- THIS_FILE_DIR=$(dirname ${FILES[$COUNT]})
-
- # Define the base directory path for the next file that will
- # be process.
- if [[ $(($COUNT + 1)) -lt ${#FILES[*]} ]];then
- NEXT_FILE_DIR=$(dirname ${FILES[$(($COUNT + 1))]})
- else
- NEXT_FILE_DIR=''
- fi
-
- # Print separator line.
- cli_printMessage '-' --as-separator-line
-
- # Verify design models file existence. We cannot continue
- # with out it.
- cli_checkFiles ${FILE} -f
-
- # Print action message.
- cli_printMessage "${FILE}" --as-template-line
-
- # Define final location of translation file.
- TRANSLATION=$(dirname ${FILE} \
- | sed -r 's!(Documentation|Identity)!Locales/\1!')/${CLI_LANG_LC}/messages.po
-
- # Define final location of template file.
- TEMPLATE=${FILE}
-
- # Define final location of output directory.
- render_getDirOutput
-
- # Get relative path to file. The path string (stored in
- # FILE) has two parts: 1. the variable path and 2. the
- # common path. The variable path is before the common
- # point in the path string. The common path is after the
- # common point in the path string. The common point is the
- # name of the parent directory (stored in PARENTDIR).
- #
- # Identity/Models/Themes/.../Firstboot/3/splash-small.svg
- # -------------------------^| the |^------------^
- # variable path | common | common path
- # -------------------------v| point | v------------v
- # Identity/Images/Themes/.../Firstboot/Img/3/splash-small.png
- #
- # What we do here is remove the variable path, the common
- # point, and the file extension parts in the string
- # holding the path retrieved from design models directory
- # structure. Then we use the common path as relative path
- # to store the final image file.
- #
- # The file extension is removed from the common path
- # because it is set when we create the final image file.
- # This configuration let us use different extensions for
- # the same file name.
- #
- # When we render using base-rendition action, the
- # structure of files under the output directory will be
- # the same used after the common point in the related
- # design model directory structure.
- FILE=$(echo ${FILE} \
- | sed -r "s!.*${PARENTDIR}/!!" \
- | sed -r "s/\.${RENDER_EXTENSION}$//")
-
- # Define absolute path to final file (without extension).
- FILE=${OUTPUT}/$(basename "${FILE}")
-
- # Define instance name from design model.
- INSTANCE=$(cli_getTemporalFile ${TEMPLATE})
-
- # Perform format base-rendition.
- ${RENDER_FORMAT}
-
- # Remove template instance.
- if [[ -f $INSTANCE ]];then
- rm $INSTANCE
- fi
-
- # Increment file counter.
- COUNT=$(($COUNT + 1))
-
- done
-
- # Reset counter to prevent accumulation of values.
- COUNT=0
-
- # Unset format-specific functionalities.
- cli_unsetFunctions "${EXPORTID}"
-
- # Unset files list to prevent accumulation of values.
- unset FILES
-
- done
-}
diff --git a/Scripts/Bash/Functions/Render/render_doThemeActions.sh b/Scripts/Bash/Functions/Render/render_doThemeActions.sh
deleted file mode 100755
index ad72896..0000000
--- a/Scripts/Bash/Functions/Render/render_doThemeActions.sh
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/bash
-#
-# render_doThemeActions.sh -- This function performs theme-specific
-# rendition.
-#
-# Copyright (C) 2009-2013 The CentOS Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# ----------------------------------------------------------------------
-# $Id$
-# ----------------------------------------------------------------------
-
-function render_doThemeActions {
-
- local -a DIRS
- local COUNT=0
- local NEXTDIR=''
- local MOTIF_NAME=''
- local MOTIF_DIR=''
-
- # Define base directory of artistic motifs. This is the location
- # where all artistic motifs are stored in.
- local MOTIF_BASEDIR="${TCAR_WORKDIR}/Identity/Images/Themes"
-
- # Define base directory of design models. This is the location
- # where all design models are stored in.
- local MODEL_BASEDIR="${TCAR_WORKDIR}/Identity/Models/Themes"
-
- # Define directory structure of design models. Design models
- # directory structures are used as reference to create artistic
- # motifs directory structure. Use the `--pattern' option to be
- # sure any modification to FLAG_FILTER won't affect the output
- # result. We need to make matching everything here, no matter what
- # the FLAG_FILTER value be.
- local MODEL_DIR=''
- local MODEL_DIRS="$(cli_getFilesList ${MODEL_BASEDIR}/${FLAG_THEME_MODEL} \
- --pattern='^/[^.svn][[:alnum:]_/-]+$' --type="d" \
- | sed -e "s!^.*/${FLAG_THEME_MODEL}!!" \
- -e '/^[[:space:]]*$/d' \
- -e 's!^/!!')"
-
- # Define design model regular expression patterns from design
- # models directory structure.
- local MODEL_PATTERN=$(echo "$MODEL_DIRS" | tr "\n" '|' \
- | sed -e 's!^|!!' -e 's!|$!!')
-
- # Define regular expression pattern that match the theme artistic
- # motif component inside the path strings.
- local MOTIF_PATTERN=$(cli_getPathComponent --motif-pattern)
-
- # Define list of render-able directory structures inside the
- # artistic motif. As reference, to build this list, use design
- # model directory structure. The more specific you be in the path
- # specification the more specific theme rendition will be. Thus,
- # we use the path provided as argument and the filter option as
- # reference to control the amount of directories to be considered
- # as render-able directory.
- local MOTIF_RENDERABLE_DIR=''
- local MOTIF_RENDERABLE_DIRS=$(cli_getFilesList ${MOTIF_BASEDIR} \
- --pattern="${TCAR_WORKDIR}/${MOTIF_PATTERN}/($MODEL_PATTERN)" --type="d" \
- | grep "${ACTIONVAL}")
-
- # Rebuild list of render-able directory structures using an array
- # variable. This let us to predict what directory is one step
- # forward or backward from the current directory structure.
- for MOTIF_RENDERABLE_DIR in $MOTIF_RENDERABLE_DIRS;do
- DIRS[((++${#DIRS[*]}))]=${MOTIF_RENDERABLE_DIR}
- done
-
- # Define total number of directories to process. This is required
- # in order to correct the counting value and so, make it to match
- # the zero based nature of bash array variables.
- local DIRS_TOTAL=$((${#DIRS[*]} - 1))
-
- while [[ $COUNT -le ${DIRS_TOTAL} ]];do
-
- # Redefine action value to refer the theme-specific render-able
- # directory.
- ACTIONVAL=${DIRS[$COUNT]}
-
- # Refine artistic motif name using the current action value.
- MOTIF_NAME=$(cli_getPathComponent $ACTIONVAL --motif)
-
- # Verify artistic motif name. The name of the artistic motif
- # must be present in order for theme rendition to happen.
- # Theme rendition takes place inside artistic motifs and the
- # artistic motif name is an indispensable part of it. Take
- # care of not using design models directory structure as name
- # for artistic motifs. They, sometimes, match the pattern used
- # to verify artistic motifs names but must not be confused.
- if [[ $MOTIF_NAME == '' ]] || [[ $MOTIF_NAME =~ "^($MODEL_PATTERN)" ]];then
- COUNT=$(($COUNT + 1))
- continue
- fi
-
- # Refine artistic motif directory. This is the top directory
- # where all visual manifestations of an artistic motif are
- # stored in (e.g., Backgrounds, Brushes, Concept, Distro,
- # etc.).
- MOTIF_DIR="${MOTIF_BASEDIR}/${MOTIF_NAME}"
-
- # Define what is the next directory in the list, so we could
- # verify whether to render or not the current theme-specific
- # render-able directory.
- if [[ $COUNT -lt ${DIRS_TOTAL} ]];then
- NEXTDIR=$(dirname ${DIRS[(($COUNT + 1))]})
- else
- NEXTDIR=''
- fi
-
- # Verify whether to render or not the current theme's
- # render-able directory. This verification is needed in order
- # to avoid unnecessary rendition loops. For example, don't
- # render `path/to/dir/A' when `path/to/dir/A/B' does exist,
- # that configuration would produce `/path/to/dir/A/B twice.
- if [[ $ACTIONVAL =~ '[[:digit:]]$' ]] || [[ $ACTIONVAL == $NEXTDIR ]];then
- COUNT=$(($COUNT + 1))
- continue
- fi
-
- # Execute direct rendition on theme specific render-able
- # directory as specified by action value.
- render_doBaseActions
-
- # Increment counter to match the correct count value.
- COUNT=$(($COUNT + 1))
-
- done
-
-}
diff --git a/Scripts/Bash/Functions/Render/render_getDirOutput.sh b/Scripts/Bash/Functions/Render/render_getDirOutput.sh
index fe6d470..ffc475e 100755
--- a/Scripts/Bash/Functions/Render/render_getDirOutput.sh
+++ b/Scripts/Bash/Functions/Render/render_getDirOutput.sh
@@ -32,13 +32,13 @@ function render_getDirOutput {
-e "s!Identity/Models!Identity/Images!" \
-e "s!Themes/${FLAG_THEME_MODEL}!Themes/$(cli_getPathComponent $ACTIONVAL --motif)!" \
-e "s!Documentation/Models!Documentation/Manuals!" \
- -e "s!/Tpl!!")
+ -e "s!/Models!!")
- # By default rendered identity content is stored immediately under
- # identity entry structure, but if `Img/' directory exists use it
- # instead.
- if [[ -d "${OUTPUT}/Img" ]];then
- OUTPUT=${OUTPUT}/Img
+ # By default, images rendered are stored under Identity/Images
+ # directory structure. But if an `Images/' directory exists in the
+ # current location use it instead.
+ if [[ -d "${OUTPUT}/Images" ]];then
+ OUTPUT=${OUTPUT}/Images
fi
# Redefine base output directory to introduce specific information
diff --git a/Scripts/Bash/Functions/Render/render_getDirTemplate.sh b/Scripts/Bash/Functions/Render/render_getDirTemplate.sh
index 9a428bf..9c6058a 100755
--- a/Scripts/Bash/Functions/Render/render_getDirTemplate.sh
+++ b/Scripts/Bash/Functions/Render/render_getDirTemplate.sh
@@ -61,8 +61,8 @@ function render_getDirTemplate {
# Define absolute path to input files using absolute path from
# output files.
- if [[ -d ${TEMPLATE}/Tpl ]];then
- TEMPLATE=${TEMPLATE}/Tpl
+ if [[ -d ${TEMPLATE}/Models ]];then
+ TEMPLATE=${TEMPLATE}/Models
else
TEMPLATE=$(echo "$TEMPLATE" | sed -r \
-e "s!/Themes/$(cli_getPathComponent $ACTIONVAL --motif)!/Themes/${FLAG_THEME_MODEL}!" \
diff --git a/Scripts/Bash/Functions/Render/render_getOptions.sh b/Scripts/Bash/Functions/Render/render_getOptions.sh
index a686090..6598f99 100755
--- a/Scripts/Bash/Functions/Render/render_getOptions.sh
+++ b/Scripts/Bash/Functions/Render/render_getOptions.sh
@@ -115,7 +115,7 @@ function render_getOptions {
# correctly. At this point all option arguments have
# been processed already but the `--' argument still
# remains to mark ending of option arguments and
- # begining of non-option arguments. The `--' argument
+ # beginning of non-option arguments. The `--' argument
# needs to be removed here in order to avoid
# centos-art.sh script to process it as a path inside
# the repository, which obviously is not.