diff --git a/chrome.manifest b/chrome.manifest
index 570fb5b9..0e6fa900 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -3,9 +3,14 @@ content  liberator content/
 resource liberator modules/
 locale   liberator en-US locale/en-US/
 skin     liberator classic/1.0 skin/
+
 override chrome://liberator/content/liberator.dtd chrome://liberator/content/muttator.dtd
+override chrome://liberator/content/config.js chrome://liberator/content/muttator.js
+
 overlay  chrome://messenger/content/messenger.xul chrome://liberator/content/liberator.xul
 overlay  chrome://messenger/content/messenger.xul chrome://liberator/content/muttator.xul
-overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/liberator.xul
-#overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/muttatorcompose.xul
+
+#1
+#override chrome://liberator/content/compose/liberator.xul chrome://liberator/content/liberator.xul
+overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/compose/liberator.xul
 overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/compose/compose.xul