diff --git a/conf.d/45-generic.conf b/conf.d/45-generic.conf
index f7497b9..cc3eb58 100644
--- a/conf.d/45-generic.conf
+++ b/conf.d/45-generic.conf
@@ -4,6 +4,28 @@
 <!-- Keep in sync with 60-generic.conf -->
 
 <!-- Emoji -->
+
+	<!-- Prefer to match color emoji font. -->
+	<match>
+		<test name="lang">
+			<string>und-zsye</string>
+		</test>
+		<test qual="all" name="color" compare="not_eq">
+			<bool>true</bool>
+		</test>
+		<test qual="all" name="color" compare="not_eq">
+			<bool>false</bool>
+		</test>
+		<edit name="color" mode="append">
+			<bool>true</bool>
+		</edit>
+	</match>
+
+	<!-- TODO
+	 ! Match on "color" and alias B&W ones first if no color is requested.
+	 ! That's "hard" because <alias> doesn't work in match and needs to be
+	 ! expanded to its non-sugar form.
+	 !-->
 	<alias binding="same">
 		<family>Emoji Two</family>
 		<default><family>emoji</family></default>
@@ -32,6 +54,7 @@
 		<family>EmojiOne Mozilla</family> <!-- Mozilla -->
 		<default><family>emoji</family></default>
 	</alias>
+	<!-- B&W -->
 	<alias binding="same">
 		<family>Noto Emoji</family> <!-- Google -->
 		<default><family>emoji</family></default>
@@ -41,7 +64,19 @@
 		<default><family>emoji</family></default>
 	</alias>
 
+	<!-- Add language for emoji, to match other emoji fonts. -->
+	<match>
+		<test name="family">
+			<string>emoji</string>
+		</test>
+		<edit name="lang" mode="prepend">
+			<string>und-zsye</string>
+		</edit>
+	</match>
+
+
 <!-- Math -->
+
 	<!-- https://en.wikipedia.org/wiki/Category:Mathematical_OpenType_typefaces -->
 	<alias binding="same">
 		<family>XITS Math</family> <!-- Khaled Hosny -->
@@ -72,17 +107,7 @@
 		<default><family>math</family></default>
 	</alias>
 
-
-	<!-- add a lang for emoji if requesting emoji family -->
-	<match>
-		<test name="family">
-			<string>emoji</string>
-		</test>
-		<edit name="lang" mode="prepend">
-			<string>und-zsye</string>
-		</edit>
-	</match>
-	<!-- add a lang for math if requesting math family -->
+	<!-- Add language for math, to match other math fonts. -->
 	<match>
 		<test name="family">
 			<string>math</string>
@@ -91,20 +116,6 @@
 			<string>und-zmth</string>
 		</edit>
 	</match>
-	<!-- prefer to use the color emoji font if none is specified -->
-	<match>
-		<test name="lang">
-			<string>und-zsye</string>
-		</test>
-		<test qual="all" name="color" compare="not_eq">
-			<bool>true</bool>
-		</test>
-		<test qual="all" name="color" compare="not_eq">
-			<bool>false</bool>
-		</test>
-		<edit name="color" mode="append">
-			<bool>true</bool>
-		</edit>
-	</match>
+
 
 </fontconfig>
diff --git a/conf.d/60-generic.conf b/conf.d/60-generic.conf
index c70dd89..00246fa 100644
--- a/conf.d/60-generic.conf
+++ b/conf.d/60-generic.conf
@@ -4,6 +4,7 @@
 <!-- Keep in sync with 45-generic.conf -->
 
 <!-- Emoji -->
+
 	<alias binding="same">
 		<family>emoji</family>
 		<prefer>