diff --git a/data/terminator.metainfo.xml b/data/terminator.metainfo.xml
new file mode 100644
index 000000000..6b044ccae
--- /dev/null
+++ b/data/terminator.metainfo.xml
@@ -0,0 +1,522 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+ <id>terminator.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0-only</project_license>
+ <name>Terminator</name>
+ <name xml:lang="af">Terminator</name>
+ <name xml:lang="ar">المتطرف</name>
+ <name xml:lang="ast">Terminator</name>
+ <name xml:lang="az">Terminator</name>
+ <name xml:lang="be">Тэрмінатар</name>
+ <name xml:lang="bg">Терминатор</name>
+ <name xml:lang="bn">টার্মিনেটর</name>
+ <name xml:lang="bs">Terminator</name>
+ <name xml:lang="ca">Terminator</name>
+ <name xml:lang="ca@valencia">Terminator</name>
+ <name xml:lang="cs">Terminátor</name>
+ <name xml:lang="da">Terminator</name>
+ <name xml:lang="de">Terminator</name>
+ <name xml:lang="el">Terminator</name>
+ <name xml:lang="en_AU">Terminator</name>
+ <name xml:lang="en_CA">Terminator</name>
+ <name xml:lang="en_GB">Terminator</name>
+ <name xml:lang="eo">Terminatoro</name>
+ <name xml:lang="es">Terminator</name>
+ <name xml:lang="et">Terminator</name>
+ <name xml:lang="eu">Terminator</name>
+ <name xml:lang="fa">ترمیناتور</name>
+ <name xml:lang="fi">Terminator</name>
+ <name xml:lang="fo">Terminator</name>
+ <name xml:lang="fr">Terminator</name>
+ <name xml:lang="gl">Terminador</name>
+ <name xml:lang="he">Terminator</name>
+ <name xml:lang="hi">टर्मिनेटर</name>
+ <name xml:lang="hr">Terminator</name>
+ <name xml:lang="hu">Terminator</name>
+ <name xml:lang="hy">Terminator</name>
+ <name xml:lang="ia">Terminator</name>
+ <name xml:lang="id">Terminator</name>
+ <name xml:lang="is">Terminator</name>
+ <name xml:lang="it">Terminator</name>
+ <name xml:lang="ja">Terminator</name>
+ <name xml:lang="jv">Terminator</name>
+ <name xml:lang="ka">Terminator</name>
+ <name xml:lang="kk">Терминатор</name>
+ <name xml:lang="ko">터미네이터</name>
+ <name xml:lang="lt">Terminator</name>
+ <name xml:lang="lv">Terminator</name>
+ <name xml:lang="mk">Терминатор</name>
+ <name xml:lang="ml">ടെര്‍മിനേറ്റര്‍</name>
+ <name xml:lang="ms">Terminator</name>
+ <name xml:lang="nb">Terminator</name>
+ <name xml:lang="nl">Terminator</name>
+ <name xml:lang="oc">Terminator</name>
+ <name xml:lang="pl">Terminator</name>
+ <name xml:lang="pt">Terminator</name>
+ <name xml:lang="pt_BR">Terminator</name>
+ <name xml:lang="ro">Terminator</name>
+ <name xml:lang="ru">Terminator</name>
+ <name xml:lang="ru_RU">Терминатор</name>
+ <name xml:lang="si">ටර්මිනේටර්</name>
+ <name xml:lang="sk">Terminátor</name>
+ <name xml:lang="sl">Terminator</name>
+ <name xml:lang="sq">Terminator</name>
+ <name xml:lang="sr">Терминатор</name>
+ <name xml:lang="su">Terminator</name>
+ <name xml:lang="sv">Terminator</name>
+ <name xml:lang="sw">Terminator</name>
+ <name xml:lang="ta">முனையம்</name>
+ <name xml:lang="te">టెర్మినేటర్</name>
+ <name xml:lang="th">Terminator</name>
+ <name xml:lang="tr">Uçbirim</name>
+ <name xml:lang="uk">Terminator</name>
+ <name xml:lang="ur">Terminator</name>
+ <name xml:lang="vi">Terminator</name>
+ <name xml:lang="zh_CN">Terminator 终端终结者</name>
+ <name xml:lang="zh_TW">Terminator</name>
+ <summary>Multiple terminals in one window</summary>
+ <summary xml:lang="af">Veelvuldige terminale in een venster</summary>
+ <summary xml:lang="ar">العديد من الطرفيات في نافذة واحدة</summary>
+ <summary xml:lang="ast">Delles terminales nuna ventana</summary>
+ <summary xml:lang="az">Çoxsaylı terminallar bir pəncərədə</summary>
+ <summary xml:lang="be">Некалькі тэрміналаў у акне</summary>
+ <summary xml:lang="bg">Множество терминали в един прозорец</summary>
+ <summary xml:lang="bn">এক উইন্ডোতে একাধিক টার্মিনাল</summary>
+ <summary xml:lang="bs">Više terminala u jednom prozoru</summary>
+ <summary xml:lang="ca">Diversos terminals en una finestra</summary>
+ <summary xml:lang="ca@valencia">Diversos terminals en una finestra</summary>
+ <summary xml:lang="cs">Vícero terminálů v jednom okně</summary>
+ <summary xml:lang="da">Flere terminaler i et vindue</summary>
+ <summary xml:lang="de">Mehrere Terminals in einem Fenster</summary>
+ <summary xml:lang="el">Πολλαπλά τερματικά σε ένα παράθυρο</summary>
+ <summary xml:lang="en_AU">Multiple terminals in one window</summary>
+ <summary xml:lang="en_CA">Multiple terminals in one window</summary>
+ <summary xml:lang="en_GB">Multiple terminals in one window</summary>
+ <summary xml:lang="eo">Pluraj terminaloj en unu fenestro</summary>
+ <summary xml:lang="es">Múltiples terminales en una ventana</summary>
+ <summary xml:lang="et">Mitu terminaali ühes aknas</summary>
+ <summary xml:lang="eu">Hainbat terminal leiho bakarrean</summary>
+ <summary xml:lang="fi">Useita päätteitä yhdessä ikkunassa</summary>
+ <summary xml:lang="fr">Permet d'avoir plusieurs terminaux en une seule fenêtre</summary>
+ <summary xml:lang="gl">Múltiples terminales nunha ventá</summary>
+ <summary xml:lang="he">מסופים מרובים בחלון אחד</summary>
+ <summary xml:lang="hi">एक विंडो में अनेक  टर्मिनल</summary>
+ <summary xml:lang="hr">Višebrojni terminali u jednom prozoru</summary>
+ <summary xml:lang="hu">Több terminál egy ablakban</summary>
+ <summary xml:lang="hy">Մի քանի տերմինալ մեկ պատուհանում</summary>
+ <summary xml:lang="ia">Plure terminales in un fenestra</summary>
+ <summary xml:lang="id">Banyak terminal dalam satu window</summary>
+ <summary xml:lang="is">Margar útstöðvar í einum glugga</summary>
+ <summary xml:lang="it">Molteplici terminali un una sola finestra</summary>
+ <summary xml:lang="ja">複数の端末を一つのウインドウに</summary>
+ <summary xml:lang="jv">Akeh terminal ning sak jendelo</summary>
+ <summary xml:lang="ka">მრავალი ტერმინალები ერთ ფანჯარაში</summary>
+ <summary xml:lang="kk">Бір терезе ішінде көптік терминалдар</summary>
+ <summary xml:lang="ko">창 하나에 터미널 여러 개 쓰기</summary>
+ <summary xml:lang="lt">Keli terminalai viename lange</summary>
+ <summary xml:lang="lv">Daudzi termināļi vienā logā</summary>
+ <summary xml:lang="mk">Повеќе терминали во еден прозорец</summary>
+ <summary xml:lang="ml">ഒരു ജാലകത്തില്‍ ഒന്നിലധികം ടെര്‍മിനലുകള്‍</summary>
+ <summary xml:lang="ms">Kesemua terminal dalam satu tetingkap</summary>
+ <summary xml:lang="nb">Flere terminaler i ett vindu</summary>
+ <summary xml:lang="nl">Meerdere terminals in één venster</summary>
+ <summary xml:lang="oc">Permet d'aver mantun terminal dins una sola fenèstra</summary>
+ <summary xml:lang="pl">Wiele terminali w jednym oknie</summary>
+ <summary xml:lang="pt">Múltiplos Terminais numa só janela</summary>
+ <summary xml:lang="pt_BR">Múltiplos terminais em uma janela</summary>
+ <summary xml:lang="ro">Terminale multiple într-o singură fereastră</summary>
+ <summary xml:lang="ru">Несколько терминалов в одном окне</summary>
+ <summary xml:lang="si">එක් වින්ඩෝවක ටර්මිනල් රාශියක්</summary>
+ <summary xml:lang="sk">Viaceré terminály v jednom okne</summary>
+ <summary xml:lang="sl">Več terminalov v enem oknu</summary>
+ <summary xml:lang="sq">Shumë terminale në një dritare</summary>
+ <summary xml:lang="sr">Више терминала у једном прозору</summary>
+ <summary xml:lang="su">Loba terminal dina hiji jandela</summary>
+ <summary xml:lang="sv">Flera terminaler i ett fönster</summary>
+ <summary xml:lang="sw">Tungo amri kadhaa kwenye window moja</summary>
+ <summary xml:lang="ta">ஒரு  சாளரத்தில் பல முனையங்கள்</summary>
+ <summary xml:lang="te">ఒకే విండోలో బహుళ టెర్మినల్స్</summary>
+ <summary xml:lang="th">หลายเทอร์มินัลในหน้าต่างเดียว</summary>
+ <summary xml:lang="tr">Tek pencerede birden çok uçbirim</summary>
+ <summary xml:lang="uk">Кілька терміналів в одному вікні</summary>
+ <summary xml:lang="ur">ایک دریچے میں ایک سے زیادہ ٹرمنل</summary>
+ <summary xml:lang="vi">Mở nhiều terminal trong cùng cửa sổ</summary>
+ <summary xml:lang="zh_CN">一个窗口中的多个终端</summary>
+ <summary xml:lang="zh_TW">單一視窗，多重終端</summary>
+ <description>
+  <p>The robot future of terminals</p>
+  <p xml:lang="bs">Robotizirana budućnost terminala</p>
+  <p xml:lang="ca">El futur robot de terminals</p>
+  <p xml:lang="cs">Robotická budoucnost terminálů</p>
+  <p xml:lang="da">Fremtiden for robotterminaler</p>
+  <p xml:lang="de">Die Roboterzukunft der Terminals</p>
+  <p xml:lang="en_AU">The robot future of terminals</p>
+  <p xml:lang="en_GB">The robot future of terminals</p>
+  <p xml:lang="es">El futuro robot de terminales</p>
+  <p xml:lang="fa">ربات اینده ای پایانه است</p>
+  <p xml:lang="fr">Le futur robot des terminaux.</p>
+  <p xml:lang="he">העתיד הרובוטי של המסופים</p>
+  <p xml:lang="hr">Robotska budućnost terminala</p>
+  <p xml:lang="hu">A terminálok robot jövője</p>
+  <p xml:lang="ia">Le robot futur del terminales</p>
+  <p xml:lang="id">The robot future of terminals</p>
+  <p xml:lang="it">Il futuro robot dei terminali</p>
+  <p xml:lang="ko">터미널이 지배하는 미래 세상</p>
+  <p xml:lang="ms">Terminal dari robot masa hadapan</p>
+  <p xml:lang="nl">De robottoekomst van terminals</p>
+  <p xml:lang="pl">Robotyczna przyszłość terminali</p>
+  <p xml:lang="pt">O robô futuro dos terminais</p>
+  <p xml:lang="pt_BR">O robo do futuro dos terminais</p>
+  <p xml:lang="ro">Viitorul robot al terminalelor</p>
+  <p xml:lang="ru">Технологии будущего для терминалов</p>
+  <p xml:lang="sk">Robotická budúcnosť terminálov</p>
+  <p xml:lang="sv">Robot-framtid för terminaler</p>
+  <p xml:lang="sw">Umbile ya kiroboti ya tungo amri</p>
+  <p xml:lang="zh_CN">高级终端的未来</p>
+  <p xml:lang="zh_TW">終結者(Terminator) - 終端機器人的未來</p>
+  <p>A power-user tool for arranging terminals. It is inspired by programs such as gnome-multi-term, quadkonsole, etc. in that the main focus is arranging terminals in grids (tabs is the most common default method, which Terminator also supports).</p>
+  <p xml:lang="de">Ein Werkzeug für erfahrene Nutzer, um Terminals anzuordnen. Es ist von Anwendungen wie gnome-multi-term, quadkonsole, usw. inspiriert, deren Hauptfokus darin besteht, Terminals in Raster anzuordnen (die Verwendung von Reitern ist die meist verbreitete Methode, welche auch ebenfalls von Terminator unterstützt wird).</p>
+  <p xml:lang="es"> Una herramienta de usuario avanzado para organizar terminales. Está inspirado en programas como gnome-multi-term, quadkonsole, etc. en que el enfoque principal es organizar las terminales en cuadrículas (las pestañas son el método por defecto más común, que Terminator también soporta).</p>
+  <p xml:lang="fr">Un outil pour utilisateur et utilisatrice expérimenté⋅e d'organisation des terminaux. Il s'inspire des programmes tels que gnome-multi-term, quadkonsole, etc. dont le principal objectif est l'organisation des terminaux en grille (sous forme d'onglets dans le mode par défaut le plus basique, mode que Terminator prend en charge).</p>
+  <p xml:lang="he">כלי למשתמשים מתקדמים לארגון מסופים. שאב השראה מתכניות כגון gnome-multi-term,‏ quadkonsole וכו׳ בכך שעיקר המיקוד הוא בסידור מסופים ברשת (לשוניות היא צורת בררת המחדל הנפוצה ביותר שגם היא נתמכת ב־Terminator).</p>
+  <p xml:lang="hr">Profesionalni korisnički alat za raspoređivanje terminala, slično programima poput gnome-multi-term, quadkonsole, itd., a glavna ideja je pločasto raspoređivanje terminala (kartice su najraširenija metoda, koju Terminator također podržava).</p>
+  <p xml:lang="pl">Wszechstronne narzędzie do komponowania terminali. Inspirowane przez programy takie jak gnome-multi-term, quadkonsole, itp. w sposób, że główny nacisk kładziony jest na układanie terminali w prostokątne siatki (najczęstszą metodą są taby, które Terminator również wspiera).</p>
+  <p xml:lang="pt_BR">Uma ferramenta destinada aos superusuários, útil para organização de terminais. Esta foi inspirada por programas como gnome-multi-term, quadkonsole, etc. em que o objetivo principal é organizar terminais em grades (abas é o método mais comum, o qual o Terminator também suporta).</p>
+  <p>Much of the behavior of Terminator is based on GNOME Terminal, and we are adding more features from that as time goes by, but we also want to extend out in different directions with useful features for sysadmins and other users.</p>
+  <p xml:lang="de">Ein Großteil des Verhaltens von Terminator basiert auf dem GNOME-Terminal und wir fügen im Laufe der Zeit ständig neue Funktionen hinzu, aber wir wollen uns auch mit nützlichen Funktionen für Systemadministratoren und weitere Benutzergruppen in andere Richtungen weiterentwickeln.</p>
+  <p xml:lang="es">Gran parte del comportamiento de Terminator está basado en GNOME Terminal, y estamos añadiendo más de esas características a medida que pasa el tiempo, pero también queremos extendernos en diferentes direcciones con características útiles para administradores de sistemas y otros usuarios.</p>
+  <p xml:lang="fr">Le fonctionnement de Terminator est principalement fondé sur celui de GNOME Terminal. Nous lui ajoutons des fonctionnalités au fur et à mesure, mais nous voulons aussi les étendre dans différentes directions, avec des fonctionnalités utiles pour les administrateurs système et les autres utilisateurs.</p>
+  <p xml:lang="he">הרבה מההתנהגות של Terminator מבוססת על המסוף של GNOME ואנו מוסיפים תכונות נוספות עם הזמן אך אנו מעוניינים להתרחב לכיוונים נוספים עם תכונות שימושיות עבור מנהלי מערכת ומשתמשים אחרים.</p>
+  <p xml:lang="hr">Terminator se uveliko temelji se na GNOME Terminalu i s vremenom dodajemo daljnje njegove funkcije, ali ga također razvijamo s raznim dodatnim korisnim funkcijama za administratore sustava i za ostale korisnike.</p>
+  <p xml:lang="pl">Wiele zachowań Terminatora bazuje na GNOME Terminal i z biegiem czasu dodajemy nowe funkcjonalności stamtąd, ale chcemy również rozwijać się w innych kierunkach z funkcjonalnościami przydatnymi dla administaratorów i innych użytkowników.</p>
+  <p xml:lang="pt_BR">Muito do comportamento do Terminator é baseado no Terminal do Gnome, e estamos adicionando mais recursos com o passar do tempo, mas também queremos estender isso em diferentes recursos para administradores e sistemas e outros usuários.</p>
+  <p>Some highlights:</p>
+  <p xml:lang="bs">Za istaći:</p>
+  <p xml:lang="ca">Alguns ressaltats:</p>
+  <p xml:lang="cs">Několik zajímavostí:</p>
+  <p xml:lang="da">Nogle højdepunkter:</p>
+  <p xml:lang="de">Einige Höhepunkte:</p>
+  <p xml:lang="en_AU">Some highlights:</p>
+  <p xml:lang="en_GB">Some highlights:</p>
+  <p xml:lang="es">Algunos destacados:</p>
+  <p xml:lang="fa">برخی از نکات برجسته</p>
+  <p xml:lang="fr">Quelques points forts :</p>
+  <p xml:lang="he">כמה דגשים:</p>
+  <p xml:lang="hr">Neke posebnosti su:</p>
+  <p xml:lang="hu">Néhányat kiemelve:</p>
+  <p xml:lang="ia">Alicun evidentias:</p>
+  <p xml:lang="id">Some highlights:</p>
+  <p xml:lang="it">Alcune evidenze:</p>
+  <p xml:lang="ml">ചില പ്രത്യേകതകൾ :</p>
+  <p xml:lang="ms">Beberapa sorotan:</p>
+  <p xml:lang="nl">Enkele hoogtepunten:</p>
+  <p xml:lang="oc">Qualques punts fòrts :</p>
+  <p xml:lang="pl">Kilka głównych funkcji:</p>
+  <p xml:lang="pt">Alguns destaques:</p>
+  <p xml:lang="pt_BR">Alguns destaques:</p>
+  <p xml:lang="ro">Cateva puncte forte:</p>
+  <p xml:lang="ru">Ключевые особенности:</p>
+  <p xml:lang="sk">Zopár schopností:</p>
+  <p xml:lang="sv">Några höjdpunkter:</p>
+  <p xml:lang="sw">Maelezo kadhaa:</p>
+  <p xml:lang="tr">Bazı özellikler:</p>
+  <p xml:lang="zh_CN">一些亮点：</p>
+  <p xml:lang="zh_TW">特色</p>
+  <ul>
+   <li>Arrange terminals in a grid</li>
+   <li xml:lang="bs">Rasporedi terminale u polja mreže</li>
+   <li xml:lang="ca">Organitzar terminals a una graella</li>
+   <li xml:lang="cs">Uspořádat terminály v mřížce</li>
+   <li xml:lang="da">Arrangér terminaler i et net</li>
+   <li xml:lang="de">Terminals in einem Raster anordnen</li>
+   <li xml:lang="el">Διάταξη τερματικών σε πλέγμα</li>
+   <li xml:lang="en_AU">Arrange terminals in a grid</li>
+   <li xml:lang="en_GB">Arrange terminals in a grid</li>
+   <li xml:lang="es">Acomodar terminales en grilla</li>
+   <li xml:lang="fa">سازماندهی پایانه در یک شبکه</li>
+   <li xml:lang="fr">Arranger les terminaux en grille.</li>
+   <li xml:lang="he">סידור מסופים בטבלה</li>
+   <li xml:lang="hr">Pločasto raspoređivanje terminala</li>
+   <li xml:lang="hu">Terminálok rácsba rendezése</li>
+   <li xml:lang="ia">Arrangiar le terminales in un grillia</li>
+   <li xml:lang="id">Arrange terminals in a grid</li>
+   <li xml:lang="it">Disporre i terminali in una glriglia</li>
+   <li xml:lang="ko">터미널들을 격자처럼 배열</li>
+   <li xml:lang="ms">Susun terminal dalam grid</li>
+   <li xml:lang="nl">Regel terminals in een rooster</li>
+   <li xml:lang="pl">Rozmieszczanie terminali w siatce</li>
+   <li xml:lang="pt">Disposição de terminais em grelha</li>
+   <li xml:lang="pt_BR">Organizar os terminais em uma grade</li>
+   <li xml:lang="ru">Упорядочить терминалы в виде сетки</li>
+   <li xml:lang="sk">Usporiadanie terminálov v mriežke</li>
+   <li xml:lang="sv">Arrangera terminaler i ett rutnät</li>
+   <li xml:lang="sw">Panga tungo amri kwenye mraba fito</li>
+   <li xml:lang="tr">Uçbirimleri ızgaraya göre oturt</li>
+   <li xml:lang="zh_CN">用格子管理终端</li>
+   <li xml:lang="zh_TW">可在格線中放置終端</li>
+   <li>Tabs</li>
+   <li xml:lang="bs">Kartice</li>
+   <li xml:lang="cs">Panely</li>
+   <li xml:lang="da">Faneblade</li>
+   <li xml:lang="de">Reiter</li>
+   <li xml:lang="el">Καρτέλες</li>
+   <li xml:lang="en_AU">Tabs</li>
+   <li xml:lang="en_GB">Tabs</li>
+   <li xml:lang="es">Pestañas</li>
+   <li xml:lang="fr">Onglets</li>
+   <li xml:lang="he">לשוניות</li>
+   <li xml:lang="hr">Kartice</li>
+   <li xml:lang="ia">Schedas</li>
+   <li xml:lang="id">Tab</li>
+   <li xml:lang="it">Schede</li>
+   <li xml:lang="ko">탭</li>
+   <li xml:lang="ku">Hilfirandin</li>
+   <li xml:lang="ml">ടാബുകള്‍</li>
+   <li xml:lang="ms">Tab</li>
+   <li xml:lang="nb">Faner</li>
+   <li xml:lang="nl">Tabbladen</li>
+   <li xml:lang="oc">Onglets</li>
+   <li xml:lang="pl">Karty</li>
+   <li xml:lang="pt">Separadores</li>
+   <li xml:lang="pt_BR">Abas</li>
+   <li xml:lang="ro">Tab-uri</li>
+   <li xml:lang="ru">Вкладки</li>
+   <li xml:lang="sk">Karty</li>
+   <li xml:lang="sl">Zavihki</li>
+   <li xml:lang="sv">Flikar</li>
+   <li xml:lang="sw">Vichupo</li>
+   <li xml:lang="tr">Sekmeler</li>
+   <li xml:lang="zh_CN">标签页</li>
+   <li xml:lang="zh_TW">可以使用分頁</li>
+   <li>Drag and drop re-ordering of terminals</li>
+   <li xml:lang="bs">Preuređivanje terminala metodom prevuci-i-spusti</li>
+   <li xml:lang="cs">Změna uspořádání terminálů jejich přetažením</li>
+   <li xml:lang="da">Træk og slip arrangering af terminaler</li>
+   <li xml:lang="de">Ziehen und loslassen, um die Terminals neu anzuordnen</li>
+   <li xml:lang="en_AU">Drag and drop re-ordering of terminals</li>
+   <li xml:lang="en_GB">Drag and drop re-ordering of terminals</li>
+   <li xml:lang="es">Reordenamiento de terminales vía arrastrar y soltar</li>
+   <li xml:lang="fa">گرفتن و رها کردن سفارش دوباره برای پایانه</li>
+   <li xml:lang="fr">Glisser/déposer pour réordonner les terminaux</li>
+   <li xml:lang="he">יש לגרור ולהשליך כדי לסדר את המסופים מחדש</li>
+   <li xml:lang="hr">Raspoređivanje terminala pomoću povuci-i-ispusti</li>
+   <li xml:lang="id">Drag and drop re-ordering of terminals</li>
+   <li xml:lang="it">Trascina e rilascia per ri-ordinare i terminali</li>
+   <li xml:lang="ko">끌어놓기로 터미널 순서 조정</li>
+   <li xml:lang="ms">Seret dan lepas penertiban-semula terminal</li>
+   <li xml:lang="nl">Terminals herschikken via slepen-en-loslaten</li>
+   <li xml:lang="pl">Rozmieszczanie terminali metodą "przeciągnij i upuść"</li>
+   <li xml:lang="pt">Arraste e largue para organizar os terminais</li>
+   <li xml:lang="pt_BR">Arrastar e soltar reordenação de terminais</li>
+   <li xml:lang="ru">Перетаскивание и изменение порядка терминалов</li>
+   <li xml:lang="sv">Dra och släpp omordning av terminaler</li>
+   <li xml:lang="tr">Uçbirimleri düzenlemek için Sürükle ve bırak</li>
+   <li xml:lang="zh_CN">拖拽式的终端布局调整</li>
+   <li xml:lang="zh_TW">可使用拖曳方式重新排列終端</li>
+   <li>Lots of keyboard shortcuts</li>
+   <li xml:lang="bs">Mnogobrojne prečice na tastaturi</li>
+   <li xml:lang="cs">Mnoho klávesových zkratek</li>
+   <li xml:lang="da">Masser af tastatur genveje</li>
+   <li xml:lang="de">Viele Tastenkürzel</li>
+   <li xml:lang="el">Πολλές συνομεύσεις πληκτρολογίου</li>
+   <li xml:lang="en_AU">Lots of keyboard shortcuts</li>
+   <li xml:lang="en_GB">Lots of keyboard shortcuts</li>
+   <li xml:lang="es">Muchos atajos de teclado</li>
+   <li xml:lang="fa">بسیاری از میانبرهای صفحه کلید</li>
+   <li xml:lang="fr">De nombreux raccourcis clavier</li>
+   <li xml:lang="he">קיצורי מקלדת רבים</li>
+   <li xml:lang="hr">Puno tipkovničkih prečaca</li>
+   <li xml:lang="hu">Sok billentyűkombináció</li>
+   <li xml:lang="ia">Quantitates de vias breve de claviero</li>
+   <li xml:lang="id">Lots of keyboard shortcuts</li>
+   <li xml:lang="it">Quantità di scorciatoie da tastiera</li>
+   <li xml:lang="ko">수많은 키보드 바로가기</li>
+   <li xml:lang="ms">Lebih banyak pintasan papan kekunci</li>
+   <li xml:lang="nb">Massevis av tastatursnarveier</li>
+   <li xml:lang="nl">Veel toetsenbordsnelkoppelingen</li>
+   <li xml:lang="pl">Liczne skróty klawiszowe</li>
+   <li xml:lang="pt">Diversos atalhos de teclado</li>
+   <li xml:lang="pt_BR">Teclas de atalho do teclado</li>
+   <li xml:lang="ru">Множество сочетаний клавиш быстрого доступа</li>
+   <li xml:lang="sk">Množstvo klávesových skratiek</li>
+   <li xml:lang="sv">Massor av kortkommandon</li>
+   <li xml:lang="tr">Bir sürü klavye kısayolları</li>
+   <li xml:lang="zh_CN">大量快捷键</li>
+   <li xml:lang="zh_TW">各式的鍵盤快捷鍵</li>
+   <li>Save multiple layouts and profiles via GUI preferences editor</li>
+   <li xml:lang="bs">Sačuvaj kombinaciju više rasporeda i profila u uredniku postavki</li>
+   <li xml:lang="cs">Uložit vícero rozvržení a profilů prostřednictvím editoru předvoleb v grafickém uživatelském rozhraní</li>
+   <li xml:lang="da">Gem flere layouts og profiler via GUI indstilling</li>
+   <li xml:lang="de">Mehrere Anordnungen und Profile mithilfe der grafischen Einstellungsbearbeitung speichern</li>
+   <li xml:lang="en_AU">Save multiple layouts and profiles via GUI preferences editor</li>
+   <li xml:lang="en_GB">Save multiple layouts and profiles via GUI preferences editor</li>
+   <li xml:lang="es">Guarda múltiples disposiciones y perfiles a través de un editor de preferencias GUI</li>
+   <li xml:lang="fa">ذخیره سازی چندین پوسته و پروفایل از طریق اولویت ویرایشگر گرافیکی</li>
+   <li xml:lang="fr">Enregistrer les multiples dispositions et profils via l'éditeur de préférence GUI.</li>
+   <li xml:lang="he">ניתן לשמור מגוון פריסות ופרופילים דרך עורך העדפות מנשק המשתמש</li>
+   <li xml:lang="hr">Spremanje višebrojnih rasporeda i profila putem uređivača postavki sučelja</li>
+   <li xml:lang="hu">Többféle elrendezés és profil mentése a GUI beállítás-szerkesztővel</li>
+   <li xml:lang="id">Save multiple layouts and profiles via GUI preferences editor</li>
+   <li xml:lang="it">Salva i layout e profili multipli attraverso l'editor delle preferenze</li>
+   <li xml:lang="ko">GUI 설정 편집기로 여러 터미널 배치와 프로파일 저장</li>
+   <li xml:lang="ms">Simpan bentangan dan profil berbilang melalui penyunting keutamaan GUI</li>
+   <li xml:lang="nl">Sla meerdere lay-outs en profielen op via GUI voorkeureneditor</li>
+   <li xml:lang="pl">Zapisywanie wielu układów i profili w graficznym edytorze ustawień</li>
+   <li xml:lang="pt">Guardar múltiplas disposições e perfis através do editor de preferências</li>
+   <li xml:lang="pt_BR">Salvar múltiplos layouts e perfis via preferências do editor GUI.</li>
+   <li xml:lang="ru">Сохранение нескольких схем размещения и профилей через редактор настроек с графическим интерфейсом</li>
+   <li xml:lang="sk">Uloženie viacerých rozložení a profilov cez grafický editor nastavení</li>
+   <li xml:lang="sv">Spara flera utformningar och profiler via GUI-inställningsredigeraren</li>
+   <li xml:lang="tr">GUI tercih düzenleyici ile çoklu düzen ve profil kaydetme</li>
+   <li xml:lang="zh_CN">通过图形界面设定多种布局和配置</li>
+   <li xml:lang="zh_TW">使用圖形化介面儲存多重版面配置和設定檔</li>
+   <li>Simultaneous typing to arbitrary groups of terminals</li>
+   <li xml:lang="bs">Simultani upis u naznačene grupe terminala</li>
+   <li xml:lang="cs">Souběžné psaní do libovolných skupin terminálů</li>
+   <li xml:lang="da">Samtidig tastning til vilkårlige grupper af terminaler</li>
+   <li xml:lang="de">Gleichzeitige Eingabe in beliebig viele Gruppen von Terminals</li>
+   <li xml:lang="en_AU">Simultaneous typing to arbitrary groups of terminals</li>
+   <li xml:lang="en_GB">Simultaneous typing to arbitrary groups of terminals</li>
+   <li xml:lang="es">Escritura simultánea en grupos arbitrarios de terminales</li>
+   <li xml:lang="fa">تایپ همزمان و گروه های دلخواه در پایانه ها</li>
+   <li xml:lang="fr">Écriture simultanée dans n'importe quel groupe de terminaux</li>
+   <li xml:lang="he">הקלדה בו־זמנית לקבוצה שרירותית של מסופים</li>
+   <li xml:lang="hr">Istovremeno tipkanje u proizvoljne grupe terminala</li>
+   <li xml:lang="ia">Scriptura simultanee in qualcunque numero de terminales</li>
+   <li xml:lang="id">Simultaneous typing to arbitrary groups of terminals</li>
+   <li xml:lang="ko">원하는 터미널들에 동시 키 입력</li>
+   <li xml:lang="ms">Ketukan ke kumpulan arbitari terminal secara serentak</li>
+   <li xml:lang="nl">Typ gelijktijdig naar een willekeurige group terminals</li>
+   <li xml:lang="pl">Równoczesne wpisywanie tekstu do dowolnej grupy terminali</li>
+   <li xml:lang="pt">Digitação para vários grupos de terminais em simultâneo</li>
+   <li xml:lang="pt_BR">Digitação simultânea para grupos arbitrários de terminais.</li>
+   <li xml:lang="ru">Одновременный ввод текста в произвольные группы терминалов</li>
+   <li xml:lang="sk">Súčasné písanie do ľubovoľných skupín terminálov</li>
+   <li xml:lang="sv">Samtidigt skrivning till godtyckliga grupper av terminaler</li>
+   <li xml:lang="tr">Rastgele gruplanmış Uçbirimler için eşzamanlı yazma</li>
+   <li xml:lang="zh_CN">同时向任意多个终端输入</li>
+   <li xml:lang="zh_TW">可以同時輸入(命令)到任意群組的終端</li>
+  </ul>
+  <p>And lots more...</p>
+  <p xml:lang="bs">I još mnogo toga...</p>
+  <p xml:lang="cs">A mnoho dalšího…</p>
+  <p xml:lang="da">Og meget mere...</p>
+  <p xml:lang="de">Und vieles mehr…</p>
+  <p xml:lang="en_AU">And lots more...</p>
+  <p xml:lang="en_GB">And lots more...</p>
+  <p xml:lang="es">Y mucho más...</p>
+  <p xml:lang="fa">و خیلی چیزها بیشتر.....</p>
+  <p xml:lang="fr">Et bien plus...</p>
+  <p xml:lang="he">ועוד הרבה מעבר…</p>
+  <p xml:lang="hr">I još puno više …</p>
+  <p xml:lang="hu">És sok más...</p>
+  <p xml:lang="ia">E quantitates ancora...</p>
+  <p xml:lang="id">And lots more...</p>
+  <p xml:lang="it">Molto più...</p>
+  <p xml:lang="ko">그리고 더 많이...</p>
+  <p xml:lang="ml">അതുകൂടാതെ പിന്നെയും ധാരാളം ...</p>
+  <p xml:lang="ms">Dan banyak lagi...</p>
+  <p xml:lang="nl">En nog veel meer...</p>
+  <p xml:lang="oc">E plan mai encara...</p>
+  <p xml:lang="pl">I wiele więcej...</p>
+  <p xml:lang="pt">E muito mais...</p>
+  <p xml:lang="pt_BR">E muito mais...</p>
+  <p xml:lang="ru">И многое другое...</p>
+  <p xml:lang="sk">A mnoho ďalšieho...</p>
+  <p xml:lang="sv">Och mycket mer...</p>
+  <p xml:lang="tr">Ve çok daha fazlası...</p>
+  <p xml:lang="zh_CN">还有更多……</p>
+  <p xml:lang="zh_TW">還有更多的特色...</p>
+ </description>
+ <screenshots>
+  <screenshot type="default">
+   <image>https://4.bp.blogspot.com/-xt4Tja1TMQ0/Vdemmf8wYSI/AAAAAAAAA9A/uROTre0PMls/s1600/terminator_main_basic.png</image>
+   <caption>The main window showing the application in action</caption>
+   <caption xml:lang="bs">Glavni prozor prikazuje aplikaciju u akciji</caption>
+   <caption xml:lang="cs">Hlavní okno zobrazující aplikaci v akci</caption>
+   <caption xml:lang="da">Det primære vindue, som viser applikationen i funktion</caption>
+   <caption xml:lang="de">Das Hauptfenster zeigt die aktive Anwendung</caption>
+   <caption xml:lang="en_AU">The main window showing the application in action</caption>
+   <caption xml:lang="en_GB">The main window showing the application in action</caption>
+   <caption xml:lang="es">Ventana principal mostrando la aplicación en acción</caption>
+   <caption xml:lang="fa">پنجره ای اصلی نرم افزارهای فعال را نشان می دهد</caption>
+   <caption xml:lang="fr">La fenêtre principale montrant l'application en action</caption>
+   <caption xml:lang="he">החלון הראשי שמציג את היישום הפעיל</caption>
+   <caption xml:lang="hr">Glavni prozor s prikazom programa u akciji</caption>
+   <caption xml:lang="hu">A főablak a futó alkalmazást mutatja</caption>
+   <caption xml:lang="id">The main window showing the application in action</caption>
+   <caption xml:lang="it">La finestra principale mostra l'applicazione attiva</caption>
+   <caption xml:lang="ms">Tetingkap utama menunjukkan aplikasi sedang bertindak</caption>
+   <caption xml:lang="nl">Het hoofdvenster toont de applicatie in actie</caption>
+   <caption xml:lang="pl">Główne okno programu pokazujące aplikację w działaniu</caption>
+   <caption xml:lang="pt">A janela principal que mostra a aplicação em ação</caption>
+   <caption xml:lang="pt_BR">A janela principal mostrando a aplicação em ação</caption>
+   <caption xml:lang="ru">Главное окно, показывающее приложение в действии</caption>
+   <caption xml:lang="sk">Hlavné okno zobrazuje aplikáciu v akcii</caption>
+   <caption xml:lang="sv">Huvudfönstret visar programmet i verkan</caption>
+   <caption xml:lang="tr">Ana pencere çalışmakta olan uygulamayı gösteriyor</caption>
+   <caption xml:lang="zh_CN">主窗口用于显示当前的程序</caption>
+   <caption xml:lang="zh_TW">Terminator執行的畫面</caption>
+  </screenshot>
+  <screenshot>
+   <image>https://4.bp.blogspot.com/-rRxALSpEEZw/Vdeu58JgpnI/AAAAAAAAA9o/XewWKJ5HNo4/s1600/terminator_main_complex.png</image>
+   <caption>Getting a little crazy with the terminals</caption>
+   <caption xml:lang="bs">Getting a little crazy with the terminals</caption>
+   <caption xml:lang="cs">Trocha bláznivosti s terminály</caption>
+   <caption xml:lang="da">Gakker ud med terminalerne</caption>
+   <caption xml:lang="de">Ein wenig verrückt werden mit den Terminals</caption>
+   <caption xml:lang="en_AU">Getting a little crazy with the terminals</caption>
+   <caption xml:lang="en_GB">Getting a little crazy with the terminals</caption>
+   <caption xml:lang="es">Un poco de locura con las terminales</caption>
+   <caption xml:lang="fa">یکم متفاوت تر به نظر بیا با پایانه</caption>
+   <caption xml:lang="fr">Devenir un peu fou avec les terminaux.</caption>
+   <caption xml:lang="he">להשתולל קצת עם המסופים</caption>
+   <caption xml:lang="hr">Poigravanje s terminalima</caption>
+   <caption xml:lang="hu">Egy kicsit megőrülni a terminálokkal</caption>
+   <caption xml:lang="id">Getting a little crazy with the terminals</caption>
+   <caption xml:lang="ko">터미널에 미쳐봅시다.</caption>
+   <caption xml:lang="ms">Buat sesuatu yang gila-gila dengan terminal</caption>
+   <caption xml:lang="nl">Een beetje gek worden met de terminals</caption>
+   <caption xml:lang="pl">Zaszalej z terminalami</caption>
+   <caption xml:lang="pt">A loucura de diversos terminais</caption>
+   <caption xml:lang="pt_BR">Ficando um pouco louco com terminais</caption>
+   <caption xml:lang="ru">Немного сумасшествия с терминалами</caption>
+   <caption xml:lang="sk">Trochu sa pobláznime s terminálmi</caption>
+   <caption xml:lang="tr">Uçbirimlerle delirmeceler</caption>
+   <caption xml:lang="zh_CN">终端让人抓狂</caption>
+   <caption xml:lang="zh_TW">多到瘋狂的終端</caption>
+  </screenshot>
+  <screenshot>
+   <image>https://2.bp.blogspot.com/-t_8oRyMXUls/VdemmRVnZnI/AAAAAAAAA88/rHIr8L1X7Ho/s1600/terminator_prefs_global.png</image>
+   <caption>The preferences window where you can change the defaults</caption>
+   <caption xml:lang="bs">Prozor u kojem možete mijenjati zadane postavke</caption>
+   <caption xml:lang="cs">Okno předvoleb ve kterém je možné měnit výchozí hodnoty</caption>
+   <caption xml:lang="da">Vinduet for indstillinger hvor du kan ændre standardinstillingerne</caption>
+   <caption xml:lang="de">Das Einstellungsfenster, in dem die Standardwerte geändert werden können</caption>
+   <caption xml:lang="el">Το παράθυρο προτιμήσεων όπου μπορείτε να αλλάξετε τις προεπιλογές</caption>
+   <caption xml:lang="en_AU">The preferences window where you can change the defaults</caption>
+   <caption xml:lang="en_GB">The preferences window where you can change the defaults</caption>
+   <caption xml:lang="es">La ventana de preferencias dónde se pueden cambiar los valores predeterminados</caption>
+   <caption xml:lang="fa">پنجره ای تنظیمات مکانی است که شما می توانید تنظیمات پیش فرض را تغییر دهید</caption>
+   <caption xml:lang="fr">La fenêtre des préférences où vous pouvez modifier les réglages par défaut</caption>
+   <caption xml:lang="he">חלון ההעדפות בו ניתן לשנות את בררות המחדל</caption>
+   <caption xml:lang="hr">Prozor postavki za mijenjanje standardnih vrijednosti</caption>
+   <caption xml:lang="hu">A beállítások ablakban megváltoztathatod az alapértelmezéseket</caption>
+   <caption xml:lang="id">The preferences window where you can change the defaults</caption>
+   <caption xml:lang="ko">기본 설정을 바꿀 수 있는 설정 창</caption>
+   <caption xml:lang="ms">Tetingkap keutamaan yang mana anda boleh ubah lalai</caption>
+   <caption xml:lang="nl">Het voorkeurenvenster waar je de standaardwaarden kan veranderen</caption>
+   <caption xml:lang="pl">Okno ustawień w których możesz dostosować domyślną konfigurację</caption>
+   <caption xml:lang="pt">A janela de preferências na qual se pode alterar as definições padrão</caption>
+   <caption xml:lang="pt_BR">A janela de preferências onde você pode alterar o padrão</caption>
+   <caption xml:lang="ru">Окно настроек, где можно изменить стандартные настройки</caption>
+   <caption xml:lang="sk">Okno nastaveni, kde môzete zmeniť štandardné nastavenia</caption>
+   <caption xml:lang="tr">Varsayılan ayarları değiştirebileceğiniz tercihler penceresi</caption>
+   <caption xml:lang="zh_CN">偏好设定窗口（改变默认设置）</caption>
+   <caption xml:lang="zh_TW">您可以在"偏好設定"中更改預設值</caption>
+  </screenshot>
+ </screenshots>
+ <url type="homepage">https://github.com/gnome-terminator/terminator</url>
+ <updatecontact>terminator@lazyfrosch.de</updatecontact>
+</component>
\ No newline at end of file
diff --git a/doc/terminator.1 b/doc/terminator.1
index 5d27afaa9..b19d89443 100644
--- a/doc/terminator.1
+++ b/doc/terminator.1
@@ -46,6 +46,23 @@ based on the wishes of the child shell.
 .B \-\-geometry=GEOMETRY
 Specifies the preferred size and position of Terminator's window; see X(7).
 .TP
