diff --git a/src/install.rdf b/src/install.rdf
index e912530..3638946 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -1,65 +1,72 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
     <Description about="urn:mozilla:install-manifest">
+        <!-- General -->
         <em:id>splashed@franklindm</em:id>
-        <em:name>Splashed!</em:name>
         <em:version>dev-build</em:version>
-        <em:description>Adds a splash screen on startup while you wait.</em:description>
         <em:type>2</em:type>
-        <em:creator>FranklinDM</em:creator>
-        <em:homepageURL>https://github.com/FranklinDM/Splashed/wiki</em:homepageURL>
         <em:iconURL>chrome://splash/skin/icon.png</em:iconURL>
+        <em:homepageURL>https://github.com/FranklinDM/Splashed/wiki</em:homepageURL>
         <em:optionsURL>chrome://splash/content/options.xul</em:optionsURL>
-        
-        <!-- Contributors -->
+
+        <!-- Front-end metadata -->
+        <em:name>Splashed!</em:name>
+        <em:description>Adds a splash screen on startup while you wait.</em:description>
+
+        <!-- Authors -->
+        <em:creator>FranklinDM</em:creator>
         <em:contributor>Aldreneo and mrtech (creators of Splash!)</em:contributor>
         <em:contributor>Pike</em:contributor>
         <em:contributor>mcdavis941 (Images)</em:contributor>
         <em:contributor>badassfeline (More Images)</em:contributor>
-        
-        <!-- Translators -->
         <em:translator>AHOHNMYC (Russian)</em:translator>
         <em:translator>FranklinDM (Tagalog/Filipino)</em:translator>
 
-        <!-- Pale Moon -->
+        <!-- Targeted applications -->
         <em:targetApplication>
+            <!-- Pale Moon -->
             <Description>
                 <em:id>{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}</em:id>
                 <em:minVersion>28.0.0a1</em:minVersion>
                 <em:maxVersion>29.*</em:maxVersion>
             </Description>
         </em:targetApplication>
-        <!-- Interlink -->
         <em:targetApplication>
+            <!-- Applications using Firefox GUID -->
             <Description>
-                <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-                <em:minVersion>52.0.0</em:minVersion>
-                <em:maxVersion>52.*</em:maxVersion>
+                <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+                <!--
+                    Pale Moon 30 and above will stop using its own GUID to
+                    "further improve extension compatibility"
+                 -->
+                <em:minVersion>30.0.0a1</em:minVersion>
+                <em:maxVersion>30.*</em:maxVersion>
+                <!-- Formerly used to detect Basilisk in the Add-ons Site -->
+                <em:basilisk>true</em:basilisk>
             </Description>
         </em:targetApplication>
-        <!-- Borealis Navigator -->
         <em:targetApplication>
+            <!-- Applications using Thunderbird GUID -->
             <Description>
-                <em:id>{a3210b97-8e8a-4737-9aa0-aa0e607640b9}</em:id>
-                <em:minVersion>1.0.0a1</em:minVersion>
-                <em:maxVersion>1.*</em:maxVersion>
+                <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+                <em:minVersion>52.0.0a1</em:minVersion>
+                <em:maxVersion>52.*</em:maxVersion>
             </Description>
         </em:targetApplication>
-        <!-- Applications using Firefox GUID -->
         <em:targetApplication>
+            <!-- SeaMonkey -->
             <Description>
-                <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-                <em:minVersion>38.0</em:minVersion>
-                <em:maxVersion>55.*</em:maxVersion>
-                <em:basilisk>true</em:basilisk>
+                <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+                <em:minVersion>2.0</em:minVersion>
+                <em:maxVersion>2.*</em:maxVersion>
             </Description>
         </em:targetApplication>
-        <!-- SeaMonkey -->
         <em:targetApplication>
+            <!-- Borealis Navigator -->
             <Description>
-                <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-                <em:minVersion>2.18</em:minVersion>
-                <em:maxVersion>2.*</em:maxVersion>
+                <em:id>{a3210b97-8e8a-4737-9aa0-aa0e607640b9}</em:id>
+                <em:minVersion>0.9.0a1</em:minVersion>
+                <em:maxVersion>1.*</em:maxVersion>
             </Description>
         </em:targetApplication>
     </Description>