diff --git a/LEGACY/xdotool-gui.png b/LEGACY/xdotool-gui.png
new file mode 100644
index 0000000..0367354
Binary files /dev/null and b/LEGACY/xdotool-gui.png differ
diff --git a/PKGBUILD b/PKGBUILD
index 7ebf923..9dae11f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,22 @@
 _basename=xdotoolgui
-pkgname=xdotool-gui-py3 # FIXME
-pkgver=1.2
-_pkgrel=1
-pkgrel=2
+pkgname=xdotool-gui
+pkgver=1.3
+pkgrel=1
 pkgdesc="GUI for command-line X11 automation tool"
 arch=('any')
-url="https://github.com/sickcodes/xdotool-gui"
+url="https://github.com/aleritty/xdotool-gui"
 license=('GPL')
-depends=('xdotool' 'python3' 'gobject-introspection' 'python-gobject')
-source=(
-  "http://downloads.sourceforge.net/project/${pkgname}/${_basename}_${pkgver}-${_pkgrel}.tar.gz" # FIXME
-  xdotoolgui.desktop
-)
-
-build() {
-  cd "$srcdir/$_basename-$pkgver"
-
-  sed -i -re "1s/python2?/python2/" *.py # FIXME
-  sed -i -re "44s|sys.path\[0\]|'/usr/share/xdotool-gui'|" xdotoolgui.py # FIXME
-}
+makedepends=('git')
+depends=('xdotool' 'python3' 'gobject-introspection-runtime' 'python-gobject') #'PyGObject for python
+source=("git+https://github.com/aleritty/xdotool-gui")
 
 package() {
-  cd "$srcdir/$_basename-$pkgver"
-  
-  install -Dm755 xdotoolgui.py "$pkgdir/usr/bin/xdotool-gui"
+  cd "xdotool-gui"
+
+  install -Dm755 xdotoolgui.py "$pkgdir/usr/share/$pkgname/xdotoolgui.py"
   install -Dm644 xdotoolgui.glade "$pkgdir/usr/share/$pkgname/xdotoolgui.glade"
-  install -Dm644 "$srcdir/xdotoolgui.desktop" "$pkgdir/usr/share/applications/xdotoolgui.desktop"
-  install -Dm644 data/xdotoolgui.gif "$pkgdir/usr/share/$pkgname/xdotoolgui.gif"
+  install -Dm644 xdotoolgui.png "$pkgdir/usr/share/$pkgname/xdotoolgui.png"
+  install -Dm 755 xdotool-gui "$pkgdir/usr/local/bin/xdotool-gui"
+  install -Dm644 "xdotoolgui.desktop" "$pkgdir/usr/share/applications/xdotoolgui.desktop"
 }
-
-# vim:set ts=2 sw=2 et:
-md5sums=('SKIP'
-         'SKIP') # FIXME
\ No newline at end of file
+sha256sums=('SKIP')
\ No newline at end of file
diff --git a/xdotool-gui b/xdotool-gui
new file mode 100644
index 0000000..3b4773f
--- /dev/null
+++ b/xdotool-gui
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cd /usr/share/xdotool-gui && python3 xdotoolgui.py
\ No newline at end of file
diff --git a/xdotoolgui.desktop b/xdotoolgui.desktop
new file mode 100644
index 0000000..129483d
--- /dev/null
+++ b/xdotoolgui.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=XDoTool-Gui
+Icon=/usr/share/xdotool-gui/xdotoolgui.png
+Comment= GUI for command-line X11 automation tool
+Path=/usr/share/xdotool-gui/
+Exec=python xdotoolgui.py
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;Game;
+StartupNotify=false
diff --git a/xdotoolgui.glade b/xdotoolgui.glade
index d3e2a40..e43518b 100644
--- a/xdotoolgui.glade
+++ b/xdotoolgui.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.39.0 -->
+<!-- Generated with glade 3.40.0 -->
 <interface>
   <requires lib="gtk+" version="3.24"/>
   <object class="GtkComboBoxText">
@@ -346,10 +346,10 @@
             <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <child>