+.B \-\-guake\-key=GUAKE_KEY
+A Guake like terminal mode where terminal can be toggled by a key.
+Usage Example:  terminator \-\-guake\-key="F8" \-\-guake\-side left \-\-guake\-width 700 \-\-guake\-height 800
+.TP
+.B \-\-guake\-side=GUAKE_SIDE
+Set the preferred screen edge position of a terminal in Guake like mode.
+Options: top, bottom, left, right
+Default: top
+.TP
+.B \-\-guake\-width=GUAKE_WIDTH
+Set the preferred width when using Guake like mode.
+Default: 800
+.TP
+.B \-\-guake\-height=GUAKE_HEIGHT
+Set the preferred height when using Guake like mode.
+Default: 600
+.TP
 .B \-e, \-\-command=COMMAND
 Runs the specified command instead of your default shell or profile specified command. Note: if
 Terminator is launched as x-terminal-emulator \-e behaves like \-x, and the longform becomes
diff --git a/terminatorlib/optionparse.py b/terminatorlib/optionparse.py
index befafa6e4..5ddf49aab 100644
--- a/terminatorlib/optionparse.py
+++ b/terminatorlib/optionparse.py
@@ -16,6 +16,7 @@
 """Terminator.optionparse - Parse commandline options"""
 
 import argparse
