diff --git a/fonts/.fonts.conf b/fonts/.fonts.conf
index 2d029ba..211a6df 100644
--- a/fonts/.fonts.conf
+++ b/fonts/.fonts.conf
@@ -284,17 +284,36 @@
 	<match target="font">
 		<test qual="any" name="family" compare="eq">
 			<string>Arial</string>
+        </test>
+        <test qual="any" name="family" compare="eq">
 			<string>Arial Narrow</string>
+        </test>
+        <test qual="any" name="family" compare="eq">
 			<string>Berling Antiqua</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>Book Antiqua</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>Bookman Old Style</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>Garamond</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<!-- Lucida Console has no italic and uses artificial oblique -->
 			<string>Lucida Console</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>Palatino Linotype</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>SylfaenARM</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>Times New Roman</string>
 		</test>
+
 		<test qual="any" name="pixelsize" compare="less_eq">
 			<double>17.4</double>
 		</test>
@@ -315,6 +334,8 @@
 	<match target="font">
 	<test qual="any" name="family" compare="eq">
 	<string>Century Gothic</string>
+    </test>
+    <test qual="any" name="family" compare="eq">
 	<string>Kartika</string>
 	</test>
 	<test qual="any" name="pixelsize" compare="less_eq">
@@ -400,6 +421,8 @@
 	<match target="font">
 	<test qual="any" name="family" compare="eq">
 	<string>Tahoma</string>
+    </test>
+    <test qual="any" name="family" compare="eq">
 	<string>Verdana</string>
 	</test>
 	<test qual="any" name="pixelsize" compare="less_eq">
@@ -464,22 +487,56 @@
 	<match target="font">
 		<test qual="any" name="family" compare="eq">
 			<string>Bitstream Charter</string>
+        </test>
+        <test qual="any" name="family" compare="eq">
 			<string>Courier 10 Pitch</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>DejaVu Sans Condensed</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>DejaVu Serif Condensed</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>FreeMono</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>FreeSans</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>FreeSerif</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>Luxi Mono</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>Luxi Sans</string>
+        </test>
+        <test qual="any" name="family" compare="eq">
 			<string>Luxi Serif</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>MgOpen Canonica</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>MgOpen Cosmetica</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>MgOpen Modata</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>MgOpen Moderna</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>URW Bookman L</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>URW Chancery L</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>URW Gothic L</string>
+		</test>
+        <test qual="any" name="family" compare="eq">
 			<string>URW Palladio L</string>
 		</test>
 
@@ -544,11 +601,16 @@
 	<test qual="any" name="family" compare="eq">
 	<!-- 10, 11, 12 -->
 	<string>Frutiger Linotype</string>
+    </test>
+    <test qual="any" name="family" compare="eq">
 	<!--  8-9: 'z', '2'; 10-15, 17, 19: 'z' -->
 	<string>Times New Roman</string>
+	</test>
+    <test qual="any" name="family" compare="eq">
 	<!-- 9-10: 'N' 'Q'; 12: 'w', 'C', 'D', 'O', 'Q', 'R', '2', '9', '0' -->
 	<string>Verdana</string>
 	</test>
+
 	<test qual="any" name="weight" compare="less_eq">
 	<const>medium</const>
 	</test>
@@ -638,18 +700,18 @@
 
 		FIXME: QT only? GTK? Firefox?
 	-->
-	<!-- FIXME: dirty_hack(tm) - fontconfig reports syntax errors -->
+    <!-- FIXME: dirty_hack(tm) - fontconfig reports syntax errors -->
+    <!--
 	<match target="font">
 	<test qual="any" name="matrix" compare="not_eq">
 	<double>0</double>
-	</test>
+    </test>
+    -->
 	<!-- another approach - no errors but freezes Firefox 1.5 -->
-	<!--
 	<match target="font">
 	<test qual="any" name="matrix" compare="eq">
 	<name>matrix</name>
 	</test>
-	-->
 	<edit name="antialias" mode="assign">
 	<bool>true</bool>
 	</edit>
@@ -1323,8 +1385,11 @@
 	<match target="font">
 		<test qual="any" name="family" compare="eq">
 			<string>Droid Sans</string>
+        </test>
+        <test qual="any" name="family" compare="eq">
 			<string>Droid Sans Mono</string>
 		</test>
+
 		<edit mode="assign" name="autohint">
 			<bool>false</bool>
 		</edit>
@@ -1454,9 +1519,12 @@
 	<match target="pattern">
 		<test qual="any" name="family" compare="eq">
 			<string>Times New Roman</string>
+        </test>
+        <test qual="any" name="family" compare="eq">
 			<string>serif</string>
 		</test>
 
+
 		<edit name="family" mode="prepend" binding="same">
 			<string>Noto Serif</string>
 		</edit>
@@ -1532,8 +1600,11 @@
 	<match target="font">
 		<test compare="eq" name="family" qual="any">
 			<string>gargi</string>
+        </test>
+        <test compare="eq" name="family" qual="any">
 			<string>Lohit Hindi</string>
 		</test>
+
 		<edit mode="assign" name="antialias">
 			<bool>true</bool>
 		</edit>