-              <object class="GtkLabel" id="label9">
+              <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes">seconds</property>
+                <property name="label" translatable="yes">click mouse</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -358,24 +358,26 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry_time3">
+              <object class="GtkComboBoxText" id="combobox1">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="max-length">5</property>
-                <property name="invisible-char">●</property>
-                <property name="width-chars">5</property>
+                <property name="can-focus">False</property>
+                <items>
+                  <item translatable="yes">Left Click</item>
+                  <item translatable="yes">Right Click</item>
+                  <item translatable="yes">Middle Click</item>
+                </items>
               </object>
               <packing>
-                <property name="expand">True</property>
+                <property name="expand">False</property>
                 <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label8">
+              <object class="GtkLabel" id="label7">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes">times，every time delay</property>
+                <property name="label" translatable="yes">for</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -398,10 +400,10 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label7">
+              <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes">for</property>
+                <property name="label" translatable="yes">times，every time delay</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -410,36 +412,34 @@
               </packing>
             </child>
             <child>
-              <placeholder/>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label6">
+              <object class="GtkEntry" id="entry_time3">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="label" translatable="yes">click mouse</property>
+                <property name="can-focus">True</property>
+                <property name="max-length">5</property>
+                <property name="invisible-char">●</property>
+                <property name="width-chars">5</property>
               </object>
               <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">6</property>
+                <property name="position">5</property>
               </packing>
             </child>
             <child>
-              <object class="GtkComboBoxText" id="combobox1">
+              <object class="GtkLabel" id="label9">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <items>
-                  <item translatable="yes">Left Click</item>
-                  <item translatable="yes">Right Click</item>
-                  <item translatable="yes">Middle Click</item>
-                </items>
+                <property name="label" translatable="yes">seconds</property>
               </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">7</property>
+                <property name="position">6</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -538,72 +538,6 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkLabel" id="label13">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="label" translatable="yes">seconds</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_time4">
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="max-length">5</property>
-                <property name="invisible-char">●</property>
-                <property name="width-chars">5</property>
-                <property name="placeholder-text" translatable="yes">0</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label12">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="label" translatable="yes">times,every time delay</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_sum4">
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="max-length">5</property>
-                <property name="invisible-char">●</property>
-                <property name="width-chars">5</property>
-                <property name="placeholder-text" translatable="yes">1</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label11">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="label" translatable="yes">for</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkLabel" id="label10">
                 <property name="visible">True</property>
@@ -613,7 +547,7 @@
               <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">5</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -2724,7 +2658,7 @@
               <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">6</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
@@ -2735,6 +2669,72 @@
                 <property name="width-chars">8</property>
                 <property name="placeholder-text" translatable="yes">KP_Enter</property>
               </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label11">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes">for</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry_sum4">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="max-length">5</property>
+                <property name="invisible-char">●</property>
+                <property name="width-chars">5</property>
+                <property name="placeholder-text" translatable="yes">1</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label12">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes">times,every time delay</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry_time4">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="max-length">5</property>
+                <property name="invisible-char">●</property>
+                <property name="width-chars">5</property>
+                <property name="placeholder-text" translatable="yes">0</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">6</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label13">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes">seconds</property>
+              </object>
               <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
@@ -3072,7 +3072,6 @@
                     <property name="can-focus">True</property>
                     <property name="receives-default">True</property>
                     <signal name="toggled" handler="on_togglebutton1_toggled" swapped="no"/>
-                    <signal name="toggled" handler="on_togglebutton2_toggled" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/xdotoolgui.png b/xdotoolgui.png
new file mode 100644
index 0000000..fa3fc1e
Binary files /dev/null and b/xdotoolgui.png differ
diff --git a/xdotoolgui.py b/xdotoolgui.py
index 445c069..90297df 100644
--- a/xdotoolgui.py
+++ b/xdotoolgui.py
@@ -39,7 +39,7 @@
 
 
 filename = tempfile.NamedTemporaryFile(delete=True).name  #'./.xdotool-script'
-MouseLocation = True
+MouseLocation = False
 
 
 class xdotoolgui:
@@ -78,7 +78,6 @@ def __init__(self):
             "on_keybordcancel_clicked": self.keybordcancel,
             "on_button5_clicked": self.run,
             "on_togglebutton1_toggled": self.mouselocation,
-            "on_togglebutton2_toggled": self.mouselocation,  # I don't know
             "on_window1_expose_event": self.threadmouse,
             "on_aboutdialog1_close": self.quitabout,
         }