+from argparse import RawTextHelpFormatter
 import sys
 import os
 
@@ -37,7 +38,7 @@ def parse_options():
     """Parse the command line options"""
     is_x_terminal_emulator = os.path.basename(sys.argv[0]) == 'x-terminal-emulator'
 
-    parser = argparse.ArgumentParser()
+    parser = argparse.ArgumentParser(formatter_class=RawTextHelpFormatter)
 
     parser.add_argument('-v', '--version', action='store_true', dest='version',
             help=_('Display program version'))
@@ -56,6 +57,14 @@ def parse_options():
     parser.add_argument('--geometry', dest='geometry', type=str,
                       help=_('Set the preferred size and position of the window'
                              '(see X man page)'))
+    parser.add_argument('--guake-key', dest='guake_key', type=str,
+                      help=_('A Guake like terminal mode where terminal can be toggled by a key.\nUsage Example: terminator --guake-key="F8" --guake-side left --guake-width 700 --guake-height 800'))
+    parser.add_argument('--guake-side', dest='guake_side', default="top", type=str,
+                      help=_('Set the preferred screen edge position of a terminal in Guake like mode.\nOptions: top, bottom, left, right\nDefault: top'))
+    parser.add_argument('--guake-width', dest='guake_width', default="800", type=str,
+                      help=_('Set the preferred width when using Guake like mode.\nDefault: 800'))
+    parser.add_argument('--guake-height', dest='guake_height', default="600", type=str,
+                      help=_('Set the preferred height when using Guake like mode.\nDefault: 600'))
     if not is_x_terminal_emulator:
         parser.add_argument('-e', '--command', dest='command',
                 help=_('Specify a command to execute inside the terminal'))
