diff --git a/lib/conf.d/data_templates/DublinCore.xml b/lib/conf.d/data_templates/DublinCore.xml
new file mode 100644
index 0000000000..5de4f32945
--- /dev/null
+++ b/lib/conf.d/data_templates/DublinCore.xml
@@ -0,0 +1,221 @@
+
+
+ {{datapathnoweb}}{{basename}}/documents
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ 1024
+ resample
+ 72
+ no
+ 75
+ yes
+ screen
+ image
+
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ 240
+ resample
+ 72
+ yes
+ 75
+ no
+ screen
+ image
+
+
+
+
+ 480
+ 72
+ yes
+ 75
+ {{datapathnoweb}}{{basename}}/subdefs
+ image
+ no
+ handheld
+
+
+
+
+ 150
+ 72
+ yes
+ 75
+ {{datapathnoweb}}{{basename}}/subdefs
+ image
+ no
+ handheld
+
+
+
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ 240
+ screen
+ image
+ no
+
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ 240
+ gif
+ 150
+ screen
+ no
+
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ 748
+ video
+ yes
+ libfaac
+ libx264
+ screen
+ 1000
+ 128
+ 48000
+ 25
+ 25
+
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ 748
+ video
+ screen
+ 1000
+ 128
+ 48000
+ libvorbis
+ 25
+ 25
+ libvpx
+
+
+
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ image
+ 240
+ screen
+ no
+
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ audio
+ yes
+ 128
+ 48000
+ screen
+
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ audio
+ handheld
+
+
+
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ image
+ resample
+ 72
+ 240
+ no
+ screen
+
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ flexpaper
+ no
+ screen
+
+
+
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ image
+ 240
+ no
+ resample
+ 72
+ screen
+
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ image
+ 800
+ no
+ resample
+ 72
+ screen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/conf.d/data_templates/en-simple.xml b/lib/conf.d/data_templates/en-simple.xml
index 357cfcba08..a9b2e33460 100644
--- a/lib/conf.d/data_templates/en-simple.xml
+++ b/lib/conf.d/data_templates/en-simple.xml
@@ -5,7 +5,7 @@
{{datapathnoweb}}{{basename}}/subdefs
- 800
+ 1024
resample
72
no
@@ -26,7 +26,7 @@
no
screen
image
-
+
@@ -50,145 +50,82 @@
image
no
handheld
-
+
-
+
{{datapathnoweb}}{{basename}}/subdefs
- video
- 300
- 2
- 25
- 480
- 15
- handheld
- libvpx
- libvorbis
-
-
-
-
- {{datapathnoweb}}{{basename}}/subdefs
- video
- 300
- 2
- 25
- 480
- 15
- handheld
- libtheora
- libvorbis
-
-
-
-
- {{datapathnoweb}}{{basename}}/subdefs
- video
- 300
- 2
- 25
- 480
- 15
- handheld
- libfaac
- libx264
-
-
-
-
- {{datapathnoweb}}{{basename}}/subdefs
- video
+ 240
screen
- 1000
- 1
- libvorbis
- 25
- 800
- 15
- libvpx
-
-
-
-
- {{datapathnoweb}}{{basename}}/subdefs
- video
- screen
- 1000
- 1
- libvorbis
- 25
- 800
- 15
- libtheora
-
-
-
-
- 150
- 72
- yes
- 75
- {{datapathnoweb}}{{basename}}/subdefs
image
- no
- handheld
-
-
+ no
+
+
-
- {{datapathnoweb}}{{basename}}/subdefs
- 800
- video
- yes
- libfaac
- libx264
- screen
- 1000
- 8
- 15
-
-
-
-
+
{{datapathnoweb}}{{basename}}/subdefs
240
gif
- 500
+ 150
screen
no
-
+
{{datapathnoweb}}{{basename}}/subdefs
- 240
+ 748
+ video
+ yes
+ libfaac
+ libx264
screen
- image
- no
-
-
+ 1000
+ 128
+ 48000
+ 25
+ 25
+
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ 748
+ video
+ screen
+ 1000
+ 128
+ 48000
+ libvorbis
+ 25
+ 25
+ libvpx
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ image
+ 240
+ screen
+ no
+
+
+
{{datapathnoweb}}{{basename}}/subdefs
audio
yes
+ 128
+ 48000
screen
-
- {{datapathnoweb}}{{basename}}/subdefs
- image
- 240
- screen
- no
-
-
-
{{datapathnoweb}}{{basename}}/subdefs
audio
@@ -196,28 +133,8 @@
-
- 150
- 72
- yes
- 75
- {{datapathnoweb}}{{basename}}/subdefs
- image
- no
- handheld
-
-
-
-
- {{datapathnoweb}}{{basename}}/subdefs
- flexpaper
- no
- screen
-
-
-
{{datapathnoweb}}{{basename}}/subdefs
image
@@ -226,30 +143,30 @@
240
no
screen
-
+
-
+
{{datapathnoweb}}{{basename}}/subdefs
flexpaper
- handheld
-
-
-
-
- 150
- 72
- yes
- 75
- {{datapathnoweb}}{{basename}}/subdefs
- image
- no
- handheld
-
-
+ no
+ screen
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ image
+ 240
+ no
+ resample
+ 72
+ screen
+
+
+
{{datapathnoweb}}{{basename}}/subdefs
image
@@ -261,41 +178,6 @@
-
- {{datapathnoweb}}{{basename}}/subdefs
- image
- 240
- no
- resample
- 72
- screen
-
-
-
-
- 480
- 72
- yes
- 75
- {{datapathnoweb}}{{basename}}/subdefs
- image
- no
- handheld
-
-
-
-
- 150
- 72
- yes
- 75
- {{datapathnoweb}}{{basename}}/subdefs
- image
- no
- handheld
-
-
-
diff --git a/lib/conf.d/data_templates/fr-simple.xml b/lib/conf.d/data_templates/fr-simple.xml
index 62b2f5ee1f..550b8adac8 100644
--- a/lib/conf.d/data_templates/fr-simple.xml
+++ b/lib/conf.d/data_templates/fr-simple.xml
@@ -5,7 +5,7 @@
{{datapathnoweb}}{{basename}}/subdefs
- 800
+ 1024
resample
72
no
@@ -26,7 +26,7 @@
no
screen
image
-
+
@@ -50,145 +50,82 @@
image
no
handheld
-
+
-
+
{{datapathnoweb}}{{basename}}/subdefs
- video
- 300
- 2
- 25
- 480
- 15
- handheld
- libvpx
- libvorbis
-
-
-
-
- {{datapathnoweb}}{{basename}}/subdefs
- video
- 300
- 2
- 25
- 480
- 15
- handheld
- libtheora
- libvorbis
-
-
-
-
- {{datapathnoweb}}{{basename}}/subdefs
- video
- 300
- 2
- 25
- 480
- 15
- handheld
- libfaac
- libx264
-
-
-
-
- {{datapathnoweb}}{{basename}}/subdefs
- video
+ 240
screen
- 1000
- 1
- libvorbis
- 25
- 800
- 15
- libvpx
-
-
-
-
- {{datapathnoweb}}{{basename}}/subdefs
- video
- screen
- 1000
- 1
- libvorbis
- 25
- 800
- 15
- libtheora
-
-
-
-
- 150
- 72
- yes
- 75
- {{datapathnoweb}}{{basename}}/subdefs
image
- no
- handheld
-
-
+ no
+
+
-
- {{datapathnoweb}}{{basename}}/subdefs
- 800
- video
- yes
- libfaac
- libx264
- screen
- 1000
- 8
- 15
-
-
-
-
+
{{datapathnoweb}}{{basename}}/subdefs
240
gif
- 500
+ 150
screen
no
-
+
{{datapathnoweb}}{{basename}}/subdefs
- 240
+ 748
+ video
+ yes
+ libfaac
+ libx264
screen
- image
- no
-
-
+ 1000
+ 128
+ 48000
+ 25
+ 25
+
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ 748
+ video
+ screen
+ 1000
+ 128
+ 48000
+ libvorbis
+ 25
+ 25
+ libvpx
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ image
+ 240
+ screen
+ no
+
+
+
{{datapathnoweb}}{{basename}}/subdefs
audio
yes
+ 128
+ 48000
screen
-
- {{datapathnoweb}}{{basename}}/subdefs
- image
- 240
- screen
- no
-
-
-
{{datapathnoweb}}{{basename}}/subdefs
audio
@@ -196,28 +133,8 @@
-
- 150
- 72
- yes
- 75
- {{datapathnoweb}}{{basename}}/subdefs
- image
- no
- handheld
-
-
-
-
- {{datapathnoweb}}{{basename}}/subdefs
- flexpaper
- no
- screen
-
-
-
{{datapathnoweb}}{{basename}}/subdefs
image
@@ -226,30 +143,30 @@
240
no
screen
-
+
-
+
{{datapathnoweb}}{{basename}}/subdefs
flexpaper
- handheld
-
-
-
-
- 150
- 72
- yes
- 75
- {{datapathnoweb}}{{basename}}/subdefs
- image
- no
- handheld
-
-
+ no
+ screen
+
+
+
+ {{datapathnoweb}}{{basename}}/subdefs
+ image
+ 240
+ no
+ resample
+ 72
+ screen
+
+
+
{{datapathnoweb}}{{basename}}/subdefs
image
@@ -261,41 +178,6 @@
-
- {{datapathnoweb}}{{basename}}/subdefs
- image
- 240
- no
- resample
- 72
- screen
-
-
-
-
- 480
- 72
- yes
- 75
- {{datapathnoweb}}{{basename}}/subdefs
- image
- no
- handheld
-
-
-
-
- 150
- 72
- yes
- 75
- {{datapathnoweb}}{{basename}}/subdefs
- image
- no
- handheld
-
-
-