diff --git a/reactos/boot/bootdata/hivesft.inf b/reactos/boot/bootdata/hivesft.inf
index 700a121185a..3a29d7717ec 100644
--- a/reactos/boot/bootdata/hivesft.inf
+++ b/reactos/boot/bootdata/hivesft.inf
@@ -37,15 +37,15 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList",,0x00000012
 
 ; Font substitutes
 ; SysFontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"Bitstream Vera Sans"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"Bitstream Vera Sans Mono"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"DejaVu Vera Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"DejaVu Vera Sans Mono"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Marlett",0x00000000,"TGMarlett"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"Bitstream Vera Serif"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"Bitstream Vera Sans"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"Bitstream Vera Sans"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"Bitstream Vera Sans"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"Bitstream Vera Sans"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"Bitstream Vera Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"DejaVu Vera Serif"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"DejaVu Vera Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Vera Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"DejaVu Vera Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Vera Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"DejaVu Vera Sans"
 
 ; Time zone settings
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones",,0x00000012
diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index 13d88ca69dd..80022305fd6 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -57,6 +57,7 @@ base\applications\regedit\clb\clb.dll               1
 ;base\applications\reporterror\reporterror.exe      1
 base\applications\sc\sc.exe                         1
 base\applications\screenshot\screenshot.exe         1
+base\applications\screensavers\matrix\matrix.scr    1
 base\applications\servman\servman.exe               1
 base\applications\shutdown\shutdown.exe             1
 ;base\applications\sm\sm.exe                        1
@@ -267,6 +268,26 @@ drivers\video\miniport\vbe\vbemp.sys                2
 drivers\video\videoprt\videoprt.sys                 2
 
 ; Media
+media\fonts\DejaVuSans.ttf                          3
+media\fonts\DejaVuSans-Bold.ttf                     3    
+media\fonts\DejaVuSans-BoldOblique.ttf              3  
+media\fonts\DejaVuSansCondensed.ttf                 3
+media\fonts\DejaVuSansCondensed-Bold.ttf            3
+media\fonts\DejaVuSansCondensed-Oblique.ttf         3
+media\fonts\DejaVuSans-ExtraLight.ttf               3
+media\fonts\DejaVuSansMono.ttf                      3
+media\fonts\DejaVuSansMono-Bold.ttf                 3
+media\fonts\DejaVuSansMono-BoldOblique.ttf          3
+media\fonts\DejaVuSansMono-Oblique.ttf              3
+media\fonts\DejaVuSans-Oblique.ttf                  3  
+media\fonts\DejaVuSerif.ttf                         3
+media\fonts\DejaVuSerif-Bold.ttf                    3
+media\fonts\DejaVuSerif-BoldOblique.ttf             3
+media\fonts\DejaVuSerifCondensed.ttf                3
+media\fonts\DejaVuSerifCondensed-Bold.ttf           3
+media\fonts\DejaVuSerifCondensed-BoldOblique.ttf    3 
+media\fonts\DejaVuSerifCondensed-Oblique.ttf        3 
+media\fonts\DejaVuSerif-Oblique.ttf                 3
 media\fonts\c0419bt_.ttf                            3
 media\fonts\c0582bt_.ttf                            3
 media\fonts\c0583bt_.ttf                            3