diff --git a/terminatorlib/window.py b/terminatorlib/window.py
index 04c60a4cb..8f2008a43 100644
--- a/terminatorlib/window.py
+++ b/terminatorlib/window.py
@@ -77,13 +77,17 @@ def __init__(self):
 #        self.set_property('allow-shrink', True)  # FIXME FOR GTK3, or do we need this actually?
         icon_to_apply=''
 
-        self.register_callbacks()
+
         self.apply_config()
 
         self.title = WindowTitle(self)
         self.title.update()
-        
-        self.preventHide = False
+
+        self.preventHide  = False
+
+        self.display      = Gdk.Display().get_default()
+        self.mouse        = self.display.get_default_seat().get_pointer()
+        self.guake_key    = None
 
         options = self.config.options_get()
         if options:
@@ -92,15 +96,42 @@ def __init__(self):
 
             if options.role:
                 self.set_role(options.role)
-            
+
             if options.forcedicon is not None:
                 icon_to_apply = options.forcedicon
 
             if options.geometry:
                 if not self.parse_geometry(options.geometry):
-                    err('Window::__init__: Unable to parse geometry: %s' % 
+                    err('Window::__init__: Unable to parse geometry: %s' %
                             options.geometry)
 
+            if options.guake_key:
+                self.guake_key = options.guake_key
+
+                if options.guake_side and options.guake_width and options.guake_height:
+                    if options.guake_side in ["top", "bottom", "left", "right"]:
+                        self.guake_side = options.guake_side
+                    else:
+                        self.guake_key = False
+                        err('Window::__init__: Unable to parse guake_side: %s' %
+                                options.guake_side)
+
+                    try:
+                        self.guake_width  = int(options.guake_width)
+                        self.guake_height = int(options.guake_height)
+                    except Exception as e:
+                        self.guake_key = False
+                        err('Window::__init__: Unable to parse guake_width: %s and/or guake_height: %s' %
+                                options.guake_width, options.guake_height)
+
+                    if self.guake_key:
+                        self.set_decorated(False)
+                        self.set_default_size(self.guake_width, self.guake_height)
+                    else:
+                        self.guake_key = None
+
+        self.register_callbacks()
+
         self.apply_icon(icon_to_apply)
         self.pending_set_rough_geometry_hint = False
 
@@ -118,6 +149,36 @@ def do_set_property(self, prop, value):
         else:
             raise AttributeError('unknown property %s' % prop.name)
 
+    # NOTE: Gdk.VisibilityState.UNOBSCURED presumably isn't reliable due to transparency in moddern wms.
+    #       Seems to work okay for our needs but should be kept in mind for future changes....
+    def _bind_window_to_position(self, widget, eve):
+        if eve.state == Gdk.VisibilityState.UNOBSCURED:
+            window_w, window_h       = self.guake_width, self.guake_height
+            screen, mouse_x, mouse_y = self.mouse.get_position()
+            monitor    = self.display.get_monitor_at_point(mouse_x, mouse_y)
+            geom_rect  = monitor.get_geometry()
+            x, y, w, h = geom_rect.x, geom_rect.y, geom_rect.width, geom_rect.height
+
+            if not self.is_maximized() and not self.isfullscreen:
+                if self.guake_side == "top":
+                    new_x = (w - (window_w + ((w - window_w)/2) )) + x
+                    new_y = y
+                if self.guake_side == "bottom":
+                    new_x = (w - (window_w + ((w - window_w)/2) )) + x
+                    new_y = (h - window_h) + y
+                if self.guake_side == "left":
+                    new_x = x
+                    new_y = (h - (window_h + ((h - window_h)/2) )) + y
+                if self.guake_side == "right":
+                    new_x = (w - window_w) + x
+                    new_y = (h - (window_h + ((h - window_h)/2) )) + y
+            else:
+                    new_x = x
+                    new_y = y
+
+            self.move(new_x, new_y)
+
+
     def register_callbacks(self):
         """Connect the GTK+ signals we care about"""
         self.connect('key-press-event', self.on_key_press)
@@ -128,22 +189,28 @@ def register_callbacks(self):
         self.connect('focus-out-event', self.on_focus_out)
         self.connect('focus-in-event', self.on_focus_in)
 
+        toggle_key = self.config['keybindings']['hide_window']
+        if self.guake_key not in ('', None):
+            toggle_key = self.guake_key
+            guake_unload_id = self.connect('visibility-notify-event', self._bind_window_to_position)
+
         # Attempt to grab a global hotkey for hiding the window.
         # If we fail, we'll never hide the window, iconifying instead.
-        if self.config['keybindings']['hide_window'] not in ('', None):
-            if display_manager() == 'X11':
-                try:
-                    self.hidebound = Keybinder.bind(
-                        self.config['keybindings']['hide_window'],
-                        self.on_hide_window)
-                except (KeyError, NameError):
-                    pass
-
-                if not self.hidebound:
-                    err('Unable to bind hide_window key, another instance/window has it.')
-                    self.hidefunc = self.iconify
-                else:
-                    self.hidefunc = self.hide
+        if toggle_key and display_manager() == 'X11':
+            try:
+                self.hidebound = Keybinder.bind(toggle_key, self.on_hide_window)
+            except (KeyError, NameError):
+                pass
+
+            if not self.hidebound:
+                err('Unable to bind hide_window key, another instance/window has it.')
+                self.hidefunc = self.iconify
+
+                if self.guake_key not in ('', None):
+                    GObject.signal_handler_disconnect(self, guake_unload_id)
+                    self.set_decorated(True)
+            else:
+                self.hidefunc = self.hide
 
     def apply_config(self):
         """Apply various configuration options"""
@@ -293,7 +360,7 @@ def on_delete_event(self, window, event, data=None):
     def confirm_close(self, window, type):
         """Display a confirmation dialog when the user is closing multiple
         terminals in one window"""
-        
+
         return(not (self.construct_confirm_close(window, type) == Gtk.ResponseType.ACCEPT))
 
     def on_destroy_event(self, widget, data=None):
@@ -317,8 +384,10 @@ def on_hide_window(self, data=None):
                 if (time.time() - self.losefocus_time < 0.1) and \
                     self.config['hide_on_lose_focus']:
                     return
+
                 if self.position:
                     self.move(self.position[0], self.position[1])
+
                 self.show()
                 self.grab_focus()
                 try:
@@ -333,7 +402,7 @@ def on_hide_window(self, data=None):
     # pylint: disable-msg=W0613
     def on_window_state_changed(self, window, event):
         """Handle the state of the window changing"""
-        self.isfullscreen = bool(event.new_window_state & 
+        self.isfullscreen = bool(event.new_window_state &
                                  Gdk.WindowState.FULLSCREEN)
         self.ismaximised = bool(event.new_window_state &
                                  Gdk.WindowState.MAXIMIZED)
@@ -392,7 +461,7 @@ def set_real_transparency(self, value=True):
             visual = screen.get_rgba_visual()
             if visual:
                 self.set_visual(visual)
-    
+
     def show(self, startup=False):
         """Undo the startup show request if started in hidden mode"""
         #Present is necessary to grab focus when window is hidden from taskbar.
@@ -481,7 +550,7 @@ def split_axis(self, widget, vertical=True, cwd=None, sibling=None, widgetfirst=
             container = maker.make('VPaned')
         else:
             container = maker.make('HPaned')
-        
+
         self.set_pos_by_ratio = True
 
         if not sibling:
@@ -505,7 +574,7 @@ def split_axis(self, widget, vertical=True, cwd=None, sibling=None, widgetfirst=
         for term in order:
             container.add(term)
         container.show_all()
-        
+
         while Gtk.events_pending():
             Gtk.main_iteration_do(False)
         sibling.grab_focus()
@@ -547,7 +616,7 @@ def zoom(self, widget, font_scale=True):
         self.set_property('term_zoomed', True)
 
         if font_scale:
-            widget.cnxids.new(widget, 'size-allocate', 
+            widget.cnxids.new(widget, 'size-allocate',
                     widget.zoom_scale, self.zoom_data)
 
         widget.grab_focus()
@@ -603,7 +672,7 @@ def rotate(self, widget, clockwise):
 
     def get_terminals(self):
         return(util.enumerate_descendants(self)[1])
- 
+
     def get_visible_terminals(self):
         """Walk down the widget tree to find all of the visible terminals.
         Mostly using Container::get_visible_terminals()"""
@@ -693,7 +762,7 @@ def set_rough_geometry_hints(self):
         extra_height = win_height - total_font_height
 
         dbg('setting geometry hints: (ewidth:%s)(eheight:%s),\
-(fwidth:%s)(fheight:%s)' % (extra_width, extra_height, 
+(fwidth:%s)(fheight:%s)' % (extra_width, extra_height,
                             font_width, font_height))
         geometry = Gdk.Geometry()
         geometry.base_width = extra_width
@@ -817,7 +886,7 @@ def ungroup_tab(self, widget):
         if not maker.isinstance(notebook, 'Notebook'):
             dbg('note in a notebook, refusing to ungroup tab')
             return
-        
+
         self.set_groups(None, self.get_visible_terminals())
 
     def move_tab(self, widget, direction):
@@ -850,7 +919,7 @@ def move_tab(self, widget, direction):
         else:
             err('unknown direction: %s' % direction)
             return
-        
+
         notebook.reorder_child(child, page)
 
     def navigate_terminal(self, terminal, direction):