diff --git a/common/skin/icon.png b/common/skin/icon.png
deleted file mode 100644
index 07a33314..00000000
Binary files a/common/skin/icon.png and /dev/null differ
diff --git a/common/skin/vimperator_labs.svg b/common/skin/vimperator_labs.svg
new file mode 100644
index 00000000..fb0edc85
--- /dev/null
+++ b/common/skin/vimperator_labs.svg
@@ -0,0 +1,165 @@
+
+
+
diff --git a/common/skin/vimperator_labs_favicon.png b/common/skin/vimperator_labs_favicon.png
new file mode 100644
index 00000000..3e9b87c7
Binary files /dev/null and b/common/skin/vimperator_labs_favicon.png differ
diff --git a/common/skin/vimperator_labs_favicon.svg b/common/skin/vimperator_labs_favicon.svg
new file mode 100644
index 00000000..2604fb24
--- /dev/null
+++ b/common/skin/vimperator_labs_favicon.svg
@@ -0,0 +1,179 @@
+
+
+
diff --git a/common/skin/vimperator_labs_white.png b/common/skin/vimperator_labs_white.png
new file mode 100644
index 00000000..197d3b61
Binary files /dev/null and b/common/skin/vimperator_labs_white.png differ
diff --git a/muttator/chrome.manifest b/muttator/chrome.manifest
index d4aaf20d..a5d8a170 100644
--- a/muttator/chrome.manifest
+++ b/muttator/chrome.manifest
@@ -1,5 +1,6 @@
# Thunderbird
-content muttator content/
+content muttator content/
+skin muttator classic/1.0 skin/
locale liberator en-US locale/en-US/
content liberator ../common/content/
diff --git a/muttator/content/muttator.png b/muttator/content/muttator.png
index dd37eebb..61abb0ea 100644
Binary files a/muttator/content/muttator.png and b/muttator/content/muttator.png differ
diff --git a/muttator/content/muttator.svg b/muttator/content/muttator.svg
new file mode 100644
index 00000000..fd5192fa
--- /dev/null
+++ b/muttator/content/muttator.svg
@@ -0,0 +1,88 @@
+
+
+
diff --git a/muttator/install.rdf b/muttator/install.rdf
index f5f9b58b..e4f2fbf9 100644
--- a/muttator/install.rdf
+++ b/muttator/install.rdf
@@ -8,9 +8,8 @@
###VERSION###
Make Thunderbird behave like Vim
Martin Stubenschrott
- http://muttator.mozdev.org
+ http://vimperator.org/
chrome://muttator/skin/icon.png
-
content/muttator/
diff --git a/muttator/skin/icon.png b/muttator/skin/icon.png
index b65189b4..86376a9b 100644
Binary files a/muttator/skin/icon.png and b/muttator/skin/icon.png differ
diff --git a/muttator/skin/liberator.css b/muttator/skin/liberator.css
deleted file mode 100644
index 1dcaf2d9..00000000
--- a/muttator/skin/liberator.css
+++ /dev/null
@@ -1,207 +0,0 @@
-/***** BEGIN LICENSE BLOCK ***** {{{
-Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
-The contents of this file are subject to the Mozilla Public License Version
-1.1 (the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS" basis,
-WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-for the specific language governing rights and limitations under the
-License.
-
-(c) 2006-2008: Martin Stubenschrott
-
-Alternatively, the contents of this file may be used under the terms of
-either the GNU General Public License Version 2 or later (the "GPL"), or
-the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-in which case the provisions of the GPL or the LGPL are applicable instead
-of those above. If you wish to allow use of your version of this file only
-under the terms of either the GPL or the LGPL, and not to allow others to
-use your version of this file under the terms of the MPL, indicate your
-decision by deleting the provisions above and replace them with the notice
-and other provisions required by the GPL or the LGPL. If you do not delete
-the provisions above, a recipient may use your version of this file under
-the terms of any one of the MPL, the GPL or the LGPL.
-}}} ***** END LICENSE BLOCK *****/
-
-#liberator-container {
- font-family: monospace;
-}
-
-#liberator-completions {
- -moz-user-focus: ignore;
- overflow: -moz-scrollbars-none !important; /* does not seem to work fully */
- border-width: 0px !important;
- /*-moz-appearance: none !important; /* prevent an ugly 3D border */
-}
-
-/* the selected item in listboxes is hardly readable without this */
-#liberator-completion > listitem[selected="true"] > listcell,
-#liberator-bufferwindow > listitem[selected="true"] > listcell,
-#liberator-previewwindow > listitem[selected="true"] > listcell {
- background-color: Highlight !important;
- color: HighlightText !important;
-}
-
-/*.liberator-compitem {
- min-height: 16px;
-}*/
-
-/* fixes the min-height: 22px from firefox */
-#status-bar, statusbarpanel {
- -moz-appearance: none !important;
- min-height: 18px !important;
- border: none !important;
- font-weight: bold;
- font-family: monospace;
-}
-#liberator-statusline {
- font-family: monospace;
- margin: 0px;
-}
-#liberator-statusline > label {
- padding: 0px 0px 0px 8px;
-}
-#liberator-statusline > label:first-child {
- padding: 0px;
-}
-#liberator-statusline-field-url {
- background-color: inherit;
- color: inherit;
-}
-
-/* no longer at the window's bottom right corner */
-.statusbar-resizerpanel {
- display: none;
-}
-#statusbar-display, #statusbar-progresspanel {
- display: none;
-}
-
-#liberator-commandline {
- padding: 1px;
- font-family: monospace;
- /*
- background-color: white;
- color: black;
- */
-}
-#liberator-commandline-prompt {
- margin: 0px;
- padding: 0px;
- background-color: inherit;
-}
-#liberator-commandline-command {
- background-color: inherit;
- color: inherit;
-}
-
-#liberator-visualbell {
- border: none;
- background-color: black;
-}
-
-#sidebar {
- max-width: 90% !important;
- min-width: 10% !important;
-}
-
-/* highlight groups */
-
-.hl-Normal {
- background-color: white;
- color: black;
-}
-.hl-ErrorMsg {
- background-color: red;
- color: white;
- font-weight: bold;
-}
-.hl-InfoMsg {
- background-color: white;
- color: magenta;
-}
-.hl-ModeMsg {
- background-color: white;
- color: black;
-}
-.hl-MoreMsg {
- background-color: white;
- color: green;
-}
-.hl-Question {
- background-color: white;
- color: green;
-}
-.hl-Title {
- background-color: white;
- color: magenta;
- font-weight: bold;
-}
-.hl-Warning {
- background-color: white;
- color: red;
-}
-.hl-StatusLine {
- background: none !important;
- background-color: black !important;
- color: white !important;
-}
-.hl-StatusLineSecure {
- background: none !important;
- background-color: #B0FF00 !important; /* light green */
- color: black !important;
-}
-.hl-StatusLineBroken {
- background: none !important;
- background-color: #FF6060 !important; /* light red */
- color: black !important;
-}
-.hl-URL {
- background-color: inherit;
- color: green;
- text-decoration: none;
-}
-/* NOTE: .aClass:hover not supported in quirks mode: http://developer.mozilla.org/en/docs/Mozilla_Quirks_Mode_Behavior */
-a.hl-URL:hover {
- text-decoration: underline;
- cursor: pointer;
-}
-
-/* MOW */
-
-#liberator-completions, #liberator-multiline-output {
- overflow: hidden;
- background-color: white;
- color: black;
-}
-
-#liberator-completions-content, #liberator-multiline-output-content {
- white-space: pre;
- font-family: -moz-fixed;
- margin: 0px;
-}
-
-#liberator-completions-content *, #liberator-multiline-output-content * {
- font: inherit;
-}
-
-#liberator-completions-content table, #liberator-multiline-output-content table {
- white-space: inherit;
- border-spacing: 0px;
-}
-
-#liberator-completions-content td, #liberator-multiline-output-content td,
-#liberator-completions-content th, #liberator-multiline-output-content th {
- padding: 0px 2px;
-}
-
-/* for muttator's composer */
-#content-frame, #appcontent {
- border: 0px;
-}
-
-
-/* vim: set fdm=marker sw=4 ts=4 et: */
diff --git a/vimperator/chrome.manifest b/vimperator/chrome.manifest
index 495f62ef..45dc03bc 100644
--- a/vimperator/chrome.manifest
+++ b/vimperator/chrome.manifest
@@ -1,5 +1,6 @@
# Firefox
-content vimperator content/
+content vimperator content/
+skin vimperator classic/1.0 skin/
locale liberator en-US locale/en-US/
content liberator ../common/content/
diff --git a/vimperator/content/vimperator.png b/vimperator/content/vimperator.png
index 4957a19a..52ff0c8d 100644
Binary files a/vimperator/content/vimperator.png and b/vimperator/content/vimperator.png differ
diff --git a/vimperator/content/vimperator.svg b/vimperator/content/vimperator.svg
new file mode 100644
index 00000000..7e2983ed
--- /dev/null
+++ b/vimperator/content/vimperator.svg
@@ -0,0 +1,88 @@
+
+
+
diff --git a/vimperator/install.rdf b/vimperator/install.rdf
index 766c2a95..382d53d0 100644
--- a/vimperator/install.rdf
+++ b/vimperator/install.rdf
@@ -8,9 +8,8 @@
###VERSION###
Make Firefox behave like Vim
Martin Stubenschrott
- http://vimperator.mozdev.org
- chrome://liberator/skin/icon.png
-
+ http://vimperator.org
+ chrome://vimperator/skin/icon.png
content/vimperator/
diff --git a/vimperator/skin/icon.png b/vimperator/skin/icon.png
new file mode 100644
index 00000000..a8ae786c
Binary files /dev/null and b/vimperator/skin/icon.png differ