diff --git a/.gitignore b/.gitignore
index 279cdba58..d9f09f1a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ po/stamp-it
stamp-h1
Makefile
__pycache__/
+src/gtk/
syntax: regexp
^config\.*
diff --git a/README b/README
index 22487a5d5..93766e0ee 100644
--- a/README
+++ b/README
@@ -1,23 +1,129 @@
-# Welcome to the Gajim project Wiki
-The goal of Gajim is to provide a full featured and easy to use Jabber/XMPP client. Gajim works nicely with GNOME, but does not require it to run. It is released under the GNU General Public License. If you find bugs or have ideas how Gajim can be better, please send tickets here.
+
+
+
+ Gajim - Read Me
+
+
+
-## Links
+Gajim Read Me
-- [Help and Documentation](https://dev.gajim.org/gajim/gajim/wikis/help/home)
- * FAQ, Did you know that...
- * Quickstart guides
- * Advanced configuration
-- [Community](https://dev.gajim.org/gajim/gajim/wikis/community/home)
- * Advanced use of gajim
- * User groups
- * Reviews
-- [Development](https://dev.gajim.org/gajim/gajim/wikis/development/home)
- * Guidelines and documentation
- * How to contribute
- * The Gajim team
-- Latest release:
- * [Gajim 0.16.6 (.tar.gz)](https://www.gajim.org/downloads/0.16/gajim-0.16.6.tar.gz)
- * [Gajim 0.16.6-1 (.exe)](https://www.gajim.org/downloads/0.16/gajim-0.16.6-1.exe)
- * [Daily snapshot (.tar.gz)](https://www.gajim.org/downloads/snap/?M=D)
+Welcome to Gajim and thank you for trying out our client.
-- [Bug reports and Feature requests](https://dev.gajim.org/gajim/gajim/issues)
\ No newline at end of file
+Runtime Requirements
+
+- python3.4 or higher
+- python3-gi
+- gir1.2-gtk-3.0
+- python-nbxmpp
+
+
+Optional Runtime Requirements
+
+- python3-openssl (>=0.14) for secure SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!
+- python3-pyasn1 to check SSL/TLS certificate
+- python3-crypto to enable End to end encryption
+- python3-gnupg to enable GPG encryption
+- For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi
+- dnsutils (or whatever package provides the nslookup binary) for SRV support
+- gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc
+- gir1.2-secret-1 for GNOME Keyring or KDE support as password storage
+- gir1.2-notify-0.7 to get cooler popups
+- D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.
+- python3-dbus bindings (>=1.2.0)
+- gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 and gir1.2-gst-plugins-base-1.0 for audio and video calls
+- gir1.2-gupnpigd-1.0 for better NAT traversing
+- gir1.2-networkmanager-1.0 for network lose detection
+
+
+Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever.
+
+Compile-time Requirements
+
+
+NOTE: If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies.
+
+Installation Procedure
+
+- tar jxvf gajim-version.tar.bz2
+- cd gajim
+- ./configure
+- make (builds translations)
+- su -c make install
+
+
+To specify where to install do:
+
+ ./configure --prefix=custom_path
+
+
+Running Gajim
+Just do gajim or you can run Gajim from your GNOME/Xfce/KDE/whatever menus.
+or if you use hg version and you didn't 'make install' you can also run from gajim folder with./launch.sh
+
+Note for hg users
+You will need GNU autotools in order to install Gajim from svn. This includes:
+
+- automake >= 1.8
+- autoconf >= 2.59
+- libtool
+- intltool-0.40.1
+- pkgconfig >= 0.19
+
+steps to compile gajim:
+
+ $ ./autogen.sh
+ $ ./configure
+ $ make
+
+Alternatively, if you don't want to install all these packages, you can get a nightly snapshot from here and procede as usual:
+
+ $ ./configure
+ $ make
+
+Uninstallation Procedure
+
+ su -c make uninstall
+
+this will try to remove Gajim from the default directories.
+If you want to remove it from custom directory provide it as:
+
+
+ ./configure --prefix=custom_path
+ make uninstall
+
+
+Miscellaneous
+XML & Debugging
+If you want to see the xml stanzas and/or help us debugging
+you're advised to enable verbose via advanced configuration window.
+If you don't want to make this permanent, execute gajim with --verbose
+everytime you want to have verbose output.
+
+FAQ/Wiki
+FAQ can be found at http://trac.gajim.org/wiki/GajimFaq
+Wiki can be found at http://trac.gajim.org/wiki
+
+
+That is all, enjoy!
+
+
+
+
+
+(C) 2003-2015
+The Gajim Team
+https://gajim.org
+
+
+
+PS.
+We use original art and parts of sounds and other art from Psi, Gossip,
+Gnomebaker, Gaim and some icons from various gnome-icons
+(mostly Dropline Etiquette) we found at art.gnome.org
+If you think we're violating a license please inform us. Thank you.
+
diff --git a/README.html b/README.html
deleted file mode 100644
index 93766e0ee..000000000
--- a/README.html
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-
- Gajim - Read Me
-
-
-
-
-Gajim Read Me
-
-Welcome to Gajim and thank you for trying out our client.
-
-Runtime Requirements
-
-- python3.4 or higher
-- python3-gi
-- gir1.2-gtk-3.0
-- python-nbxmpp
-
-
-Optional Runtime Requirements
-
-- python3-openssl (>=0.14) for secure SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!
-- python3-pyasn1 to check SSL/TLS certificate
-- python3-crypto to enable End to end encryption
-- python3-gnupg to enable GPG encryption
-- For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi
-- dnsutils (or whatever package provides the nslookup binary) for SRV support
-- gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc
-- gir1.2-secret-1 for GNOME Keyring or KDE support as password storage
-- gir1.2-notify-0.7 to get cooler popups
-- D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.
-- python3-dbus bindings (>=1.2.0)
-- gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 and gir1.2-gst-plugins-base-1.0 for audio and video calls
-- gir1.2-gupnpigd-1.0 for better NAT traversing
-- gir1.2-networkmanager-1.0 for network lose detection
-
-
-Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever.
-
-Compile-time Requirements
-
-
-NOTE: If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies.
-
-Installation Procedure
-
-- tar jxvf gajim-version.tar.bz2
-- cd gajim
-- ./configure
-- make (builds translations)
-- su -c make install
-
-
-To specify where to install do:
-
- ./configure --prefix=custom_path
-
-
-Running Gajim
-Just do gajim or you can run Gajim from your GNOME/Xfce/KDE/whatever menus.
-or if you use hg version and you didn't 'make install' you can also run from gajim folder with./launch.sh
-
-Note for hg users
-You will need GNU autotools in order to install Gajim from svn. This includes:
-
-- automake >= 1.8
-- autoconf >= 2.59
-- libtool
-- intltool-0.40.1
-- pkgconfig >= 0.19
-
-steps to compile gajim:
-
- $ ./autogen.sh
- $ ./configure
- $ make
-
-Alternatively, if you don't want to install all these packages, you can get a nightly snapshot from here and procede as usual:
-
- $ ./configure
- $ make
-
-Uninstallation Procedure
-
- su -c make uninstall
-
-this will try to remove Gajim from the default directories.
-If you want to remove it from custom directory provide it as:
-
-
- ./configure --prefix=custom_path
- make uninstall
-
-
-Miscellaneous
-XML & Debugging
-If you want to see the xml stanzas and/or help us debugging
-you're advised to enable verbose via advanced configuration window.
-If you don't want to make this permanent, execute gajim with --verbose
-everytime you want to have verbose output.
-
-FAQ/Wiki
-FAQ can be found at http://trac.gajim.org/wiki/GajimFaq
-Wiki can be found at http://trac.gajim.org/wiki
-
-
-That is all, enjoy!
-
-
-
-
-
-(C) 2003-2015
-The Gajim Team
-https://gajim.org
-
-
-
-PS.
-We use original art and parts of sounds and other art from Psi, Gossip,
-Gnomebaker, Gaim and some icons from various gnome-icons
-(mostly Dropline Etiquette) we found at art.gnome.org
-If you think we're violating a license please inform us. Thank you.
-
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..22487a5d5
--- /dev/null
+++ b/README.md
@@ -0,0 +1,23 @@
+# Welcome to the Gajim project Wiki
+The goal of Gajim is to provide a full featured and easy to use Jabber/XMPP client. Gajim works nicely with GNOME, but does not require it to run. It is released under the GNU General Public License. If you find bugs or have ideas how Gajim can be better, please send tickets here.
+
+## Links
+
+- [Help and Documentation](https://dev.gajim.org/gajim/gajim/wikis/help/home)
+ * FAQ, Did you know that...
+ * Quickstart guides
+ * Advanced configuration
+- [Community](https://dev.gajim.org/gajim/gajim/wikis/community/home)
+ * Advanced use of gajim
+ * User groups
+ * Reviews
+- [Development](https://dev.gajim.org/gajim/gajim/wikis/development/home)
+ * Guidelines and documentation
+ * How to contribute
+ * The Gajim team
+- Latest release:
+ * [Gajim 0.16.6 (.tar.gz)](https://www.gajim.org/downloads/0.16/gajim-0.16.6.tar.gz)
+ * [Gajim 0.16.6-1 (.exe)](https://www.gajim.org/downloads/0.16/gajim-0.16.6-1.exe)
+ * [Daily snapshot (.tar.gz)](https://www.gajim.org/downloads/snap/?M=D)
+
+- [Bug reports and Feature requests](https://dev.gajim.org/gajim/gajim/issues)
\ No newline at end of file
diff --git a/README.transifex b/README.transifex
deleted file mode 100644
index f122a7e7f..000000000
--- a/README.transifex
+++ /dev/null
@@ -1,11 +0,0 @@
-Transifex.net Token Verification
-=================================
-
-The list of tokens bellow guarantee the respective users to be able to enable
-submission on components using the following repository url:
-
-ssh://hg.gajim.org/gajim
-
-Tokens:
-
-JzQjKFEfvEhybB3vKxvsNYfusnpxWth3 / asterix