diff --git a/cde/.gitignore b/cde/.gitignore
index 1f9fb6a60..0869c789f 100644
--- a/cde/.gitignore
+++ b/cde/.gitignore
@@ -205,6 +205,9 @@ programs/dtterm/dtterm.ti
 programs/dtwm/dtwm
 
 programs/localized/C/msg/*.nls
+programs/localized/*/types/*.dt
+programs/localized/*/types/*.nls
+programs/localized/*/types/*.tmsg
 programs/localized/de_DE.ISO8859-1/msg/*.tmp.msg
 programs/localized/es_ES.ISO8859-1/msg/*.tmp.msg
 programs/localized/fr_FR.ISO8859-1/msg/*.tmp.msg
@@ -1239,6 +1242,7 @@ programs/dtksh/ksh93/man/man1/sh.1
 programs/dtksh/ksh93/man/man3/nval.3
 
 # programs/localized
+programs/localized/C/types/*.dt
 programs/localized/C/types/*.dt.tmsg
 programs/localized/C/types/*.nls
 programs/localized/C/app-defaults/Dt
diff --git a/cde/databases/CDE-ICONS.udb b/cde/databases/CDE-ICONS.udb
index 0b489ccd1..acaa574e8 100644
--- a/cde/databases/CDE-ICONS.udb
+++ b/cde/databases/CDE-ICONS.udb
@@ -8624,4 +8624,23 @@ programs/icons/xv.t.pm
         install_target = /usr/dt/appconfig/icons/C/xv.t.pm
 }
 
+#
+programs/icons/camera.l.pm
+{ default
+        install_target = /usr/dt/appconfig/icons/C/camera.l.pm
+}
+
+#
+programs/icons/camera.m.pm
+{ default
+        install_target = /usr/dt/appconfig/icons/C/camera.m.pm
+}
+
+#
+programs/icons/camera.t.pm
+{ default
+        install_target = /usr/dt/appconfig/icons/C/camera.t.pm
+}
+
+
 
diff --git a/cde/databases/CDE-RUN.udb b/cde/databases/CDE-RUN.udb
index 454b83fbc..3f9471d2f 100644
--- a/cde/databases/CDE-RUN.udb
+++ b/cde/databases/CDE-RUN.udb
@@ -2310,7 +2310,35 @@ programs/localized/C/types/xpdf.dt
         install_target = /usr/dt/appconfig/types/C/xpdf.dt
 }
 
+#
+programs/localized/C/types/DisplayImage.dt
+{ default
+        install_target = /usr/dt/appconfig/types/C/DisplayImage.dt
+}
 
+#
+programs/localized/C/types/DisplayPDF.dt
+{ default
+        install_target = /usr/dt/appconfig/types/C/DisplayPDF.dt
+}
+
+#
+programs/localized/C/types/DisplayVideo.dt
+{ default
+        install_target = /usr/dt/appconfig/types/C/DisplayVideo.dt
+}
+
+#
+programs/localized/C/types/DisplayPS.dt
+{ default
+        install_target = /usr/dt/appconfig/types/C/DisplayPS.dt
+}
+
+#
+programs/localized/C/types/videoTypes.dt
+{ default
+        install_target = /usr/dt/appconfig/types/C/videoTypes.dt
+}
 
 
 #
@@ -2602,11 +2630,6 @@ programs/dtapp/dtapp
 	type = sym_link
 }
 ./dtapp
-{ default
-        install_target = /usr/dt/bin/dtapp_vweb
-	type = sym_link
-}
-./dtapp
 { default
         install_target = /usr/dt/bin/dtapp_vpdf
 	type = sym_link
diff --git a/cde/programs/dtapp/dtapp.src b/cde/programs/dtapp/dtapp.src
index 02a94e915..7b1cec18a 100755
--- a/cde/programs/dtapp/dtapp.src
+++ b/cde/programs/dtapp/dtapp.src
@@ -23,23 +23,15 @@ fi
 XCOMM video viewing
 if [ -z "$DTAPP_VVIDEO" ]
 then
-    VVIDEO="mplayer vlc ffplay"
+    VVIDEO="vlc ffplay"
 else
     VVIDEO="$DTAPP_VVIDEO"
 fi
 
-XCOMM web (html) viewing
-if [ -z "$DTAPP_VWEB" ]
-then
-    VWEB="firefox chrome chromium-browser lynx"
-else
-    VWEB="$DTAPP_VWEB"
-fi
-
 XCOMM postscript viewing
 if [ -z "$DTAPP_VPS" ]
 then
-    VPS="gv"
+    VPS="mgv gv"
 else
     VPS="$DTAPP_VPS"
 fi
@@ -100,7 +92,7 @@ DoSimpleCmd()
 
         if [ ! -z "$thecmd" ]
         then    # it's there
-            $thecmd $*
+            $thecmd "$args"
             didone=1
             break
         fi
@@ -116,58 +108,6 @@ DoSimpleCmd()
 }
 
 
-XCOMM ###############################################################
-XCOMM ### Actions
-
-XCOMM ## Web browsing
-DoWeb()
-{
-    # DoWeb [[arg] ...]
-
-    didone=0
-    url="$1"
-
-    for i in $VWEB
-    do
-        thecmd="$(FindProg $i)"
-
-        if [ ! -z "$thecmd" ]
-        then    # it's there
-
-            # We'll do special things for lynx,
-            #  else we'll just call whatever is available, and
-            #  hope it's X aware...
-
-            case $i in
-                lynx)
-                    # start a dtterm
-                    CDE_INSTALLATION_TOP/bin/dtterm -e $thecmd $url
-                    didone=1
-                    ;;
-                *)
-                    # any others
-                    $thecmd $url
-                    didone=1
-                    ;;
-            esac
-
-            if [ $didone -eq 1 ]
-            then
-                break
-            fi
-        fi
-    done
-
-    if [ $didone -eq 0 ]
-    then    # couldn't find a viewer
-        ErrorMsg "Helper not found" \
-                 "${DTAPP}: Could not find any of the following\nweb browsers:\n\n$VWEB"
-    fi
-
-
-    return 0
-}
-
 XCOMM ##################################################################
 XCOMM ## MAIN
 
@@ -181,9 +121,6 @@ case $APPNAME in
     dtapp_vimage)
         DoSimpleCmd "$VIMAGE" $*
         ;;
-    dtapp_vweb)
-        DoWeb $*
-        ;;
     dtapp_vpdf)
         DoSimpleCmd "$VPDF" $*
         ;;
diff --git a/cde/programs/icons/camera.l.pm b/cde/programs/icons/camera.l.pm
new file mode 100644
index 000000000..b754fa416
--- /dev/null
+++ b/cde/programs/icons/camera.l.pm
@@ -0,0 +1,61 @@
+/* XPM */
+static char * IMdisplay_l_pm[] = {
+/* width height ncolors cpp [x_hot y_hot] */
+"48 48 7 1 0 0",
+/* colors */
+" 	s none	m none	c none",
+".	s iconColor1	m black	c black",
+"X	s iconColor2	m white	c white",
+"o	c #808080808080",
+"O	c #C0C0C0C0C0C0",
+"+	s iconGray6	m black	c #636363636363",
+"@	s iconGray5	m black	c #737373737373",
+/* pixels */
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                      .....                     ",
+"                    ..XXXXo..                   ",
+"                    ..XXXXo..                   ",
+"          ...      .OOOOOO.oo.   ......         ",
+"         .XXX......OOOOOOOO......XXXXoo....     ",
+"        ..XXX......OOOOOOOO......XXXXoo....     ",
+"      ..O......OO..oooooooo..oOO.......oOOO.    ",
+"     .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXO++.    ",
+"    .XOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO+++.    ",
+"    .XOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO+++.    ",
+"    .XOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO+++.    ",
+"    .XOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO+...    ",
+"    .XOOOOOOOOOOOOO......OOOOOOOOOOOOOOO+...    ",
+"    ...............XXXXX....................    ",
+"    ............OOOOOOOXXX...............++.    ",
+"    ..........OO.......OOOo.............+++.    ",
+"    .........OOO.......OOOoo............+++.    ",
+"    ........Ooo.@@@@@@@.ooO.............+++.    ",
+"    ........O..@@@OXOO@@..Ooo...........+++.    ",
+"    ........O..@@OOXO@@@..Ooo...........+++.    ",
+"    .......O.@@@OXX@@@@@@@.O............+++.    ",
+"    .......O.@@@XO@@@@@@@@.OO...........+++.    ",
+"    .......O.@@@X@@@@@@@@@.OO...........+++.    ",
+"    .......O.@@@X@@@@@@@@@.OO...........+++.    ",
+"    .......O.@@@O@@@@@@@@@.OO...........+++.    ",
+"    .......O.@@@@@@@@@@@@@.OO...........+++.    ",
+"    .......O.@@@@@@@@@@@@@.O............+++.    ",
+"    ........O..@@@@@@@@@..O.............+...    ",
+"    ........Ooo.@@@@@@@.ooO.............+..     ",
+"     ........OOO.......OOO...............       ",
+"     .........OO.......OOO...............       ",
+"      .........oOOOOOOOo................        ",
+"                .......                         ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                ",
+"                                                "};
diff --git a/cde/programs/icons/camera.m.pm b/cde/programs/icons/camera.m.pm
new file mode 100644
index 000000000..ce1e54556
--- /dev/null
+++ b/cde/programs/icons/camera.m.pm
@@ -0,0 +1,45 @@
+/* XPM */
+static char * IMdisplay_m_pm[] = {
+/* width height ncolors cpp [x_hot y_hot] */
+"32 32 7 1 0 0",
+/* colors */
+" 	s none	m none	c none",
+".	s iconColor1	m black	c black",
+"X	s iconColor2	m white	c white",
+"o	c #808080808080",
+"O	c #C0C0C0C0C0C0",
+"+	s iconGray6	m black	c #636363636363",
+"@	s iconGray5	m black	c #737373737373",
+/* pixels */
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"              ....              ",
+"             .XXXo.             ",
+"      ..    .OOOO.o.  ....      ",
+"    ..XX....OOOOOO....XXXo...   ",
+"   .O....OO.oooooo.oO.....oOO.  ",
+"  .XXXXXXXXXXXXXXXXXXXXXXXXO+.  ",
+" .XOOOOOOOOOOOOOOOOOOOOOOOO++.  ",
+" .XOOOOOOOOOOOOOOOOOOOOOOOO++.  ",
+" .XOOOOOOOOO.....OOOOOOOOOO+..  ",
+" ...........XXXX..............  ",
+" .........OOOOOXX...........+.  ",
+" .......OO.....OOoo........++.  ",
+" ......Oo.@@@@@.oO.........++.  ",
+" ......O.@@OXO@@.Oo........++.  ",
+" .....O.@@OX@@@@@.O........++.  ",
+" .....O.@@XO@@@@@.O........++.  ",
+" .....O.@@X@@@@@@.O........++.  ",
+" .....O.@@O@@@@@@.O........++.  ",
+" .....O.@@@@@@@@@.O........++.  ",
+" ......O.@@@@@@@.O.........+..  ",
+" ......Oo.@@@@@.oO.........+.   ",
+"  ......OO.....OO...........    ",
+"   ......oOOOOOo...........     ",
+"          .....                 ",
+"                                ",
+"                                ",
+"                                ",
+"                                "};
diff --git a/cde/programs/icons/camera.t.pm b/cde/programs/icons/camera.t.pm
new file mode 100644
index 000000000..09fd6165c
--- /dev/null
+++ b/cde/programs/icons/camera.t.pm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * IMdisplay_t_pm[] = {
+/* width height ncolors cpp [x_hot y_hot] */
+"16 16 7 1 0 0",
+/* colors */
+" 	s none	m none	c none",
+".	s iconColor1	m black	c black",
+"X	s iconColor2	m white	c white",
+"o	c #C0C0C0C0C0C0",
+"O	s iconGray6	m black	c #636363636363",
+"+	c #808080808080",
+"@	s iconGray5	m black	c #737373737373",
+/* pixels */
+"                ",
+"                ",
+"      .XX.      ",
+"  .X..ooo..XX.. ",
+" XXXXXXXXXXXXXO ",
+".oooooooooooooO ",
+"......XX....... ",
+"....o..oo+....O ",
+"...o.@@.+.....O ",
+"....@X@@@o....O ",
+"....@@@@@o....O ",
+"....@@@@@o....O ",
+"...o.@@.+...... ",
+" ...+oo+......  ",
+"                ",
+"                "};
diff --git a/cde/programs/localized/C/types/datatypes.dt b/cde/programs/localized/C/types/datatypes.dt
index 30f5d59d2..70468998b 100644
--- a/cde/programs/localized/C/types/datatypes.dt
+++ b/cde/programs/localized/C/types/datatypes.dt
@@ -200,15 +200,8 @@ ACTION Open
 {
 	LABEL		Open
         ARG_TYPE        POSTSCRIPT
-        TYPE            COMMAND
-        WINDOW_TYPE     NO_STDIO
-        EXEC_STRING     /usr/dt/bin/dterror.ds                            "Cannot open - No Postscript viewer available."                            "Information"                            "OK"
-
-
-
-        DESCRIPTION     Your system does not provide a postscript viewer. \
-                        Attempting to open this file displays an error \
-                        dialog box.
+        TYPE            MAP
+        MAP_ACTION      DisplayPS
 }
 ACTION Print
 {
@@ -373,7 +366,7 @@ ACTION Print
 DATA_ATTRIBUTES TIFF
 {
         ACTIONS         Open
-        ICON            Dttif
+        ICON            Dtimage
         NAME_TEMPLATE	%s.tif
         MIME_TYPE	image/tiff
         SUNV3_TYPE	tiff-file
@@ -422,15 +415,9 @@ ACTION Open
 {
 	LABEL		Open
         ARG_TYPE        TIFF
-        TYPE            COMMAND
-        WINDOW_TYPE     NO_STDIO
-        EXEC_STRING     /usr/dt/bin/dterror.ds                            "Cannot open - No TIFF file viewer available."                            "Information"                            "OK"
-
-
-
-        DESCRIPTION     Your system does not provide a TIFF viewer.  \
-                        Attempting to open this file displays an error \
-                        dialog box.
+	TYPE            MAP
+	MAP_ACTION		DisplayImage
+	DESCRIPTION     Use the tiff viewer
 }
 ACTION Print
 {
@@ -445,7 +432,7 @@ ACTION Print
 DATA_ATTRIBUTES JPEG
 {
         ACTIONS         Open
-        ICON            Dtjpeg
+        ICON            Dtimage
         NAME_TEMPLATE	%s.jpg
         MIME_TYPE	image/jpeg
         SUNV3_TYPE	jpeg-file
@@ -495,15 +482,9 @@ ACTION Open
 {
 	LABEL		Open
         ARG_TYPE        JPEG
-        TYPE            COMMAND
-        WINDOW_TYPE     NO_STDIO
-        EXEC_STRING     /usr/dt/bin/dterror.ds                            "Cannot open - No JPEG file viewer available."                            "Information"                            "OK"
-
-
-
-        DESCRIPTION     Your system does not provide a JPEG viewer.  \
-                        Attempting to open this file displays an \
-                        error dialog box. 
+	TYPE            MAP
+	MAP_ACTION	DisplayImage
+	DESCRIPTION     Use the jpeg viewer
 }
 ACTION Print
 {
@@ -513,78 +494,82 @@ ACTION Print
         MAP_ACTION	NoPrint
 }
 
-# #######################################################
+# #####################################################################
+# ## BMP
 
-DATA_ATTRIBUTES MPEG
+DATA_ATTRIBUTES BMP
 {
-        ACTIONS         Open
-        ICON            Dtmpeg
-        NAME_TEMPLATE	%s.mpg
-        MIME_TYPE	video/mpeg
-        DESCRIPTION     This file contains a graphics image movie in MPEG \
-                        Interchange File Format.  Its data type is \
-                        named MPEG. MPEG files have names ending with \
-                        '.MPEG', '.mpg', '.mpeg', or '.MPG'.
-        TYPE_LABEL      MPEG
+	ACTIONS		Open
+	ICON		Dtimage
+	DESCRIPTION	This file contains a graphics image in 	                BMP format.  Its data type is named BMP. BMP files 	                have names ending with '.bmp', '.BMP' or '.Bmp'.
+
+
 }
-DATA_CRITERIA MPEG1
+DATA_CRITERIA BMP1
 {
-        DATA_ATTRIBUTES_NAME MPEG
-        MODE            f
-        NAME_PATTERN    *.MPEG
+	DATA_ATTRIBUTES_NAME BMP
+	MODE			f
+	PATH_PATTERN	*.bmp
 }
-DATA_CRITERIA MPEG2
+DATA_CRITERIA BMP2
 {
-        DATA_ATTRIBUTES_NAME MPEG
-        MODE            f
-        NAME_PATTERN    *.mpg
+	DATA_ATTRIBUTES_NAME BMP
+	MODE			f
+	PATH_PATTERN	*.BMP
 }
-DATA_CRITERIA MPEG3
+DATA_CRITERIA BMP3
 {
-        DATA_ATTRIBUTES_NAME MPEG
-        MODE            f
-        NAME_PATTERN    *.mpeg
+	DATA_ATTRIBUTES_NAME BMP
+	MODE			f
+	PATH_PATTERN	*.Bmp
 }
-DATA_CRITERIA MPEG4
+DATA_CRITERIA BMP4
 {
-        DATA_ATTRIBUTES_NAME MPEG
-        MODE            f
-        NAME_PATTERN    *.MPG
+	DATA_ATTRIBUTES_NAME    BMP
+	CONTENT 		0 string BM
+	MODE            f
 }
-DATA_CRITERIA MPEG5
+DATA_CRITERIA BMP4
 {
-        DATA_ATTRIBUTES_NAME MPEG
-        MODE            f
-        CONTENT         0 long 0x000001b3
+	DATA_ATTRIBUTES_NAME    BMP
+	CONTENT 		0 string IC
+	MODE            f
+}
+DATA_CRITERIA BMP4
+{
+	DATA_ATTRIBUTES_NAME    BMP
+	CONTENT 		0 string CI
+	MODE            f
+}
+DATA_CRITERIA BMP4
+{
+	DATA_ATTRIBUTES_NAME    BMP
+	CONTENT 		0 string CP
+	MODE            f
 }
 ACTION Open
 {
-        LABEL           Open
-        ARG_TYPE        MPEG
-        TYPE            COMMAND
-        WINDOW_TYPE     NO_STDIO
-        EXEC_STRING     /usr/dt/bin/dterror.ds                           "Cannot open - No MPEG player available."                           "Information"                           "OK"
-
-
-
-        DESCRIPTION     Your system does not provide a MPEG viewer.  \
-                        Attempting to open this file displays an error \
-                        dialog box.
+	LABEL		Open
+	ARG_TYPE		BMP
+	TYPE			MAP
+	MAP_ACTION		DisplayImage
+	DESCRIPTION		Use the bitmap viewer
 }
 ACTION Print
 {
         LABEL           Print
-        ARG_TYPE        MPEG
-        TYPE            MAP
-        MAP_ACTION	NoPrint
+	ARG_TYPE		BMP
+	TYPE			MAP
+	MAP_ACTION		NoPrint
 }
 
+
 # #######################################################
 
 DATA_ATTRIBUTES GIF
 {
         ACTIONS         Open
-        ICON		Dtgif
+        ICON		Dtimage
         NAME_TEMPLATE	%s.gif
         MIME_TYPE	image/gif
         SUNV3_TYPE	gif-file
@@ -622,15 +607,9 @@ ACTION Open
 {
         LABEL           Open
         ARG_TYPE        GIF
-        TYPE            COMMAND
-        WINDOW_TYPE     NO_STDIO
-        EXEC_STRING     /usr/dt/bin/dterror.ds                            "Cannot open - No GIF file viewer available."                            "Information"                            "OK"
-
-
-
-        DESCRIPTION     Your system does not provide a GIF viewer. \
-                        Attempting to open this file displays an error \
-                        dialog box.
+	TYPE            MAP
+	MAP_ACTION		DisplayImage
+	DESCRIPTION     Use the gif viewer
 }
 ACTION Print
 {
@@ -640,6 +619,60 @@ ACTION Print
         MAP_ACTION	NoPrint
 }
 
+# #######################################################################
+# ## PNG
+
+DATA_ATTRIBUTES PNG
+{
+	ACTIONS         Open
+	ICON		Dtimage
+	NAME_TEMPLATE	%s.png
+	MIME_TYPE		image/png
+	DESCRIPTION		This file contains a graphics image in PNG format. 	                Its data type is named PNG.  PNG files have 	                names ending with .png or .PNG
+
+
+	TYPE_LABEL      PNG
+}
+DATA_CRITERIA PNG1
+{
+	DATA_ATTRIBUTES_NAME PNG
+	MODE            f
+	NAME_PATTERN	*.png
+}
+DATA_CRITERIA PNG2
+{
+	DATA_ATTRIBUTES_NAME PNG
+	MODE            f
+	NAME_PATTERN	*.PNG
+}
+DATA_CRITERIA PNG3
+{
+	DATA_ATTRIBUTES_NAME    PNG
+	CONTENT 		0 string PNG
+	MODE            f
+}
+DATA_CRITERIA PNG4
+{
+	DATA_ATTRIBUTES_NAME    PNG
+	CONTENT 		0 byte 0x89 0x50 0x4e 0x47 
+	MODE            f
+}
+ACTION Open
+{
+        LABEL           Open
+	ARG_TYPE        PNG
+	TYPE            MAP
+	MAP_ACTION	DisplayImage
+	DESCRIPTION     Use the png viewer
+}
+ACTION Print
+{
+        LABEL           Print
+	ARG_TYPE        PNG
+	TYPE            MAP
+	MAP_ACTION		NoPrint
+}
+
 # #######################################################
 
 DATA_ATTRIBUTES README
@@ -858,4 +891,51 @@ ACTION Print
         MAP_ACTION	NoPrint
 }
 
+# #####################################################################
+# ## PDF
+
+DATA_ATTRIBUTES PDF
+{
+	ACTIONS			Open,Print
+	ICON			acroread
+	NAME_TEMPLATE	%s.pdf
+	MIME_TYPE		application/pdf
+	DESCRIPTION		This file contains pdf data. Its data type 					is named PDF.  PDF files have names ending with '.pdf' 					or '.PDF', or contain the characters "%PDF".
+
+
+	TYPE_LABEL		PDF
+}
+DATA_CRITERIA PDF1
+{
+	DATA_ATTRIBUTES_NAME PDF
+	MODE			f&!x
+	NAME_PATTERN	*.pdf
+}
+DATA_CRITERIA PDF2
+{
+	DATA_ATTRIBUTES_NAME PDF
+	MODE			f&!x
+	NAME_PATTERN	*.PDF
+}
+DATA_CRITERIA PDF3
+{
+	DATA_ATTRIBUTES_NAME	PDF
+	CONTENT 		0 string %PDF
+	MODE			f&!x
+}
+ACTION Open
+{
+	LABEL			Open
+	ARG_TYPE		PDF
+	TYPE			MAP
+	MAP_ACTION		DisplayPDF
+}
+ACTION Print
+{
+	LABEL			Print
+	ARG_TYPE		PDF
+	TYPE			MAP
+	MAP_ACTION		DisplayPDF
+}
+
 # ######################## EOF ############################################
diff --git a/cde/programs/localized/C/types/vlc.dt b/cde/programs/localized/C/types/vlc.dt
deleted file mode 100644
index ff35da673..000000000
--- a/cde/programs/localized/C/types/vlc.dt
+++ /dev/null
@@ -1,123 +0,0 @@
-######################################################################
-#
-#    Common Desktop Environment (CDE)
-#
-#    Action and DataType Definition File
-#
-#      Generated by the CreateAction tool
-#
-#      $Revision: 1.0
-#
-#      $KEY: 4747  
-#
-######################################################################
-#
-#    WARNING:
-#
-#    This file was generated by the CDE CreateAction tool.
-#    If this file is modified by some other tool, such as vi,
-#    the CreateAction tool will no longer be able to load and
-#    update this file.  For this reason, changes to this file
-#    should be handled through CreateAction whenever possible.
-#
-######################################################################
-
-ACTION vlc
-{
-     LABEL         vlc
-     TYPE          COMMAND
-     EXEC_STRING   vlc "%Arg_1%"
-     ICON          vlc
-     WINDOW_TYPE   NO_STDIO
-     DESCRIPTION   VLC Media Player
-}
-
-DATA_ATTRIBUTES vlc_FILE_1
-{
-     ACTIONS       Open
-     ICON          mp3
-     DESCRIPTION   MP3 files open with VLC Media Player.
-}
-
-DATA_CRITERIA vlc_FILE_1A
-{
-     DATA_ATTRIBUTES_NAME vlc_FILE_1
-     MODE          !d
-     PATH_PATTERN  *.mp3
-}
-
-ACTION Open
-{
-     ARG_TYPE      vlc_FILE_1
-     TYPE          MAP
-     MAP_ACTION    vlc
-     LABEL         Open
-}
-
-DATA_ATTRIBUTES vlc_FILE_3
-{
-     ACTIONS       Open
-     ICON          mp3
-     DESCRIPTION   OGG files open with VLC Media Player.
-}
-
-DATA_CRITERIA vlc_FILE_3A
-{
-     DATA_ATTRIBUTES_NAME vlc_FILE_3
-     MODE          !d
-     PATH_PATTERN  *.ogg
-}
-
-ACTION Open
-{
-     ARG_TYPE      vlc_FILE_3
-     TYPE          MAP
-     MAP_ACTION    vlc
-     LABEL         Open
-}
-
-
-DATA_ATTRIBUTES vlc_FILE_5
-{
-     ACTIONS       Open
-     ICON          video
-     DESCRIPTION   mp4 files open with VLC Media Player.
-}
-
-DATA_CRITERIA vlc_FILE_5A
-{
-     DATA_ATTRIBUTES_NAME vlc_FILE_5
-     MODE          !d
-     PATH_PATTERN  *.mp4
-}
-
-ACTION Open
-{
-     ARG_TYPE      vlc_FILE_5
-     TYPE          MAP
-     MAP_ACTION    vlc
-     LABEL         Open
-}
-
-DATA_ATTRIBUTES vlc_FILE_7
-{
-     ACTIONS       Open
-     ICON          video
-     DESCRIPTION   avi files open with VLC Media Player.
-}
-
-DATA_CRITERIA vlc_FILE_7A
-{
-     DATA_ATTRIBUTES_NAME vlc_FILE_7
-     MODE          !d
-     PATH_PATTERN  *.avi
-}
-
-ACTION Open
-{
-     ARG_TYPE      vlc_FILE_7
-     TYPE          MAP
-     MAP_ACTION    vlc
-     LABEL         Open
-}
-
diff --git a/cde/programs/localized/C/types/xv.dt b/cde/programs/localized/C/types/xv.dt
deleted file mode 100644
index 8ae22ac50..000000000
--- a/cde/programs/localized/C/types/xv.dt
+++ /dev/null
@@ -1,114 +0,0 @@
-######################################################################
-#
-#    Common Desktop Environment (CDE)
-#
-#    Action and DataType Definition File
-#
-#      Generated by the CreateAction tool
-#
-#      $Revision: 1.0
-#
-#      $KEY: 108   
-#
-######################################################################
-#
-#    WARNING:
-#
-#    This file was generated by the CDE CreateAction tool.
-#    If this file is modified by some other tool, such as vi,
-#    the CreateAction tool will no longer be able to load and
-#    update this file.  For this reason, changes to this file
-#    should be handled through CreateAction whenever possible.
-#
-######################################################################
-
-ACTION xv
-{
-     LABEL         xv
-     TYPE          COMMAND
-     EXEC_STRING   xv "%Arg_1%"
-     ICON          xv
-     WINDOW_TYPE   NO_STDIO
-     DESCRIPTION   xv image viewer.
-}
-
-DATA_ATTRIBUTES xv_FILE_1
-{
-     ACTIONS       Open,Print
-     ICON          xv
-     DESCRIPTION   Open image in xv.
-}
-
-DATA_CRITERIA xv_FILE_1A
-{
-     DATA_ATTRIBUTES_NAME xv_FILE_1
-     MODE          !d
-     PATH_PATTERN  *.jpg
-}
-
-ACTION Open
-{
-     ARG_TYPE      xv_FILE_1
-     TYPE          MAP
-     MAP_ACTION    xv
-     LABEL         Open
-}
-
-ACTION xv_FILE_1_PRINT
-{
-     TYPE          COMMAND
-     EXEC_STRING   xv "%Arg_1%"
-     WINDOW_TYPE   NO_STDIO
-}
-
-ACTION Print
-{
-     ARG_TYPE      xv_FILE_1
-     TYPE          MAP
-     MAP_ACTION    xv_FILE_1_PRINT
-     LABEL         Print
-}
-
-
-
-####
-DATA_ATTRIBUTES xv_FILE_3
-{
-     ACTIONS       Open,Print
-     ICON          xv
-     DESCRIPTION   Open image in xv.
-}
-
-DATA_CRITERIA xv_FILE_3A
-{
-     DATA_ATTRIBUTES_NAME xv_FILE_3
-     MODE          !d
-     PATH_PATTERN  *.png
-}
-
-ACTION Open
-{
-     ARG_TYPE      xv_FILE_3
-     TYPE          MAP
-     MAP_ACTION    xv
-     LABEL         Open
-}
-
-ACTION xv_FILE_3_PRINT
-{
-     TYPE          COMMAND
-     EXEC_STRING   xv "%Arg_1%"
-     WINDOW_TYPE   NO_STDIO
-}
-
-ACTION Print
-{
-     ARG_TYPE      xv_FILE_3
-     TYPE          MAP
-     MAP_ACTION    xv_FILE_3_PRINT
-     LABEL         Print
-}
-
-
-
-
diff --git a/cde/programs/localized/templates/types.tmpl b/cde/programs/localized/templates/types.tmpl
index 8db1bbbb6..29bd3caea 100644
--- a/cde/programs/localized/templates/types.tmpl
+++ b/cde/programs/localized/templates/types.tmpl
@@ -29,7 +29,11 @@ OBJS1 =  \
 	dtbuilder.dt \
 	miscActions.dt \
 	miscImages.dt \
-	IconBrowse.dt
+	IconBrowse.dt \
+	DisplayImage.dt \
+	DisplayPDF.dt \
+	DisplayVideo.dt \
+	DisplayPS.dt
 
 OBJS = $(OBJS1)
 
@@ -74,6 +78,76 @@ LinkFile(miscActions.dt.nls,$(CDESRC)/types/miscActions.dt)
 LinkFile(miscImages.dt.nls,$(CDESRC)/types/miscImages.dt)
 LinkFile(IconBrowse.dt.nls,$(CDESRC)/types/IconBrowse.dt)
 
+LinkFile(DisplayImage.dt.nls,$(CDESRC)/types/DisplayImage.dt)
+LinkFile(DisplayPDF.dt.nls,$(CDESRC)/types/DisplayPDF.dt)
+LinkFile(DisplayVideo.dt.nls,$(CDESRC)/types/DisplayVideo.dt)
+LinkFile(DisplayPS.dt.nls,$(CDESRC)/types/DisplayPS.dt)
+LinkFile(acroread.dt.nls,$(CDESRC)/types/acroread.dt)
+LinkFile(videoTypes.dt.nls,$(CDESRC)/types/videoTypes.dt)
+LinkFile(amarok.dt.nls,$(CDESRC)/types/amarok.dt)
+LinkFile(brasero.dt.nls,$(CDESRC)/types/brasero.dt)
+LinkFile(caja.dt.nls,$(CDESRC)/types/caja.dt)
+LinkFile(chromium.dt.nls,$(CDESRC)/types/chromium.dt)
+LinkFile(dreamchess.dt.nls,$(CDESRC)/types/dreamchess.dt)
+LinkFile(eboard.dt.nls,$(CDESRC)/types/eboard.dt)
+LinkFile(Education.dt.nls,$(CDESRC)/types/Education.dt)
+LinkFile(emacs.dt.nls,$(CDESRC)/types/emacs.dt)
+LinkFile(engrampa.dt.nls,$(CDESRC)/types/engrampa.dt)
+LinkFile(file-roller.dt.nls,$(CDESRC)/types/file-roller.dt)
+LinkFile(firefox.dt.nls,$(CDESRC)/types/firefox.dt)
+LinkFile(firestarter.dt.nls,$(CDESRC)/types/firestarter.dt)
+LinkFile(fontforge.dt.nls,$(CDESRC)/types/fontforge.dt)
+LinkFile(Games.dt.nls,$(CDESRC)/types/Games.dt)
+LinkFile(gcompris.dt.nls,$(CDESRC)/types/gcompris.dt)
+LinkFile(geogebra.dt.nls,$(CDESRC)/types/geogebra.dt)
+LinkFile(gimp.dt.nls,$(CDESRC)/types/gimp.dt)
+LinkFile(Graphics.dt.nls,$(CDESRC)/types/Graphics.dt)
+LinkFile(gv.dt.nls,$(CDESRC)/types/gv.dt)
+LinkFile(inkscape.dt.nls,$(CDESRC)/types/inkscape.dt)
+LinkFile(Internet.dt.nls,$(CDESRC)/types/Internet.dt)
+LinkFile(k3b.dt.nls,$(CDESRC)/types/k3b.dt)
+LinkFile(k9copy.dt.nls,$(CDESRC)/types/k9copy.dt)
+LinkFile(kile.dt.nls,$(CDESRC)/types/kile.dt)
+LinkFile(ktuberling.dt.nls,$(CDESRC)/types/ktuberling.dt)
+LinkFile(lbreakout2.dt.nls,$(CDESRC)/types/lbreakout2.dt)
+LinkFile(libreoffice-base.dt.nls,$(CDESRC)/types/libreoffice-base.dt)
+LinkFile(libreoffice-calc.dt.nls,$(CDESRC)/types/libreoffice-calc.dt)
+LinkFile(libreoffice-draw.dt.nls,$(CDESRC)/types/libreoffice-draw.dt)
+LinkFile(libreoffice-impress.dt.nls,$(CDESRC)/types/libreoffice-impress.dt)
+LinkFile(libreoffice-main.dt.nls,$(CDESRC)/types/libreoffice-main.dt)
+LinkFile(libreoffice-math.dt.nls,$(CDESRC)/types/libreoffice-math.dt)
+LinkFile(libreoffice-writer.dt.nls,$(CDESRC)/types/libreoffice-writer.dt)
+LinkFile(Media_Tools.dt.nls,$(CDESRC)/types/Media_Tools.dt)
+LinkFile(mgv.dt.nls,$(CDESRC)/types/mgv.dt)
+LinkFile(nedit.dt.nls,$(CDESRC)/types/nedit.dt)
+LinkFile(nxclient.dt.nls,$(CDESRC)/types/nxclient.dt)
+LinkFile(Office.dt.nls,$(CDESRC)/types/Office.dt)
+LinkFile(okular.dt.nls,$(CDESRC)/types/okular.dt)
+LinkFile(pavucontrol.dt.nls,$(CDESRC)/types/pavucontrol.dt)
+LinkFile(pgadmin.dt.nls,$(CDESRC)/types/pgadmin.dt)
+LinkFile(powermanga.dt.nls,$(CDESRC)/types/powermanga.dt)
+LinkFile(pychess.dt.nls,$(CDESRC)/types/pychess.dt)
+LinkFile(rhythmbox.dt.nls,$(CDESRC)/types/rhythmbox.dt)
+LinkFile(rosegarden.dt.nls,$(CDESRC)/types/rosegarden.dt)
+LinkFile(skype.dt.nls,$(CDESRC)/types/skype.dt)
+LinkFile(sound-juicer.dt.nls,$(CDESRC)/types/sound-juicer.dt)
+LinkFile(stellarium.dt.nls,$(CDESRC)/types/stellarium.dt)
+LinkFile(supertux.dt.nls,$(CDESRC)/types/supertux.dt)
+LinkFile(synaptic.dt.nls,$(CDESRC)/types/synaptic.dt)
+LinkFile(System.dt.nls,$(CDESRC)/types/System.dt)
+LinkFile(TeX.dt.nls,$(CDESRC)/types/TeX.dt)
+LinkFile(thunderbird.dt.nls,$(CDESRC)/types/thunderbird.dt)
+LinkFile(tuxpaint.dt.nls,$(CDESRC)/types/tuxpaint.dt)
+LinkFile(virtualbox.dt.nls,$(CDESRC)/types/virtualbox.dt)
+LinkFile(vlc.dt.nls,$(CDESRC)/types/vlc.dt)
+LinkFile(wicd.dt.nls,$(CDESRC)/types/wicd.dt)
+LinkFile(xboard.dt.nls,$(CDESRC)/types/xboard.dt)
+LinkFile(xdvi.dt.nls,$(CDESRC)/types/xdvi.dt)
+LinkFile(xine.dt.nls,$(CDESRC)/types/xine.dt)
+LinkFile(xournal.dt.nls,$(CDESRC)/types/xournal.dt)
+LinkFile(xpdf.dt.nls,$(CDESRC)/types/xpdf.dt)
+LinkFile(xv.dt.nls,$(CDESRC)/types/xv.dt)
+
 #ifdef HPArchitecture
 LinkFile(hp.dt.nls,$(CDESRC)/types/hp.dt)
 #endif
@@ -106,6 +180,76 @@ LinkFile(miscActions.dt.tmsg,_common.dt.tmsg)
 LinkFile(miscImages.dt.tmsg,_common.dt.tmsg)
 LinkFile(IconBrowse.dt.tmsg,_common.dt.tmsg)
 
+LinkFile(DisplayImage.dt.tmsg,_common.dt.tmsg)
+LinkFile(DisplayPDF.dt.tmsg,_common.dt.tmsg)
+LinkFile(DisplayVideo.dt.tmsg,_common.dt.tmsg)
+LinkFile(DisplayPS.dt.tmsg,_common.dt.tmsg)
+LinkFile(acroread.dt.tmsg,_common.dt.tmsg)
+LinkFile(videoTypes.dt.tmsg,_common.dt.tmsg)
+LinkFile(amarok.dt.tmsg,_common.dt.tmsg)
+LinkFile(brasero.dt.tmsg,_common.dt.tmsg)
+LinkFile(caja.dt.tmsg,_common.dt.tmsg)
+LinkFile(chromium.dt.tmsg,_common.dt.tmsg)
+LinkFile(dreamchess.dt.tmsg,_common.dt.tmsg)
+LinkFile(eboard.dt.tmsg,_common.dt.tmsg)
+LinkFile(Education.dt.tmsg,_common.dt.tmsg)
+LinkFile(emacs.dt.tmsg,_common.dt.tmsg)
+LinkFile(engrampa.dt.tmsg,_common.dt.tmsg)
+LinkFile(file-roller.dt.tmsg,_common.dt.tmsg)
+LinkFile(firefox.dt.tmsg,_common.dt.tmsg)
+LinkFile(firestarter.dt.tmsg,_common.dt.tmsg)
+LinkFile(fontforge.dt.tmsg,_common.dt.tmsg)
+LinkFile(Games.dt.tmsg,_common.dt.tmsg)
+LinkFile(gcompris.dt.tmsg,_common.dt.tmsg)
+LinkFile(geogebra.dt.tmsg,_common.dt.tmsg)
+LinkFile(gimp.dt.tmsg,_common.dt.tmsg)
+LinkFile(Graphics.dt.tmsg,_common.dt.tmsg)
+LinkFile(gv.dt.tmsg,_common.dt.tmsg)
+LinkFile(inkscape.dt.tmsg,_common.dt.tmsg)
+LinkFile(Internet.dt.tmsg,_common.dt.tmsg)
+LinkFile(k3b.dt.tmsg,_common.dt.tmsg)
+LinkFile(k9copy.dt.tmsg,_common.dt.tmsg)
+LinkFile(kile.dt.tmsg,_common.dt.tmsg)
+LinkFile(ktuberling.dt.tmsg,_common.dt.tmsg)
+LinkFile(lbreakout2.dt.tmsg,_common.dt.tmsg)
+LinkFile(libreoffice-base.dt.tmsg,_common.dt.tmsg)
+LinkFile(libreoffice-calc.dt.tmsg,_common.dt.tmsg)
+LinkFile(libreoffice-draw.dt.tmsg,_common.dt.tmsg)
+LinkFile(libreoffice-impress.dt.tmsg,_common.dt.tmsg)
+LinkFile(libreoffice-main.dt.tmsg,_common.dt.tmsg)
+LinkFile(libreoffice-math.dt.tmsg,_common.dt.tmsg)
+LinkFile(libreoffice-writer.dt.tmsg,_common.dt.tmsg)
+LinkFile(Media_Tools.dt.tmsg,_common.dt.tmsg)
+LinkFile(mgv.dt.tmsg,_common.dt.tmsg)
+LinkFile(nedit.dt.tmsg,_common.dt.tmsg)
+LinkFile(nxclient.dt.tmsg,_common.dt.tmsg)
+LinkFile(Office.dt.tmsg,_common.dt.tmsg)
+LinkFile(okular.dt.tmsg,_common.dt.tmsg)
+LinkFile(pavucontrol.dt.tmsg,_common.dt.tmsg)
+LinkFile(pgadmin.dt.tmsg,_common.dt.tmsg)
+LinkFile(powermanga.dt.tmsg,_common.dt.tmsg)
+LinkFile(pychess.dt.tmsg,_common.dt.tmsg)
+LinkFile(rhythmbox.dt.tmsg,_common.dt.tmsg)
+LinkFile(rosegarden.dt.tmsg,_common.dt.tmsg)
+LinkFile(skype.dt.tmsg,_common.dt.tmsg)
+LinkFile(sound-juicer.dt.tmsg,_common.dt.tmsg)
+LinkFile(stellarium.dt.tmsg,_common.dt.tmsg)
+LinkFile(supertux.dt.tmsg,_common.dt.tmsg)
+LinkFile(synaptic.dt.tmsg,_common.dt.tmsg)
+LinkFile(System.dt.tmsg,_common.dt.tmsg)
+LinkFile(TeX.dt.tmsg,_common.dt.tmsg)
+LinkFile(thunderbird.dt.tmsg,_common.dt.tmsg)
+LinkFile(tuxpaint.dt.tmsg,_common.dt.tmsg)
+LinkFile(virtualbox.dt.tmsg,_common.dt.tmsg)
+LinkFile(vlc.dt.tmsg,_common.dt.tmsg)
+LinkFile(wicd.dt.tmsg,_common.dt.tmsg)
+LinkFile(xboard.dt.tmsg,_common.dt.tmsg)
+LinkFile(xdvi.dt.tmsg,_common.dt.tmsg)
+LinkFile(xine.dt.tmsg,_common.dt.tmsg)
+LinkFile(xournal.dt.tmsg,_common.dt.tmsg)
+LinkFile(xpdf.dt.tmsg,_common.dt.tmsg)
+LinkFile(xv.dt.tmsg,_common.dt.tmsg)
+
 #ifdef HPArchitecture
 LinkFile(hp.dt.tmsg,_common.dt.tmsg)
 #endif
@@ -139,6 +283,77 @@ DtstyleDescRule(miscActions.dt,miscActions.dt)
 DtstyleDescRule(miscImages.dt,miscImages.dt)
 DtstyleDescRule(IconBrowse.dt,IconBrowse.dt)
 
+DtstyleDescRule(DisplayImage.dt,DisplayImage.dt)
+DtstyleDescRule(DisplayPDF.dt,DisplayPDF.dt)
+DtstyleDescRule(DisplayVideo.dt,DisplayVideo.dt)
+DtstyleDescRule(DisplayPS.dt,DisplayPS.dt)
+DtstyleDescRule(acroread.dt,acroread.dt)
+DtstyleDescRule(videoTypes.dt,videoTypes.dt)
+DtstyleDescRule(amarok.dt,amarok.dt)
+DtstyleDescRule(brasero.dt,brasero.dt)
+DtstyleDescRule(caja.dt,caja.dt)
+DtstyleDescRule(chromium.dt,chromium.dt)
+DtstyleDescRule(dreamchess.dt,dreamchess.dt)
+DtstyleDescRule(eboard.dt,eboard.dt)
+DtstyleDescRule(Education.dt,Education.dt)
+DtstyleDescRule(emacs.dt,emacs.dt)
+DtstyleDescRule(engrampa.dt,engrampa.dt)
+DtstyleDescRule(file-roller.dt,file-roller.dt)
+DtstyleDescRule(firefox.dt,firefox.dt)
+DtstyleDescRule(firestarter.dt,firestarter.dt)
+DtstyleDescRule(fontforge.dt,fontforge.dt)
+DtstyleDescRule(Games.dt,Games.dt)
+DtstyleDescRule(gcompris.dt,gcompris.dt)
+DtstyleDescRule(geogebra.dt,geogebra.dt)
+DtstyleDescRule(gimp.dt,gimp.dt)
+DtstyleDescRule(Graphics.dt,Graphics.dt)
+DtstyleDescRule(gv.dt,gv.dt)
+DtstyleDescRule(inkscape.dt,inkscape.dt)
+DtstyleDescRule(Internet.dt,Internet.dt)
+DtstyleDescRule(k3b.dt,k3b.dt)
+DtstyleDescRule(k9copy.dt,k9copy.dt)
+DtstyleDescRule(kile.dt,kile.dt)
+DtstyleDescRule(ktuberling.dt,ktuberling.dt)
+DtstyleDescRule(lbreakout2.dt,lbreakout2.dt)
+DtstyleDescRule(libreoffice-base.dt,libreoffice-base.dt)
+DtstyleDescRule(libreoffice-calc.dt,libreoffice-calc.dt)
+DtstyleDescRule(libreoffice-draw.dt,libreoffice-draw.dt)
+DtstyleDescRule(libreoffice-impress.dt,libreoffice-impress.dt)
+DtstyleDescRule(libreoffice-main.dt,libreoffice-main.dt)
+DtstyleDescRule(libreoffice-math.dt,libreoffice-math.dt)
+DtstyleDescRule(libreoffice-writer.dt,libreoffice-writer.dt)
+DtstyleDescRule(Media_Tools.dt,Media_Tools.dt)
+DtstyleDescRule(mgv.dt,mgv.dt)
+DtstyleDescRule(nedit.dt,nedit.dt)
+DtstyleDescRule(nxclient.dt,nxclient.dt)
+DtstyleDescRule(Office.dt,Office.dt)
+DtstyleDescRule(okular.dt,okular.dt)
+DtstyleDescRule(pavucontrol.dt,pavucontrol.dt)
+DtstyleDescRule(pgadmin.dt,pgadmin.dt)
+DtstyleDescRule(powermanga.dt,powermanga.dt)
+DtstyleDescRule(pychess.dt,pychess.dt)
+DtstyleDescRule(rhythmbox.dt,rhythmbox.dt)
+DtstyleDescRule(rosegarden.dt,rosegarden.dt)
+DtstyleDescRule(skype.dt,skype.dt)
+DtstyleDescRule(sound-juicer.dt,sound-juicer.dt)
+DtstyleDescRule(stellarium.dt,stellarium.dt)
+DtstyleDescRule(supertux.dt,supertux.dt)
+DtstyleDescRule(synaptic.dt,synaptic.dt)
+DtstyleDescRule(System.dt,System.dt)
+DtstyleDescRule(TeX.dt,TeX.dt)
+DtstyleDescRule(thunderbird.dt,thunderbird.dt)
+DtstyleDescRule(tuxpaint.dt,tuxpaint.dt)
+DtstyleDescRule(virtualbox.dt,virtualbox.dt)
+DtstyleDescRule(vlc.dt,vlc.dt)
+DtstyleDescRule(wicd.dt,wicd.dt)
+DtstyleDescRule(xboard.dt,xboard.dt)
+DtstyleDescRule(xdvi.dt,xdvi.dt)
+DtstyleDescRule(xine.dt,xine.dt)
+DtstyleDescRule(xournal.dt,xournal.dt)
+DtstyleDescRule(xpdf.dt,xpdf.dt)
+DtstyleDescRule(xv.dt,xv.dt)
+
+
 #ifdef HPArchitecture
 DtstyleDescRule(hp.dt,hp.dt)
 #endif
diff --git a/cde/programs/types/DisplayImage.dt b/cde/programs/types/DisplayImage.dt
new file mode 100644
index 000000000..b27a8d113
--- /dev/null
+++ b/cde/programs/types/DisplayImage.dt
@@ -0,0 +1,31 @@
+# CDE Action and DataType Definition File
+#
+# DisplayImage.dt - display an image file
+#
+####################################################################
+
+ACTION	DisplayImage
+{
+	LABEL		Image Viewer
+	TYPE		COMMAND
+	ICON		camera
+	EXEC_HOST	%DatabaseHost%, %LocalHost%
+	ARG_COUNT	0
+	EXEC_STRING	dtapp_vimage %(File)"Name of image file to display:"%
+	WINDOW_TYPE	NO_STDIO
+	DESCRIPTION	Display image
+}
+
+
+ACTION	DisplayImage
+{
+	LABEL		Image Editor
+	TYPE		COMMAND
+	ICON		camera
+	EXEC_HOST	%DatabaseHost%, %LocalHost%
+	ARG_COUNT	>0
+	EXEC_STRING	dtapp_vimage %(File)Args%
+	WINDOW_TYPE	NO_STDIO
+	DESCRIPTION	Edit image file.
+}
+
diff --git a/cde/programs/types/DisplayPDF.dt b/cde/programs/types/DisplayPDF.dt
new file mode 100644
index 000000000..110ecf9fd
--- /dev/null
+++ b/cde/programs/types/DisplayPDF.dt
@@ -0,0 +1,31 @@
+# CDE Action and DataType Definition File
+#
+# DisplayPDF.dt - display a PDF file
+#
+####################################################################
+
+ACTION	DisplayPDF
+{
+	LABEL		PDF Viewer
+	TYPE		COMMAND
+	ICON		camera
+	EXEC_HOST	%DatabaseHost%, %LocalHost%
+	ARG_COUNT	0
+	EXEC_STRING	dtapp_vpdf %(File)"Name of PDF file to display:"%
+	WINDOW_TYPE	NO_STDIO
+	DESCRIPTION	Display image
+}
+
+
+ACTION	DisplayPDF
+{
+	LABEL		PDF Editor
+	TYPE		COMMAND
+	ICON		camera
+	EXEC_HOST	%DatabaseHost%, %LocalHost%
+	ARG_COUNT	>0
+	EXEC_STRING	dtapp_vpdf %(File)Args%
+	WINDOW_TYPE	NO_STDIO
+	DESCRIPTION	Edit image file.
+}
+
diff --git a/cde/programs/types/DisplayPS.dt b/cde/programs/types/DisplayPS.dt
new file mode 100644
index 000000000..9bc825ada
--- /dev/null
+++ b/cde/programs/types/DisplayPS.dt
@@ -0,0 +1,31 @@
+# CDE Action and DataType Definition File
+#
+# DisplayPS.dt - display a PS file
+#
+####################################################################
+
+ACTION	DisplayPS
+{
+	LABEL		PS Viewer
+	TYPE		COMMAND
+	ICON		camera
+	EXEC_HOST	%DatabaseHost%, %LocalHost%
+	ARG_COUNT	0
+	EXEC_STRING	dtapp_vps %(File)"Name of PS file to display:"%
+	WINDOW_TYPE	NO_STDIO
+	DESCRIPTION	Display image
+}
+
+
+ACTION	DisplayPS
+{
+	LABEL		PS Editor
+	TYPE		COMMAND
+	ICON		camera
+	EXEC_HOST	%DatabaseHost%, %LocalHost%
+	ARG_COUNT	>0
+	EXEC_STRING	dtapp_vps %(File)Args%
+	WINDOW_TYPE	NO_STDIO
+	DESCRIPTION	Edit image file.
+}
+
diff --git a/cde/programs/types/DisplayVideo.dt b/cde/programs/types/DisplayVideo.dt
new file mode 100644
index 000000000..9ce561da2
--- /dev/null
+++ b/cde/programs/types/DisplayVideo.dt
@@ -0,0 +1,31 @@
+# CDE Action and DataType Definition File
+#
+# DisplayVideo.dt - display a video file
+#
+####################################################################
+
+ACTION	DisplayVideo
+{
+	LABEL		Video Viewer
+	TYPE		COMMAND
+	ICON		video
+	EXEC_HOST	%DatabaseHost%, %LocalHost%
+	ARG_COUNT	0
+	EXEC_STRING	dtapp_vvideo %(File)"Name of video file to display:"%
+	WINDOW_TYPE	NO_STDIO
+	DESCRIPTION	Play video file
+}
+
+
+ACTION	DisplayVideo
+{
+	LABEL		Video Editor
+	TYPE		COMMAND
+	ICON		video
+	EXEC_HOST	%DatabaseHost%, %LocalHost%
+	ARG_COUNT	>0
+	EXEC_STRING	dtapp_vvideo %(File)Args%
+	WINDOW_TYPE	NO_STDIO
+	DESCRIPTION	Play video file.
+}
+
diff --git a/cde/programs/localized/C/types/Education.dt b/cde/programs/types/Education.dt
similarity index 100%
rename from cde/programs/localized/C/types/Education.dt
rename to cde/programs/types/Education.dt
diff --git a/cde/programs/localized/C/types/Games.dt b/cde/programs/types/Games.dt
similarity index 100%
rename from cde/programs/localized/C/types/Games.dt
rename to cde/programs/types/Games.dt
diff --git a/cde/programs/localized/C/types/Graphics.dt b/cde/programs/types/Graphics.dt
similarity index 100%
rename from cde/programs/localized/C/types/Graphics.dt
rename to cde/programs/types/Graphics.dt
diff --git a/cde/programs/localized/C/types/Internet.dt b/cde/programs/types/Internet.dt
similarity index 100%
rename from cde/programs/localized/C/types/Internet.dt
rename to cde/programs/types/Internet.dt
diff --git a/cde/programs/localized/C/types/Media_Tools.dt b/cde/programs/types/Media_Tools.dt
similarity index 100%
rename from cde/programs/localized/C/types/Media_Tools.dt
rename to cde/programs/types/Media_Tools.dt
diff --git a/cde/programs/localized/C/types/Office.dt b/cde/programs/types/Office.dt
similarity index 100%
rename from cde/programs/localized/C/types/Office.dt
rename to cde/programs/types/Office.dt
diff --git a/cde/programs/localized/C/types/System.dt b/cde/programs/types/System.dt
similarity index 100%
rename from cde/programs/localized/C/types/System.dt
rename to cde/programs/types/System.dt
diff --git a/cde/programs/localized/C/types/TeX.dt b/cde/programs/types/TeX.dt
similarity index 100%
rename from cde/programs/localized/C/types/TeX.dt
rename to cde/programs/types/TeX.dt
diff --git a/cde/programs/localized/C/types/acroread.dt b/cde/programs/types/acroread.dt
similarity index 100%
rename from cde/programs/localized/C/types/acroread.dt
rename to cde/programs/types/acroread.dt
diff --git a/cde/programs/localized/C/types/amarok.dt b/cde/programs/types/amarok.dt
similarity index 100%
rename from cde/programs/localized/C/types/amarok.dt
rename to cde/programs/types/amarok.dt
diff --git a/cde/programs/localized/C/types/brasero.dt b/cde/programs/types/brasero.dt
similarity index 100%
rename from cde/programs/localized/C/types/brasero.dt
rename to cde/programs/types/brasero.dt
diff --git a/cde/programs/localized/C/types/caja.dt b/cde/programs/types/caja.dt
similarity index 100%
rename from cde/programs/localized/C/types/caja.dt
rename to cde/programs/types/caja.dt
diff --git a/cde/programs/localized/C/types/chromium.dt b/cde/programs/types/chromium.dt
similarity index 100%
rename from cde/programs/localized/C/types/chromium.dt
rename to cde/programs/types/chromium.dt
diff --git a/cde/programs/types/datatypes.dt.src b/cde/programs/types/datatypes.dt.src
index b21caa034..b0f8482bd 100644
--- a/cde/programs/types/datatypes.dt.src
+++ b/cde/programs/types/datatypes.dt.src
@@ -186,13 +186,8 @@ ACTION Open
 {
 	LABEL		%|nls-1-Open|
         ARG_TYPE        POSTSCRIPT
-        TYPE            COMMAND
-        WINDOW_TYPE     NO_STDIO
-        EXEC_STRING     CDE_INSTALLATION_TOP/bin/dterror.ds \
-                           "%|nls-3008-#Cannot#|" \
-                           "%|nls-13-#Information#|" \
-                           "%|nls-6-#OK#|"
-        DESCRIPTION     %|nls-3007-#Your system #|
+        TYPE            MAP
+        MAP_ACTION      DisplayPS
 }
 ACTION Print
 {
@@ -357,7 +352,7 @@ XCOMM #######################################################
 DATA_ATTRIBUTES TIFF
 {
         ACTIONS         Open
-        ICON            Dttif
+        ICON            Dtimage
         NAME_TEMPLATE	%s.tif
         MIME_TYPE	image/tiff
         SUNV3_TYPE	tiff-file
@@ -404,13 +399,9 @@ ACTION Open
 {
 	LABEL		%|nls-1-Open|
         ARG_TYPE        TIFF
-        TYPE            COMMAND
-        WINDOW_TYPE     NO_STDIO
-        EXEC_STRING     CDE_INSTALLATION_TOP/bin/dterror.ds \
-                           "%|nls-3016-#Cannot#|" \
-                           "%|nls-13-#Information#|" \
-                           "%|nls-6-#OK#|"
-        DESCRIPTION     %|nls-3015-#Your system #|
+	TYPE            MAP
+	MAP_ACTION		DisplayImage
+	DESCRIPTION     Use the tiff viewer
 }
 ACTION Print
 {
@@ -425,7 +416,7 @@ XCOMM #######################################################
 DATA_ATTRIBUTES JPEG
 {
         ACTIONS         Open
-        ICON            Dtjpeg
+        ICON            Dtimage
         NAME_TEMPLATE	%s.jpg
         MIME_TYPE	image/jpeg
         SUNV3_TYPE	jpeg-file
@@ -472,13 +463,9 @@ ACTION Open
 {
 	LABEL		%|nls-1-Open|
         ARG_TYPE        JPEG
-        TYPE            COMMAND
-        WINDOW_TYPE     NO_STDIO
-        EXEC_STRING     CDE_INSTALLATION_TOP/bin/dterror.ds \
-                           "%|nls-3019-#Cannot#|" \
-                           "%|nls-13-#Information#|" \
-                           "%|nls-6-#OK#|"
-        DESCRIPTION     %|nls-3018-#Your system #|
+	TYPE            MAP
+	MAP_ACTION	DisplayImage
+	DESCRIPTION     Use the jpeg viewer
 }
 ACTION Print
 {
@@ -488,73 +475,82 @@ ACTION Print
         MAP_ACTION	NoPrint
 }
 
-XCOMM #######################################################
+XCOMM #####################################################################
+XCOMM ## BMP
 
-DATA_ATTRIBUTES MPEG
+DATA_ATTRIBUTES BMP
 {
-        ACTIONS         Open
-        ICON            Dtmpeg
-        NAME_TEMPLATE	%s.mpg
-        MIME_TYPE	video/mpeg
-        DESCRIPTION     %|nls-3020-#This file#|
-        TYPE_LABEL      %|nls-31007-#MPEG#|
+	ACTIONS		Open
+	ICON		Dtimage
+	DESCRIPTION	This file contains a graphics image in \
+	                BMP format.  Its data type is named BMP. BMP files \
+	                have names ending with '.bmp', '.BMP' or '.Bmp'.
 }
-DATA_CRITERIA MPEG1
+DATA_CRITERIA BMP1
 {
-        DATA_ATTRIBUTES_NAME MPEG
-        MODE            f
-        NAME_PATTERN    *.MPEG
+	DATA_ATTRIBUTES_NAME BMP
+	MODE			f
+	PATH_PATTERN	*.bmp
 }
-DATA_CRITERIA MPEG2
+DATA_CRITERIA BMP2
 {
-        DATA_ATTRIBUTES_NAME MPEG
-        MODE            f
-        NAME_PATTERN    *.mpg
+	DATA_ATTRIBUTES_NAME BMP
+	MODE			f
+	PATH_PATTERN	*.BMP
 }
-DATA_CRITERIA MPEG3
+DATA_CRITERIA BMP3
 {
-        DATA_ATTRIBUTES_NAME MPEG
-        MODE            f
-        NAME_PATTERN    *.mpeg
+	DATA_ATTRIBUTES_NAME BMP
+	MODE			f
+	PATH_PATTERN	*.Bmp
 }
-DATA_CRITERIA MPEG4
+DATA_CRITERIA BMP4
 {
-        DATA_ATTRIBUTES_NAME MPEG
-        MODE            f
-        NAME_PATTERN    *.MPG
+	DATA_ATTRIBUTES_NAME    BMP
+	CONTENT 		0 string BM
+	MODE            f
 }
-DATA_CRITERIA MPEG5
+DATA_CRITERIA BMP4
 {
-        DATA_ATTRIBUTES_NAME MPEG
-        MODE            f
-        CONTENT         0 long 0x000001b3
+	DATA_ATTRIBUTES_NAME    BMP
+	CONTENT 		0 string IC
+	MODE            f
+}
+DATA_CRITERIA BMP4
+{
+	DATA_ATTRIBUTES_NAME    BMP
+	CONTENT 		0 string CI
+	MODE            f
+}
+DATA_CRITERIA BMP4
+{
+	DATA_ATTRIBUTES_NAME    BMP
+	CONTENT 		0 string CP
+	MODE            f
 }
 ACTION Open
 {
-        LABEL           %|nls-1-Open|
-        ARG_TYPE        MPEG
-        TYPE            COMMAND
-        WINDOW_TYPE     NO_STDIO
-        EXEC_STRING     CDE_INSTALLATION_TOP/bin/dterror.ds \
-                          "%|nls-3022-#Cannot#|" \
-                          "%|nls-13-#Information#|" \
-                          "%|nls-6-#OK#|"
-        DESCRIPTION     %|nls-3021-#Your system #|
+	LABEL		%|nls-1-Open|
+	ARG_TYPE		BMP
+	TYPE			MAP
+	MAP_ACTION		DisplayImage
+	DESCRIPTION		Use the bitmap viewer
 }
 ACTION Print
 {
         LABEL           %|nls-2-Print|
-        ARG_TYPE        MPEG
-        TYPE            MAP
-        MAP_ACTION	NoPrint
+	ARG_TYPE		BMP
+	TYPE			MAP
+	MAP_ACTION		NoPrint
 }
 
+
 XCOMM #######################################################
 
 DATA_ATTRIBUTES GIF
 {
         ACTIONS         Open
-        ICON		Dtgif
+        ICON		Dtimage
         NAME_TEMPLATE	%s.gif
         MIME_TYPE	image/gif
         SUNV3_TYPE	gif-file
@@ -589,13 +585,9 @@ ACTION Open
 {
         LABEL           %|nls-1-Open|
         ARG_TYPE        GIF
-        TYPE            COMMAND
-        WINDOW_TYPE     NO_STDIO
-        EXEC_STRING     CDE_INSTALLATION_TOP/bin/dterror.ds \
-                           "%|nls-3025-#Cannot#|" \
-                           "%|nls-13-#Information#|" \
-                           "%|nls-6-#OK#|"
-        DESCRIPTION     %|nls-3024-#Your system #|
+	TYPE            MAP
+	MAP_ACTION		DisplayImage
+	DESCRIPTION     Use the gif viewer
 }
 ACTION Print
 {
@@ -605,6 +597,60 @@ ACTION Print
         MAP_ACTION	NoPrint
 }
 
+XCOMM #######################################################################
+XCOMM ## PNG
+
+DATA_ATTRIBUTES PNG
+{
+	ACTIONS         Open
+	ICON		Dtimage
+	NAME_TEMPLATE	%s.png
+	MIME_TYPE		image/png
+	DESCRIPTION		This file contains a graphics image in PNG format. \
+	                Its data type is named PNG.  PNG files have \
+	                names ending with .png or .PNG
+	TYPE_LABEL      PNG
+}
+DATA_CRITERIA PNG1
+{
+	DATA_ATTRIBUTES_NAME PNG
+	MODE            f
+	NAME_PATTERN	*.png
+}
+DATA_CRITERIA PNG2
+{
+	DATA_ATTRIBUTES_NAME PNG
+	MODE            f
+	NAME_PATTERN	*.PNG
+}
+DATA_CRITERIA PNG3
+{
+	DATA_ATTRIBUTES_NAME    PNG
+	CONTENT 		0 string PNG
+	MODE            f
+}
+DATA_CRITERIA PNG4
+{
+	DATA_ATTRIBUTES_NAME    PNG
+	CONTENT 		0 byte 0x89 0x50 0x4e 0x47 
+	MODE            f
+}
+ACTION Open
+{
+        LABEL           %|nls-1-Open|
+	ARG_TYPE        PNG
+	TYPE            MAP
+	MAP_ACTION	DisplayImage
+	DESCRIPTION     Use the png viewer
+}
+ACTION Print
+{
+        LABEL           %|nls-2-Print|
+	ARG_TYPE        PNG
+	TYPE            MAP
+	MAP_ACTION		NoPrint
+}
+
 XCOMM #######################################################
 
 DATA_ATTRIBUTES README
@@ -805,4 +851,51 @@ ACTION Print
         MAP_ACTION	NoPrint
 }
 
+XCOMM #####################################################################
+XCOMM ## PDF
+
+DATA_ATTRIBUTES PDF
+{
+	ACTIONS			Open,Print
+	ICON			acroread
+	NAME_TEMPLATE	%s.pdf
+	MIME_TYPE		application/pdf
+	DESCRIPTION		This file contains pdf data. Its data type \
+					is named PDF.  PDF files have names ending with '.pdf' \
+					or '.PDF', or contain the characters "%PDF".
+	TYPE_LABEL		PDF
+}
+DATA_CRITERIA PDF1
+{
+	DATA_ATTRIBUTES_NAME PDF
+	MODE			f&!x
+	NAME_PATTERN	*.pdf
+}
+DATA_CRITERIA PDF2
+{
+	DATA_ATTRIBUTES_NAME PDF
+	MODE			f&!x
+	NAME_PATTERN	*.PDF
+}
+DATA_CRITERIA PDF3
+{
+	DATA_ATTRIBUTES_NAME	PDF
+	CONTENT 		0 string %PDF
+	MODE			f&!x
+}
+ACTION Open
+{
+	LABEL			Open
+	ARG_TYPE		PDF
+	TYPE			MAP
+	MAP_ACTION		DisplayPDF
+}
+ACTION Print
+{
+	LABEL			Print
+	ARG_TYPE		PDF
+	TYPE			MAP
+	MAP_ACTION		DisplayPDF
+}
+
 XCOMM ######################## EOF ############################################
diff --git a/cde/programs/localized/C/types/dreamchess.dt b/cde/programs/types/dreamchess.dt
similarity index 100%
rename from cde/programs/localized/C/types/dreamchess.dt
rename to cde/programs/types/dreamchess.dt
diff --git a/cde/programs/localized/C/types/eboard.dt b/cde/programs/types/eboard.dt
similarity index 100%
rename from cde/programs/localized/C/types/eboard.dt
rename to cde/programs/types/eboard.dt
diff --git a/cde/programs/localized/C/types/emacs.dt b/cde/programs/types/emacs.dt
similarity index 100%
rename from cde/programs/localized/C/types/emacs.dt
rename to cde/programs/types/emacs.dt
diff --git a/cde/programs/localized/C/types/engrampa.dt b/cde/programs/types/engrampa.dt
similarity index 100%
rename from cde/programs/localized/C/types/engrampa.dt
rename to cde/programs/types/engrampa.dt
diff --git a/cde/programs/localized/C/types/file-roller.dt b/cde/programs/types/file-roller.dt
similarity index 100%
rename from cde/programs/localized/C/types/file-roller.dt
rename to cde/programs/types/file-roller.dt
diff --git a/cde/programs/localized/C/types/firefox.dt b/cde/programs/types/firefox.dt
similarity index 100%
rename from cde/programs/localized/C/types/firefox.dt
rename to cde/programs/types/firefox.dt
diff --git a/cde/programs/localized/C/types/firestarter.dt b/cde/programs/types/firestarter.dt
similarity index 100%
rename from cde/programs/localized/C/types/firestarter.dt
rename to cde/programs/types/firestarter.dt
diff --git a/cde/programs/localized/C/types/fontforge.dt b/cde/programs/types/fontforge.dt
similarity index 100%
rename from cde/programs/localized/C/types/fontforge.dt
rename to cde/programs/types/fontforge.dt
diff --git a/cde/programs/localized/C/types/gcompris.dt b/cde/programs/types/gcompris.dt
similarity index 100%
rename from cde/programs/localized/C/types/gcompris.dt
rename to cde/programs/types/gcompris.dt
diff --git a/cde/programs/localized/C/types/geogebra.dt b/cde/programs/types/geogebra.dt
similarity index 100%
rename from cde/programs/localized/C/types/geogebra.dt
rename to cde/programs/types/geogebra.dt
diff --git a/cde/programs/localized/C/types/gimp.dt b/cde/programs/types/gimp.dt
similarity index 100%
rename from cde/programs/localized/C/types/gimp.dt
rename to cde/programs/types/gimp.dt
diff --git a/cde/programs/localized/C/types/gv.dt b/cde/programs/types/gv.dt
similarity index 59%
rename from cde/programs/localized/C/types/gv.dt
rename to cde/programs/types/gv.dt
index 8dfc30f75..8ca3fd3ff 100644
--- a/cde/programs/localized/C/types/gv.dt
+++ b/cde/programs/types/gv.dt
@@ -32,41 +32,3 @@ ACTION gv
      DESCRIPTION   gv is a postscript viewer.
 }
 
-DATA_ATTRIBUTES gv_FILE_1
-{
-     ACTIONS       Open,Print
-     ICON          gv
-     DESCRIPTION   Postscript files open with gv.
-}
-
-DATA_CRITERIA gv_FILE_1A
-{
-     DATA_ATTRIBUTES_NAME gv_FILE_1
-     MODE          !d
-     PATH_PATTERN  *.ps
-}
-
-ACTION Open
-{
-     ARG_TYPE      gv_FILE_1
-     TYPE          MAP
-     MAP_ACTION    gv
-     LABEL         Open
-}
-
-ACTION gv_FILE_1_PRINT
-{
-     TYPE          COMMAND
-     EXEC_STRING   lpr "%Arg_1%"
-     WINDOW_TYPE   NO_STDIO
-}
-
-ACTION Print
-{
-     ARG_TYPE      gv_FILE_1
-     TYPE          MAP
-     MAP_ACTION    gv_FILE_1_PRINT
-     LABEL         Print
-}
-
-
diff --git a/cde/programs/localized/C/types/inkscape.dt b/cde/programs/types/inkscape.dt
similarity index 100%
rename from cde/programs/localized/C/types/inkscape.dt
rename to cde/programs/types/inkscape.dt
diff --git a/cde/programs/localized/C/types/k3b.dt b/cde/programs/types/k3b.dt
similarity index 100%
rename from cde/programs/localized/C/types/k3b.dt
rename to cde/programs/types/k3b.dt
diff --git a/cde/programs/localized/C/types/k9copy.dt b/cde/programs/types/k9copy.dt
similarity index 100%
rename from cde/programs/localized/C/types/k9copy.dt
rename to cde/programs/types/k9copy.dt
diff --git a/cde/programs/localized/C/types/kile.dt b/cde/programs/types/kile.dt
similarity index 100%
rename from cde/programs/localized/C/types/kile.dt
rename to cde/programs/types/kile.dt
diff --git a/cde/programs/localized/C/types/ktuberling.dt b/cde/programs/types/ktuberling.dt
similarity index 100%
rename from cde/programs/localized/C/types/ktuberling.dt
rename to cde/programs/types/ktuberling.dt
diff --git a/cde/programs/localized/C/types/lbreakout2.dt b/cde/programs/types/lbreakout2.dt
similarity index 100%
rename from cde/programs/localized/C/types/lbreakout2.dt
rename to cde/programs/types/lbreakout2.dt
diff --git a/cde/programs/localized/C/types/libreoffice-base.dt b/cde/programs/types/libreoffice-base.dt
similarity index 100%
rename from cde/programs/localized/C/types/libreoffice-base.dt
rename to cde/programs/types/libreoffice-base.dt
diff --git a/cde/programs/localized/C/types/libreoffice-calc.dt b/cde/programs/types/libreoffice-calc.dt
similarity index 100%
rename from cde/programs/localized/C/types/libreoffice-calc.dt
rename to cde/programs/types/libreoffice-calc.dt
diff --git a/cde/programs/localized/C/types/libreoffice-draw.dt b/cde/programs/types/libreoffice-draw.dt
similarity index 100%
rename from cde/programs/localized/C/types/libreoffice-draw.dt
rename to cde/programs/types/libreoffice-draw.dt
diff --git a/cde/programs/localized/C/types/libreoffice-impress.dt b/cde/programs/types/libreoffice-impress.dt
similarity index 100%
rename from cde/programs/localized/C/types/libreoffice-impress.dt
rename to cde/programs/types/libreoffice-impress.dt
diff --git a/cde/programs/localized/C/types/libreoffice-main.dt b/cde/programs/types/libreoffice-main.dt
similarity index 100%
rename from cde/programs/localized/C/types/libreoffice-main.dt
rename to cde/programs/types/libreoffice-main.dt
diff --git a/cde/programs/localized/C/types/libreoffice-math.dt b/cde/programs/types/libreoffice-math.dt
similarity index 100%
rename from cde/programs/localized/C/types/libreoffice-math.dt
rename to cde/programs/types/libreoffice-math.dt
diff --git a/cde/programs/localized/C/types/libreoffice-writer.dt b/cde/programs/types/libreoffice-writer.dt
similarity index 100%
rename from cde/programs/localized/C/types/libreoffice-writer.dt
rename to cde/programs/types/libreoffice-writer.dt
diff --git a/cde/programs/localized/C/types/mgv.dt b/cde/programs/types/mgv.dt
similarity index 100%
rename from cde/programs/localized/C/types/mgv.dt
rename to cde/programs/types/mgv.dt
diff --git a/cde/programs/localized/C/types/nedit.dt b/cde/programs/types/nedit.dt
similarity index 100%
rename from cde/programs/localized/C/types/nedit.dt
rename to cde/programs/types/nedit.dt
diff --git a/cde/programs/localized/C/types/nxclient.dt b/cde/programs/types/nxclient.dt
similarity index 100%
rename from cde/programs/localized/C/types/nxclient.dt
rename to cde/programs/types/nxclient.dt
diff --git a/cde/programs/localized/C/types/okular.dt b/cde/programs/types/okular.dt
similarity index 60%
rename from cde/programs/localized/C/types/okular.dt
rename to cde/programs/types/okular.dt
index 220ec61a1..86d3a5bcc 100644
--- a/cde/programs/localized/C/types/okular.dt
+++ b/cde/programs/types/okular.dt
@@ -32,40 +32,5 @@ ACTION okular
      DESCRIPTION   okular pdf viewer.
 }
 
-DATA_ATTRIBUTES okular_FILE_1
-{
-     ACTIONS       Open,Print
-     DESCRIPTION   Open image in okular.
-}
-
-DATA_CRITERIA okular_FILE_1A
-{
-     DATA_ATTRIBUTES_NAME okular_FILE_1
-     MODE          !d
-     PATH_PATTERN  *.pdf
-}
-
-ACTION Open
-{
-     ARG_TYPE      okular_FILE_1
-     TYPE          MAP
-     MAP_ACTION    okular
-     LABEL         Open
-}
-
-ACTION okular_FILE_1_PRINT
-{
-     TYPE          COMMAND
-     EXEC_STRING   okular %Arg_1%
-     WINDOW_TYPE   NO_STDIO
-}
-
-ACTION Print
-{
-     ARG_TYPE      okular_FILE_1
-     TYPE          MAP
-     MAP_ACTION    okular_FILE_1_PRINT
-     LABEL         Print
-}
 
 
diff --git a/cde/programs/localized/C/types/pavucontrol.dt b/cde/programs/types/pavucontrol.dt
similarity index 100%
rename from cde/programs/localized/C/types/pavucontrol.dt
rename to cde/programs/types/pavucontrol.dt
diff --git a/cde/programs/localized/C/types/pgadmin.dt b/cde/programs/types/pgadmin.dt
similarity index 100%
rename from cde/programs/localized/C/types/pgadmin.dt
rename to cde/programs/types/pgadmin.dt
diff --git a/cde/programs/localized/C/types/powermanga.dt b/cde/programs/types/powermanga.dt
similarity index 100%
rename from cde/programs/localized/C/types/powermanga.dt
rename to cde/programs/types/powermanga.dt
diff --git a/cde/programs/localized/C/types/pychess.dt b/cde/programs/types/pychess.dt
similarity index 100%
rename from cde/programs/localized/C/types/pychess.dt
rename to cde/programs/types/pychess.dt
diff --git a/cde/programs/localized/C/types/rhythmbox.dt b/cde/programs/types/rhythmbox.dt
similarity index 100%
rename from cde/programs/localized/C/types/rhythmbox.dt
rename to cde/programs/types/rhythmbox.dt
diff --git a/cde/programs/localized/C/types/rosegarden.dt b/cde/programs/types/rosegarden.dt
similarity index 100%
rename from cde/programs/localized/C/types/rosegarden.dt
rename to cde/programs/types/rosegarden.dt
diff --git a/cde/programs/localized/C/types/skype.dt b/cde/programs/types/skype.dt
similarity index 100%
rename from cde/programs/localized/C/types/skype.dt
rename to cde/programs/types/skype.dt
diff --git a/cde/programs/localized/C/types/sound-juicer.dt b/cde/programs/types/sound-juicer.dt
similarity index 100%
rename from cde/programs/localized/C/types/sound-juicer.dt
rename to cde/programs/types/sound-juicer.dt
diff --git a/cde/programs/localized/C/types/stellarium.dt b/cde/programs/types/stellarium.dt
similarity index 100%
rename from cde/programs/localized/C/types/stellarium.dt
rename to cde/programs/types/stellarium.dt
diff --git a/cde/programs/localized/C/types/supertux.dt b/cde/programs/types/supertux.dt
similarity index 100%
rename from cde/programs/localized/C/types/supertux.dt
rename to cde/programs/types/supertux.dt
diff --git a/cde/programs/localized/C/types/synaptic.dt b/cde/programs/types/synaptic.dt
similarity index 100%
rename from cde/programs/localized/C/types/synaptic.dt
rename to cde/programs/types/synaptic.dt
diff --git a/cde/programs/localized/C/types/thunderbird.dt b/cde/programs/types/thunderbird.dt
similarity index 100%
rename from cde/programs/localized/C/types/thunderbird.dt
rename to cde/programs/types/thunderbird.dt
diff --git a/cde/programs/localized/C/types/tuxpaint.dt b/cde/programs/types/tuxpaint.dt
similarity index 100%
rename from cde/programs/localized/C/types/tuxpaint.dt
rename to cde/programs/types/tuxpaint.dt
diff --git a/cde/programs/types/videoTypes.dt b/cde/programs/types/videoTypes.dt
new file mode 100644
index 000000000..802cd6384
--- /dev/null
+++ b/cde/programs/types/videoTypes.dt
@@ -0,0 +1,375 @@
+###############################################################################
+#
+#     videoTypes.dt
+#
+#     Additional Action and DataType definitions for Common Desktop Environment
+#     Video
+#
+###############################################################################
+
+###############################################################################
+## MPEG
+
+DATA_ATTRIBUTES MPEG
+{
+	ACTIONS         Open
+	ICON            video
+	NAME_TEMPLATE	%s.mpg
+	MIME_TYPE		video/mpeg
+	DESCRIPTION     This file contains a graphics image movie in MPEG \
+	                Interchange File Format.  Its data type is \
+	                named MPEG. MPEG files have names ending with \
+	                '.MPEG', '.mpg', '.mpeg', or '.MPG'.
+	TYPE_LABEL      MPEG
+}
+DATA_CRITERIA MPEG1
+{
+	DATA_ATTRIBUTES_NAME MPEG
+	MODE            f
+	NAME_PATTERN    *.MPEG
+}
+DATA_CRITERIA MPEG2
+{
+	DATA_ATTRIBUTES_NAME MPEG
+	MODE            f
+	NAME_PATTERN    *.mpg
+}
+DATA_CRITERIA MPEG3
+{
+	DATA_ATTRIBUTES_NAME MPEG
+	MODE            f
+	NAME_PATTERN    *.mpeg
+}
+DATA_CRITERIA MPEG4
+{
+	DATA_ATTRIBUTES_NAME MPEG
+	MODE            f
+	NAME_PATTERN    *.MPG
+}
+DATA_CRITERIA MPEG5
+{
+	DATA_ATTRIBUTES_NAME MPEG
+	MODE            f
+	CONTENT         0 long 0x000001b3
+}
+DATA_CRITERIA MPEG6
+{
+        DATA_ATTRIBUTES_NAME MPEG
+        MODE            f
+        NAME_PATTERN    *.MP4
+}
+DATA_CRITERIA MPEG7
+{
+        DATA_ATTRIBUTES_NAME MPEG
+        MODE            f
+        NAME_PATTERN    *.mp4
+}
+DATA_CRITERIA MPEG8
+{
+        DATA_ATTRIBUTES_NAME MPEG
+        MODE            f
+        NAME_PATTERN    *.MP3
+}
+DATA_CRITERIA MPEG9
+{
+        DATA_ATTRIBUTES_NAME MPEG
+        MODE            f
+        NAME_PATTERN    *.mp3
+}
+DATA_CRITERIA MPEG10
+{
+        DATA_ATTRIBUTES_NAME MPEG
+        MODE            f
+        NAME_PATTERN    *.mkv
+}
+ACTION Open
+{
+        LABEL           %|nls-1-Open|
+	ARG_TYPE        MPEG
+	TYPE            MAP
+	MAP_ACTION	DisplayVideo
+	DESCRIPTION     Use the mpeg viewer
+}
+ACTION Print
+{
+        LABEL           %|nls-2-Print|
+	ARG_TYPE        MPEG
+	TYPE            MAP
+	MAP_ACTION	NoPrint
+}
+
+
+###############################################################################
+## QTMOV
+
+DATA_ATTRIBUTES QTMOV
+{
+	ACTIONS         Open
+	ICON            video
+	NAME_TEMPLATE	%s.mov
+	MIME_TYPE		video/quicktime
+	DESCRIPTION     This file contains a graphics image movie in QTMOV. \
+			Its data type is \
+	                named MOV. MOV files have names ending with \
+	                '.MOV', '.mov', '.qt', or '.QT'.
+	TYPE_LABEL      QTMOV
+}
+DATA_CRITERIA QTMOV1
+{
+	DATA_ATTRIBUTES_NAME QTMOV
+	MODE            f
+	NAME_PATTERN    *.MOV
+}
+DATA_CRITERIA QTMOV2
+{
+	DATA_ATTRIBUTES_NAME QTMOV
+	MODE            f
+	NAME_PATTERN    *.mov
+}
+DATA_CRITERIA QTMOV3
+{
+	DATA_ATTRIBUTES_NAME QTMOV
+	MODE            f
+	NAME_PATTERN    *.qt
+}
+DATA_CRITERIA QTMOV4
+{
+	DATA_ATTRIBUTES_NAME QTMOV
+	MODE            f
+	NAME_PATTERN    *.QT
+}
+DATA_CRITERIA QTMOV5
+{
+	DATA_ATTRIBUTES_NAME QTMOV
+	MODE            f
+	NAME_PATTERN    *.moov
+}
+DATA_CRITERIA QTMOV6
+{
+	DATA_ATTRIBUTES_NAME QTMOV
+	MODE            f
+	NAME_PATTERN    *.MooV
+}
+DATA_CRITERIA QTMOV7
+{
+	DATA_ATTRIBUTES_NAME QTMOV
+	MODE            f
+	NAME_PATTERN    *.hqx
+}
+DATA_CRITERIA QTMOV8
+{
+	DATA_ATTRIBUTES_NAME QTMOV
+	MODE            f
+	NAME_PATTERN    *.qtvr
+}
+DATA_CRITERIA QTMOV9
+{
+	DATA_ATTRIBUTES_NAME QTMOV
+	MODE            f
+	CONTENT         4 string moov
+}
+DATA_CRITERIA QTMOV6
+{
+	DATA_ATTRIBUTES_NAME QTMOV
+	MODE            f
+	CONTENT         4 string mdat
+}
+ACTION Open
+{
+	LABEL		%|nls-1-Open|
+	ARG_TYPE        QTMOV
+	TYPE            MAP
+	MAP_ACTION	DisplayVideo
+	DESCRIPTION     Use the Xanim viewer
+}
+ACTION Print
+{
+        LABEL           %|nls-2-Print|
+	ARG_TYPE        QTMOV
+	TYPE            MAP
+	MAP_ACTION		NoPrint
+}
+
+
+###############################################################################
+## MISCANIM
+
+DATA_ATTRIBUTES MISCANIM
+{
+	ACTIONS         Open
+	ICON            video
+	NAME_TEMPLATE	%s.x-anim
+	MIME_TYPE		video/x-flick
+	DESCRIPTION     This file contains a graphics image movie in one  \
+			of many formats.
+	TYPE_LABEL      MISCANIM
+}
+DATA_CRITERIA MISCANIM1
+{
+	DATA_ATTRIBUTES_NAME MISCANIM
+	MODE            f
+	NAME_PATTERN    *.fli
+}
+DATA_CRITERIA MISCANIM2
+{
+	DATA_ATTRIBUTES_NAME MISCANIM
+	MODE            f
+	NAME_PATTERN    *.flc
+}
+DATA_CRITERIA MISCANIM3
+{
+	DATA_ATTRIBUTES_NAME MISCANIM
+	MODE            f
+	NAME_PATTERN    *.dl
+}
+DATA_CRITERIA MISCANIM3
+{
+	DATA_ATTRIBUTES_NAME MISCANIM
+	MODE            f
+	NAME_PATTERN    *.anim
+}
+DATA_CRITERIA MISCANIM3
+{
+	DATA_ATTRIBUTES_NAME MISCANIM
+	MODE            f
+	NAME_PATTERN    *.anim3
+}
+DATA_CRITERIA MISCANIM3
+{
+	DATA_ATTRIBUTES_NAME MISCANIM
+	MODE            f
+	NAME_PATTERN    *.anim5
+}
+DATA_CRITERIA MISCANIM3
+{
+	DATA_ATTRIBUTES_NAME MISCANIM
+	MODE            f
+	NAME_PATTERN    *.anim7
+}
+DATA_CRITERIA MISCANIM3
+{
+	DATA_ATTRIBUTES_NAME MISCANIM
+	MODE            f
+	NAME_PATTERN    *.iff
+}
+DATA_CRITERIA MISCANIM9
+{
+	DATA_ATTRIBUTES_NAME MISCANIM
+	MODE            f
+	CONTENT         4 byte 0x11 0xAF 
+}
+
+DATA_CRITERIA MISCANIM0
+{
+	DATA_ATTRIBUTES_NAME MISCANIM
+	MODE            f
+	CONTENT         4 byte 0x12 0xAF 
+}
+ACTION Open
+{
+	LABEL		%|nls-1-Open|
+	ARG_TYPE        MISCANIM
+	TYPE            MAP
+	MAP_ACTION	DisplayVideo
+	DESCRIPTION     Use the Xanim viewer
+}
+ACTION Print
+{
+        LABEL           %|nls-2-Print|
+	ARG_TYPE        MISCANIM
+	TYPE            MAP
+	MAP_ACTION		NoPrint
+}
+
+
+###############################################################################
+## AVI
+
+DATA_ATTRIBUTES AVI
+{
+	ACTIONS         Open
+	ICON            video
+	NAME_TEMPLATE	%s.avi
+	MIME_TYPE		video/x-microsoft-avi
+	DESCRIPTION     This file contains a graphics image movie in AVI.  \
+			Its data type is \
+	                named AVI. AVI files have names ending with \
+	                '.avi'.
+	TYPE_LABEL      AVI
+}
+DATA_CRITERIA AVI1
+{
+	DATA_ATTRIBUTES_NAME AVI
+	MODE            f
+	NAME_PATTERN    *.avi
+}
+DATA_CRITERIA AVI2
+{
+	DATA_ATTRIBUTES_NAME AVI
+	MODE            f
+	NAME_PATTERN    *.AVI
+}
+ACTION Open
+{
+	LABEL		%|nls-1-Open|
+	ARG_TYPE        AVI
+	TYPE            MAP
+	MAP_ACTION	DisplayVideo
+	DESCRIPTION     Use the Xanim viewer
+}
+ACTION Print
+{
+        LABEL           %|nls-2-Print|
+	LABEL           Print
+	ARG_TYPE        AVI
+	TYPE            MAP
+	MAP_ACTION		NoPrint
+}
+
+###############################################################################
+## JMOV
+
+DATA_ATTRIBUTES JMOV
+{
+	ACTIONS         Open
+	ICON            video
+	NAME_TEMPLATE	%s.jmov
+	MIME_TYPE		video/x-microsoft-JMOV
+	DESCRIPTION     This file contains a graphics image movie in JMOV.  \
+			Its data type is \
+	                named JMOV. AVI files have names ending with \
+	                '.JMOV'.
+	TYPE_LABEL      JMOV
+}
+DATA_CRITERIA JMOV1
+{
+	DATA_ATTRIBUTES_NAME JMOV
+	MODE            f
+	NAME_PATTERN    *.jmov
+}
+DATA_CRITERIA JMOV2
+{
+	DATA_ATTRIBUTES_NAME JMOV
+	MODE            f
+	NAME_PATTERN    *.JMV
+}
+ACTION Open
+{
+	LABEL		%|nls-1-Open|
+	ARG_TYPE        JMOV
+	TYPE            MAP
+	MAP_ACTION	DisplayVideo
+	DESCRIPTION     Use the Xanim viewer
+}
+ACTION Print
+{
+        LABEL           %|nls-2-Print|
+	ARG_TYPE        JMOV
+	TYPE            MAP
+	MAP_ACTION	NoPrint
+}
+
+
+
+###############################################################################
+## EOF
diff --git a/cde/programs/localized/C/types/virtualbox.dt b/cde/programs/types/virtualbox.dt
similarity index 100%
rename from cde/programs/localized/C/types/virtualbox.dt
rename to cde/programs/types/virtualbox.dt
diff --git a/cde/programs/types/vlc.dt b/cde/programs/types/vlc.dt
new file mode 100644
index 000000000..877effc7f
--- /dev/null
+++ b/cde/programs/types/vlc.dt
@@ -0,0 +1,34 @@
+######################################################################
+#
+#    Common Desktop Environment (CDE)
+#
+#    Action and DataType Definition File
+#
+#      Generated by the CreateAction tool
+#
+#      $Revision: 1.0
+#
+#      $KEY: 4747  
+#
+######################################################################
+#
+#    WARNING:
+#
+#    This file was generated by the CDE CreateAction tool.
+#    If this file is modified by some other tool, such as vi,
+#    the CreateAction tool will no longer be able to load and
+#    update this file.  For this reason, changes to this file
+#    should be handled through CreateAction whenever possible.
+#
+######################################################################
+
+ACTION vlc
+{
+     LABEL         vlc
+     TYPE          COMMAND
+     EXEC_STRING   vlc "%Arg_1%"
+     ICON          vlc
+     WINDOW_TYPE   NO_STDIO
+     DESCRIPTION   VLC Media Player
+}
+
diff --git a/cde/programs/localized/C/types/wicd.dt b/cde/programs/types/wicd.dt
similarity index 100%
rename from cde/programs/localized/C/types/wicd.dt
rename to cde/programs/types/wicd.dt
diff --git a/cde/programs/localized/C/types/xboard.dt b/cde/programs/types/xboard.dt
similarity index 100%
rename from cde/programs/localized/C/types/xboard.dt
rename to cde/programs/types/xboard.dt
diff --git a/cde/programs/localized/C/types/xdvi.dt b/cde/programs/types/xdvi.dt
similarity index 100%
rename from cde/programs/localized/C/types/xdvi.dt
rename to cde/programs/types/xdvi.dt
diff --git a/cde/programs/localized/C/types/xine.dt b/cde/programs/types/xine.dt
similarity index 100%
rename from cde/programs/localized/C/types/xine.dt
rename to cde/programs/types/xine.dt
diff --git a/cde/programs/localized/C/types/xournal.dt b/cde/programs/types/xournal.dt
similarity index 100%
rename from cde/programs/localized/C/types/xournal.dt
rename to cde/programs/types/xournal.dt
diff --git a/cde/programs/localized/C/types/xpdf.dt b/cde/programs/types/xpdf.dt
similarity index 56%
rename from cde/programs/localized/C/types/xpdf.dt
rename to cde/programs/types/xpdf.dt
index 92b721c44..631b45f0f 100644
--- a/cde/programs/localized/C/types/xpdf.dt
+++ b/cde/programs/types/xpdf.dt
@@ -29,44 +29,6 @@ ACTION xpdf
      EXEC_STRING   xpdf "%Arg_1%"
      ICON          xpdf
      WINDOW_TYPE   NO_STDIO
-     DESCRIPTION   Xpdf is the default pdf viewer.
+     DESCRIPTION   Xpdf pdf viewer.
 }
 
-DATA_ATTRIBUTES xpdf_FILE_1
-{
-     ACTIONS       Open,Print
-     ICON          acroread
-     DESCRIPTION   PDF files open with xpdf.
-}
-
-DATA_CRITERIA xpdf_FILE_1A
-{
-     DATA_ATTRIBUTES_NAME xpdf_FILE_1
-     MODE          !d
-     PATH_PATTERN  *.pdf
-}
-
-ACTION Open
-{
-     ARG_TYPE      xpdf_FILE_1
-     TYPE          MAP
-     MAP_ACTION    xpdf
-     LABEL         Open
-}
-
-ACTION xpdf_FILE_1_PRINT
-{
-     TYPE          COMMAND
-     EXEC_STRING   lpr "%Arg_1%"
-     WINDOW_TYPE   NO_STDIO
-}
-
-ACTION Print
-{
-     ARG_TYPE      xpdf_FILE_1
-     TYPE          MAP
-     MAP_ACTION    xpdf_FILE_1_PRINT
-     LABEL         Print
-}
-
-
diff --git a/cde/programs/types/xv.dt b/cde/programs/types/xv.dt
new file mode 100644
index 000000000..b280f7ac7
--- /dev/null
+++ b/cde/programs/types/xv.dt
@@ -0,0 +1,35 @@
+######################################################################
+#
+#    Common Desktop Environment (CDE)
+#
+#    Action and DataType Definition File
+#
+#      Generated by the CreateAction tool
+#
+#      $Revision: 1.0
+#
+#      $KEY: 108   
+#
+######################################################################
+#
+#    WARNING:
+#
+#    This file was generated by the CDE CreateAction tool.
+#    If this file is modified by some other tool, such as vi,
+#    the CreateAction tool will no longer be able to load and
+#    update this file.  For this reason, changes to this file
+#    should be handled through CreateAction whenever possible.
+#
+######################################################################
+
+ACTION xv
+{
+     LABEL         xv
+     TYPE          COMMAND
+     EXEC_STRING   xv "%Arg_1%"
+     ICON          xv
+     WINDOW_TYPE   NO_STDIO
+     DESCRIPTION   xv image viewer.
+}
+
+