diff --git a/foomatic-db/db/source/opt/112.xml b/foomatic-db/db/source/opt/112.xml
index e088d5f..2a42570 100644
--- a/foomatic-db/db/source/opt/112.xml
+++ b/foomatic-db/db/source/opt/112.xml
@@ -15,7 +15,7 @@
lpstyl
- ev/745
+ ev/747
diff --git a/foomatic-db/db/source/opt/121.xml b/foomatic-db/db/source/opt/121.xml
index 974a15a..d74fa72 100644
--- a/foomatic-db/db/source/opt/121.xml
+++ b/foomatic-db/db/source/opt/121.xml
@@ -15,7 +15,7 @@
oki4drv
- ev/796
+ ev/792
diff --git a/foomatic-db/db/source/opt/126.xml b/foomatic-db/db/source/opt/126.xml
index 8f179c1..4d4870b 100644
--- a/foomatic-db/db/source/opt/126.xml
+++ b/foomatic-db/db/source/opt/126.xml
@@ -15,104 +15,104 @@
appledmp
- ev/798
+ ev/801
bj200
printer/Canon-BJ-330
- ev/798
+ ev/801
cp50
- ev/798
+ ev/801
eps9high
- ev/798
+ ev/801
eps9mid
- ev/798
+ ev/801
epson
- ev/798
+ ev/801
epsonc
- ev/798
+ ev/801
ibmpro
- ev/798
+ ev/801
imagen
- ev/798
+ ev/801
iwhi
- ev/798
+ ev/801
iwlo
- ev/798
+ ev/801
iwlq
- ev/798
+ ev/801
la50
- ev/798
+ ev/801
la70
- ev/798
+ ev/801
la75
- ev/798
+ ev/801
la75plus
- ev/798
+ ev/801
lp8000
- ev/798
+ ev/801
lq850
- ev/798
+ ev/801
m8510
- ev/798
+ ev/801
necp2xX.upp
- ev/798
+ ev/801
necp6
- ev/798
+ ev/801
oki182
- ev/798
+ ev/801
okiibm
- ev/798
+ ev/801
t4693dX
- ev/798
+ ev/801
tek4696
- ev/798
+ ev/801
diff --git a/foomatic-db/db/source/opt/139.xml b/foomatic-db/db/source/opt/139.xml
index d335a5b..816f9bb 100644
--- a/foomatic-db/db/source/opt/139.xml
+++ b/foomatic-db/db/source/opt/139.xml
@@ -15,11 +15,11 @@
md2k
- ev/856
+ ev/854
md5k
- ev/856
+ ev/854
diff --git a/foomatic-db/db/source/opt/165.xml b/foomatic-db/db/source/opt/165.xml
index 4772942..480fd37 100644
--- a/foomatic-db/db/source/opt/165.xml
+++ b/foomatic-db/db/source/opt/165.xml
@@ -15,7 +15,7 @@
ppmtocpva
- ev/930
+ ev/933
diff --git a/foomatic-db/db/source/opt/2.xml b/foomatic-db/db/source/opt/2.xml
index 94318a2..24a928d 100644
--- a/foomatic-db/db/source/opt/2.xml
+++ b/foomatic-db/db/source/opt/2.xml
@@ -15,15 +15,15 @@
ap3250
- ev/1
+ ev/3
bj10e
- ev/1
+ ev/3
bj200
- ev/1
+ ev/3
bj200
@@ -31,79 +31,79 @@
bj8XXYYZ.upp
- ev/1
+ ev/3
bjc250gs
- ev/1
+ ev/3
bjc600
- ev/1
+ ev/3
bjc6000X1.upp
- ev/1
+ ev/3
bjc610XY.upp
- ev/1
+ ev/3
bjc800
- ev/1
+ ev/3
c2050
- ev/1
+ ev/3
c2070
- ev/1
+ ev/3
cdj1600
- ev/1
+ ev/3
cdj500
- ev/1
+ ev/3
cdj550
- ev/1
+ ev/3
cdj550.upp
- ev/1
+ ev/3
cdj670
- ev/1
+ ev/3
cdj690X.upp
- ev/1
+ ev/3
cdj850
- ev/1
+ ev/3
cdj880
- ev/1
+ ev/3
cdj890
- ev/1
+ ev/3
cdj970
- ev/1
+ ev/3
chp2200
- ev/1
+ ev/3
chp2200
@@ -147,31 +147,31 @@
cjet
- ev/1
+ ev/3
cljet5
- ev/1
+ ev/3
cZ11
- ev/1
+ ev/3
cZ11somsom
- ev/1
+ ev/3
declj250
- ev/1
+ ev/3
deskjet
- ev/1
+ ev/3
djet500
- ev/1
+ ev/3
eplaser
@@ -183,167 +183,167 @@
hl1250
- ev/1
+ ev/3
hl7x0
- ev/1
+ ev/3
hpdj
- ev/1
+ ev/3
jetp3852
- ev/1
+ ev/3
laserjet
- ev/1
+ ev/3
lbp8
- ev/1
+ ev/3
lex5700
- ev/1
+ ev/3
lex7000
- ev/1
+ ev/3
lips3
- ev/1
+ ev/3
lj250
- ev/1
+ ev/3
lj4dith
- ev/1
+ ev/3
lj5gray
- ev/1
+ ev/3
ljet2p
- ev/1
+ ev/3
ljet3
- ev/1
+ ev/3
ljet3d
- ev/1
+ ev/3
ljet4
- ev/1
+ ev/3
ljet4d
- ev/1
+ ev/3
ljetplus
- ev/1
+ ev/3
lm1100
- ev/1
+ ev/3
ln03
- ev/1
+ ev/3
lp2563
- ev/1
+ ev/3
lpstyl
- ev/1
+ ev/3
lx5000
- ev/1
+ ev/3
lxm3200
- ev/1
+ ev/3
lxm3200-tweaked
- ev/1
+ ev/3
lxm3200X
- ev/1
+ ev/3
lxm5700m
- ev/1
+ ev/3
ml85p
- ev/1
+ ev/3
oce9050
- ev/1
+ ev/3
paintjet
- ev/1
+ ev/3
pbm2l2030
- ev/1
+ ev/3
pbm2l7k
- ev/1
+ ev/3
pcl3
- ev/1
+ ev/3
pj
- ev/1
+ ev/3
pjetxl
- ev/1
+ ev/3
pjxl
- ev/1
+ ev/3
pjxl300
- ev/1
+ ev/3
PM760pX.upp
- ev/1
+ ev/3
PM820pX.upp
- ev/1
+ ev/3
pnm2ppa
- ev/1
+ ev/3
Postscript1
- ev/1
+ ev/3
Postscript1
@@ -357,115 +357,115 @@
pxl1010
- ev/1
+ ev/3
pxlcolor
- ev/1
+ ev/3
pxldpl
- ev/1
+ ev/3
pxlmono
- ev/1
+ ev/3
r4081
- ev/1
+ ev/3
s400X1.upp
- ev/1
+ ev/3
sharp.upp
- ev/1
+ ev/3
sj48
- ev/1
+ ev/3
st640X.upp
- ev/1
+ ev/3
st800
- ev/1
+ ev/3
stc1520h.upp
- ev/1
+ ev/3
stc200_h.upp
- ev/1
+ ev/3
stc2X.upp
- ev/1
+ ev/3
stc300X.upp
- ev/1
+ ev/3
stc500pX.upp
- ev/1
+ ev/3
stc600X.upp
- ev/1
+ ev/3
Stc670pX.upp
- ev/1
+ ev/3
Stc680pX.upp
- ev/1
+ ev/3
stc740X.upp
- ev/1
+ ev/3
Stc760pX.upp
- ev/1
+ ev/3
Stc777pX.upp
- ev/1
+ ev/3
stc800X.upp
- ev/1
+ ev/3
stcanyX.upp
- ev/1
+ ev/3
stcolor
- ev/1
+ ev/3
stcX.upp
- ev/1
+ ev/3
Stp720pX.upp
- ev/1
+ ev/3
Stp870pX.upp
- ev/1
+ ev/3
xes
- ev/1
+ ev/3
diff --git a/foomatic-db/db/source/opt/drv_x125-PageSize.xml b/foomatic-db/db/source/opt/drv_x125-PageSize.xml
index 60b767c..9955c5b 100644
--- a/foomatic-db/db/source/opt/drv_x125-PageSize.xml
+++ b/foomatic-db/db/source/opt/drv_x125-PageSize.xml
@@ -15,7 +15,7 @@
drv_x125
- ev/drv_x125-PageSize-Letter
+ ev/drv_x125-PageSize-A4
diff --git a/foomatic-db/db/source/opt/drv_z42-PageSize.xml b/foomatic-db/db/source/opt/drv_z42-PageSize.xml
index f72b5d4..7abb454 100644
--- a/foomatic-db/db/source/opt/drv_z42-PageSize.xml
+++ b/foomatic-db/db/source/opt/drv_z42-PageSize.xml
@@ -15,7 +15,7 @@
drv_z42
- ev/drv_z42-PageSize-Letter
+ ev/drv_z42-PageSize-A4
diff --git a/foomatic-db/db/source/opt/gdi-PageSize.xml b/foomatic-db/db/source/opt/gdi-PageSize.xml
index 3e56fbd..476cabc 100644
--- a/foomatic-db/db/source/opt/gdi-PageSize.xml
+++ b/foomatic-db/db/source/opt/gdi-PageSize.xml
@@ -15,7 +15,7 @@
gdi
- ev/gdi-PageSizeJCL-Letter
+ ev/gdi-PageSizeJCL-A4
diff --git a/foomatic-db/db/source/opt/gdi-PageSizeJCL.xml b/foomatic-db/db/source/opt/gdi-PageSizeJCL.xml
index d85fc38..0e35e96 100644
--- a/foomatic-db/db/source/opt/gdi-PageSizeJCL.xml
+++ b/foomatic-db/db/source/opt/gdi-PageSizeJCL.xml
@@ -15,7 +15,7 @@
gdi
- ev/gdi-PageSizeJCL-Letter
+ ev/gdi-PageSizeJCL-A4
diff --git a/foomatic-db/db/source/opt/gdi-PageSizePS.xml b/foomatic-db/db/source/opt/gdi-PageSizePS.xml
index 14f04c2..42f5249 100644
--- a/foomatic-db/db/source/opt/gdi-PageSizePS.xml
+++ b/foomatic-db/db/source/opt/gdi-PageSizePS.xml
@@ -15,7 +15,7 @@
gdi
- ev/gdi-PageSizePS-Letter
+ ev/gdi-PageSizePS-A4
diff --git a/foomatic-db/db/source/opt/jap-PageSize.xml b/foomatic-db/db/source/opt/jap-PageSize.xml
index 3334b8f..94daddd 100644
--- a/foomatic-db/db/source/opt/jap-PageSize.xml
+++ b/foomatic-db/db/source/opt/jap-PageSize.xml
@@ -16,255 +16,255 @@
bj10
printer/Canon-BJ-35v
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
bj10v
printer/Canon-BJ-10v
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
bj10v
printer/Canon-BJ-15v
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
bj10vh
printer/Canon-BJ-10v
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
bj10vh
printer/Canon-BJ-15v
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
bj10vh
printer/Canon-BJ-35v
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
bjc800j
printer/Canon-BJC-680J
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
bjc880j
printer/Canon-BJC-880J
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
dj505j
printer/HP-DeskJet_505J_Plus
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
escpage
printer/Epson-LP-xx00
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
fmlbp
printer/Fujitsu-FMLBP2xx_Page_Printer
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
fmpr
printer/Fujitsu-FMPR
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
jj100
printer/Star-JJ-100
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
lbp310
printer/Canon-LBP-310
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
lbp320
printer/Canon-LBP-320_Pro
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
lbp320
printer/Canon-LBP-350
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
lips2p
printer/Canon-LIPS-IIplus
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
lips4
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
lips4v
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
lj4dithp
printer/HP-LaserJet_4V_4LJ_Pro
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
lp2000
printer/Epson-LP-2000
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
lp2000
printer/Epson-LP-3000
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
lp2000
printer/Epson-LP-7000
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
lp2000
printer/Epson-LP-7000G
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
md1xMono
printer/Alps-MD-1300
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
md1xMono
printer/Alps-MD-1500
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
md50Eco
printer/Alps-MD-5000
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
md50Eco
printer/Oki-DP_5000
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
md50Mono
printer/Alps-MD-5000
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
md50Mono
printer/Oki-DP_5000
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
mj500c
printer/Epson-Stylus_Color_1500
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
mj500c
printer/Epson-Stylus_Color_200
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
mj500c
printer/Epson-Stylus_Color_IIs
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
mj6000c
printer/Epson-Stylus_Color_1520
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
mj6000c
printer/Epson-Stylus_Color_400
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
mj6000c
printer/Epson-Stylus_Color_800
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
mj700v2c
printer/Epson-MachJet
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
mj700v2c
printer/Epson-Stylus
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
mj8000c
printer/Epson-Stylus_Color_3000
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
ml600
printer/Oki-Microline_600CL
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
ml600
printer/Oki-Microline_620CL
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
npdl
printer/NEC-MultiWriter
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
npdl
printer/NEC-PC-PR1000
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
npdl
printer/NEC-PC-PR2000
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
picty180
printer/NEC-PICTY180
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
pr150
printer/NEC-PC-PR150
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
pr201
printer/NEC-PC-PR201
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
rpdl
printer/Ricoh-RPDL_III_Laser_Printer
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
rpdl
printer/Ricoh-RPDL_II_Laser_Printer
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
rpdl
printer/Ricoh-RPDL_IV_Laser_Printer
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
rpdl
printer/Ricoh-RPDL_I_Laser_Printer
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
diff --git a/foomatic-db/db/source/opt/largeformat-PageSize.xml b/foomatic-db/db/source/opt/largeformat-PageSize.xml
index a0f4827..ef1d193 100644
--- a/foomatic-db/db/source/opt/largeformat-PageSize.xml
+++ b/foomatic-db/db/source/opt/largeformat-PageSize.xml
@@ -15,75 +15,75 @@
cdnj500
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
chp2200
printer/HP-DesignJet_100
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
chp2200
printer/HP-DesignJet_100plus
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
chp2200
printer/HP-DesignJet_110
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
chp2200
printer/HP-DesignJet_120
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
chp2200
printer/HP-DesignJet_130
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
chp2200
printer/HP-DesignJet_30
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
chp2200
printer/HP-DesignJet_5000
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
chp2200
printer/HP-DesignJet_5500
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
chp2200
printer/HP-DesignJet_70
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
chp2200
printer/HP-DesignJet_90
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
dnj650c
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
dnj750X.upp
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
Postscript1
printer/HP-DesignJet_3500CP
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
Postscript1
printer/HP-DesignJet_5500ps
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
diff --git a/foomatic-db/db/source/opt/min12xxw-DriverPageSize.xml b/foomatic-db/db/source/opt/min12xxw-DriverPageSize.xml
index 7a5ce67..0a9b78d 100644
--- a/foomatic-db/db/source/opt/min12xxw-DriverPageSize.xml
+++ b/foomatic-db/db/source/opt/min12xxw-DriverPageSize.xml
@@ -15,7 +15,7 @@
min12xxw
- ev/min12xxw-DriverPageSize-Letter
+ ev/min12xxw-DriverPageSize-A4
diff --git a/foomatic-db/db/source/opt/min12xxw-GSPageSize.xml b/foomatic-db/db/source/opt/min12xxw-GSPageSize.xml
index 6d2d0a3..753f05d 100644
--- a/foomatic-db/db/source/opt/min12xxw-GSPageSize.xml
+++ b/foomatic-db/db/source/opt/min12xxw-GSPageSize.xml
@@ -15,7 +15,7 @@
min12xxw
- ev/min12xxw-GSPageSize-Letter
+ ev/min12xxw-GSPageSize-A4
diff --git a/foomatic-db/db/source/opt/min12xxw-PageSize.xml b/foomatic-db/db/source/opt/min12xxw-PageSize.xml
index 87c3528..16e30a0 100644
--- a/foomatic-db/db/source/opt/min12xxw-PageSize.xml
+++ b/foomatic-db/db/source/opt/min12xxw-PageSize.xml
@@ -15,7 +15,7 @@
min12xxw
- ev/min12xxw-PageSize-Letter
+ ev/min12xxw-PageSize-A4
diff --git a/foomatic-db/db/source/opt/oki4w-PageSize.xml b/foomatic-db/db/source/opt/oki4w-PageSize.xml
index 586ed0f..65f31f7 100644
--- a/foomatic-db/db/source/opt/oki4w-PageSize.xml
+++ b/foomatic-db/db/source/opt/oki4w-PageSize.xml
@@ -15,7 +15,7 @@
oki4w
- ev/oki4w-PageSize-Letter
+ ev/oki4w-PageSize-A4
diff --git a/foomatic-db/db/source/opt/pbmtozjs-PageSize.xml b/foomatic-db/db/source/opt/pbmtozjs-PageSize.xml
index 8d87bc2..ce5abe0 100644
--- a/foomatic-db/db/source/opt/pbmtozjs-PageSize.xml
+++ b/foomatic-db/db/source/opt/pbmtozjs-PageSize.xml
@@ -15,7 +15,7 @@
pbmtozjs
- ev/pbmtozjs-PageSize-Letter
+ ev/pbmtozjs-PageSize-A4
diff --git a/foomatic-db/db/source/opt/pentaxpj-PageSize.xml b/foomatic-db/db/source/opt/pentaxpj-PageSize.xml
index 5826840..0ee9917 100644
--- a/foomatic-db/db/source/opt/pentaxpj-PageSize.xml
+++ b/foomatic-db/db/source/opt/pentaxpj-PageSize.xml
@@ -16,12 +16,12 @@
pentaxpj
printer/Pentax-PocketJet_200
- ev/pentaxpj-PageSize-200-Letter
+ ev/pentaxpj-PageSize-200-A4
pentaxpj
printer/Pentax-PocketJet_II
- ev/pentaxpj-PageSize-300-Letter
+ ev/pentaxpj-PageSize-300-A4
diff --git a/foomatic-db/db/source/opt/ppmtomd-PageSize.xml b/foomatic-db/db/source/opt/ppmtomd-PageSize.xml
index ef2a11e..637eb24 100644
--- a/foomatic-db/db/source/opt/ppmtomd-PageSize.xml
+++ b/foomatic-db/db/source/opt/ppmtomd-PageSize.xml
@@ -15,7 +15,7 @@
ppmtomd
- ev/ppmtomd-PageSize-Letter
+ ev/ppmtomd-PageSize-A4
diff --git a/foomatic-db/db/source/opt/sipixa6.upp-PageSize.xml b/foomatic-db/db/source/opt/sipixa6.upp-PageSize.xml
index 723a6a0..b1a6952 100644
--- a/foomatic-db/db/source/opt/sipixa6.upp-PageSize.xml
+++ b/foomatic-db/db/source/opt/sipixa6.upp-PageSize.xml
@@ -15,7 +15,7 @@
sipixa6.upp
- ev/sipixa6.upp-PageSize-Letter
+ ev/sipixa6.upp-PageSize-A4