diff --git a/create_linux_installers-test.sh b/create_linux_installers-test.sh
new file mode 100755
index 0000000..9c597a8
--- /dev/null
+++ b/create_linux_installers-test.sh
@@ -0,0 +1,229 @@
+#!/bin/bash
+
+VERSION="0~git.*"
+
+OBS_BASE="https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons:/Staging:/Test"
+OBS_PACKAGE="systray-x"
+
+OBS_RPM_ARCHS="openSUSE_Leap_15.1/x86_64 "
+OBS_RPM_PKS="_ "
+OBS_RPM_ARCHS+="openSUSE_Leap_15.2/x86_64 "
+OBS_RPM_PKS+="_ "
+OBS_RPM_ARCHS+="openSUSE_Tumbleweed/i586 "
+OBS_RPM_PKS+="tmblwd "
+OBS_RPM_ARCHS+="openSUSE_Tumbleweed/x86_64 "
+OBS_RPM_PKS+="tmblwd "
+OBS_RPM_ARCHS+="SLE_15/x86_64 "
+OBS_RPM_PKS+="sle150 "
+OBS_RPM_ARCHS+="SLE_15_SP1/x86_64 "
+OBS_RPM_PKS+="sle151 "
+
+OBS_DEB_ARCHS="Debian_10/i386 "
+OBS_DEB_PKS="deb10 "
+OBS_DEB_ARCHS+="Debian_10/amd64 "
+OBS_DEB_PKS+="deb10 "
+OBS_DEB_ARCHS+="xUbuntu_18.04/i386 "
+OBS_DEB_PKS+="bionic1804 "
+OBS_DEB_ARCHS+="xUbuntu_18.04/amd64 "
+OBS_DEB_PKS+="bionic1804 "
+OBS_DEB_ARCHS+="xUbuntu_19.04/amd64 "
+OBS_DEB_PKS+="disco1904 "
+OBS_DEB_ARCHS+="xUbuntu_19.10/amd64 "
+OBS_DEB_PKS+="focal1910 "
+
+TARGET_DIR="bin-test"
+mkdir -p $TARGET_DIR
+pushd $TARGET_DIR > /dev/null 2>&1
+
+#
+# Create bash installers for RPM based distributions
+#
+INDEX=1
+for rpmdir in $OBS_RPM_ARCHS ; do
+
+  #
+  # Get index.html
+  #
+  rm -f index.html
+  wget -q "$OBS_BASE/$rpmdir/"
+
+  #
+  # Find rpm
+  #
+  RPM_FILE=`grep ">systray.*<" index.html | sed -e "s/.*>\(systray-x.*rpm\)<.*/\1/"`
+  rm -f index.html
+
+  echo $rpmdir/$RPM_FILE
+  
+  FOUND_VERSION=`echo $RPM_FILE | sed -e "s/systray-x-\(.*\)-.*/\1/"`
+
+  echo $FOUND_VERSION
+
+  #
+  # Get base name
+  #
+  BASE_NAME=${rpmdir//'/'/$'-'}
+
+  PACKAGE_NAME=SysTray-X-$FOUND_VERSION-$BASE_NAME
+
+  rm -rf $PACKAGE_NAME
+  mkdir -p $PACKAGE_NAME
+  pushd $PACKAGE_NAME > /dev/null 2>&1
+  
+  #
+  # Get rpm
+  #
+  wget -q "$OBS_BASE/$rpmdir/$RPM_FILE"
+
+  #
+  # Extract 
+  #
+  rpm2cpio $RPM_FILE | cpio -i --to-stdout ./usr/bin/SysTray-X > SysTray-X 2>/dev/null
+  chmod 755 SysTray-X
+
+  rpm2cpio $RPM_FILE | cpio -i --to-stdout ./usr/share/doc/packages/systray-x/systray-x@Ximi1970.xpi > systray-x@Ximi1970.xpi 2>/dev/null
+
+  if [ ! -f ../systray-x@Ximi1970.xpi ] ; then
+    cp -f systray-x@Ximi1970.xpi ..
+  fi
+
+  #
+  # Get JSON
+  #
+  cp -f ../../app/config/linux/SysTray_X.json.template SysTray_X.json.template
+
+  #
+  # Cleanup
+  #
+  mv -f $RPM_FILE ..
+
+  tar cJf ../$PACKAGE_NAME.tar.xz .
+
+  popd > /dev/null 2>&1
+
+  #
+  # Rename package
+  #
+  PACKAGE_EXT=`echo $OBS_RPM_PKS | cut -d' ' -f$INDEX`
+  
+  echo "Ext: "$PACKAGE_EXT
+  
+  if [ "$PACKAGE_EXT" != "_" ] ; then
+    NEW_RPM_FILE=`echo $RPM_FILE | sed -s "s/\($OBS_PACKAGE-$FOUND_VERSION-\)\(.*\)/\1$PACKAGE_EXT\.\2/"`
+    mv -f $RPM_FILE $NEW_RPM_FILE
+  fi
+
+  #
+  # Create installer
+  #
+  cp -f ../dist/install.sh SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh
+  cat $PACKAGE_NAME.tar.xz >> SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh
+  chmod 755 SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh
+
+  #
+  # Cleanup
+  #
+  rm -rf $PACKAGE_NAME
+  rm -f $PACKAGE_NAME.tar.xz
+
+  #
+  # Update index
+  #
+  INDEX=$((INDEX+1))
+done
+
+
+#
+# Create bash installers for DEB based distributions
+#
+INDEX=1
+for debdir in $OBS_DEB_ARCHS ; do
+
+  #
+  # Get index.html
+  #
+  rm -f index.html
+  wget -q "$OBS_BASE/$debdir/"
+  
+  #
+  # Find deb
+  #
+  DEB_FILE=`grep ">systray-x_.*\.deb<" index.html | sed -e "s/.*>\(systray-x.*deb\)<.*/\1/"`
+  rm -f index.html
+
+  echo $debdir/$DEB_FILE
+  
+  FOUND_VERSION=`echo $DEB_FILE | sed -e "s/systray-x_\(.*\)_.*/\1/"`
+
+  echo $FOUND_VERSION
+
+  #
+  # Get base name
+  #
+  BASE_NAME=${debdir//'/'/$'-'}
+
+  PACKAGE_NAME=SysTray-X-$FOUND_VERSION-$BASE_NAME
+
+  rm -rf $PACKAGE_NAME
+  mkdir -p $PACKAGE_NAME
+  pushd $PACKAGE_NAME > /dev/null 2>&1
+
+  #
+  # Get deb
+  #
+  wget -q "$OBS_BASE/$debdir/$DEB_FILE"
+
+  #
+  # Extract 
+  #
+  dpkg --fsys-tarfile $DEB_FILE | tar xOf - ./usr/bin/SysTray-X > SysTray-X
+  chmod 755 SysTray-X
+
+  dpkg --fsys-tarfile $DEB_FILE | tar xOf - ./usr/lib/thunderbird-addons/extensions/systray-x@Ximi1970.xpi > systray-x@Ximi1970.xpi
+
+  #
+  # Get JSON
+  #
+  cp -f ../../app/config/linux/SysTray_X.json.template SysTray_X.json.template
+
+  #
+  # Cleanup
+  #
+  mv -f $DEB_FILE ..
+
+  tar cJf ../$PACKAGE_NAME.tar.xz .
+
+  popd > /dev/null 2>&1
+
+  #
+  # Rename package
+  #
+  PACKAGE_EXT=`echo $OBS_DEB_PKS | cut -d' ' -f$INDEX`
+  
+  echo "Ext: "$PACKAGE_EXT
+
+  if [ "$PACKAGE_EXT" != "_" ] ; then
+    NEW_DEB_FILE=`echo $DEB_FILE | sed -s "s/\($OBS_PACKAGE\_$FOUND_VERSION\_\)\(.*\)/\1$PACKAGE_EXT\_\2/"`
+    mv -f $DEB_FILE $NEW_DEB_FILE
+  fi
+
+  #
+  # Create installer
+  #
+  cp -f ../dist/install.sh SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh
+  cat $PACKAGE_NAME.tar.xz >> SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh
+  chmod 755 SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh
+
+  #
+  # Cleanup
+  #
+  rm -rf $PACKAGE_NAME
+  rm -f $PACKAGE_NAME.tar.xz
+
+  #
+  # Update index
+  #
+  INDEX=$((INDEX+1))
+done 
+
+popd > /dev/null 2>&1
diff --git a/create_linux_installers.sh b/create_linux_installers.sh
index a047670..2eaec30 100755
--- a/create_linux_installers.sh
+++ b/create_linux_installers.sh
@@ -5,8 +5,10 @@ VERSION=`git describe --long | sed "s/-.*//"`
 OBS_BASE="https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons"
 OBS_PACKAGE="systray-x"
 
-OBS_RPM_ARCHS="openSUSE_Leap_15.1/x86_64 "
-OBS_RPM_PKS="_ "
+OBS_RPM_ARCHS=""
+OBS_RPM_PKS=""
+OBS_RPM_ARCHS+="openSUSE_Leap_15.1/x86_64 "
+OBS_RPM_PKS+="_ "
 OBS_RPM_ARCHS+="openSUSE_Leap_15.2/x86_64 "
 OBS_RPM_PKS+="_ "
 OBS_RPM_ARCHS+="openSUSE_Tumbleweed/i586 "
@@ -18,8 +20,10 @@ OBS_RPM_PKS+="sle150 "
 OBS_RPM_ARCHS+="SLE_15_SP1/x86_64 "
 OBS_RPM_PKS+="sle151 "
 
-OBS_DEB_ARCHS="xUbuntu_18.04/i386 "
-OBS_DEB_PKS="bionic1804 "
+OBS_DEB_ARCHS=""
+OBS_DEB_PKS=""
+OBS_DEB_ARCHS+="xUbuntu_18.04/i386 "
+OBS_DEB_PKS+="bionic1804 "
 OBS_DEB_ARCHS+="xUbuntu_18.04/amd64 "
 OBS_DEB_PKS+="bionic1804 "
 OBS_DEB_ARCHS+="xUbuntu_19.04/amd64 "
@@ -27,8 +31,9 @@ OBS_DEB_PKS+="disco1904 "
 OBS_DEB_ARCHS+="xUbuntu_19.10/amd64 "
 OBS_DEB_PKS+="focal1910 "
 
-mkdir -p bin
-pushd bin > /dev/null 2>&1
+TARGET_DIR="bin"
+mkdir -p $TARGET_DIR
+pushd $TARGET_DIR > /dev/null 2>&1
 
 #
 # Create bash installers for RPM based distributions
@@ -36,29 +41,39 @@ pushd bin > /dev/null 2>&1
 INDEX=1
 for rpmdir in $OBS_RPM_ARCHS ; do
 
-  #
-  # Get base name
-  #
-  BASE_NAME=${rpmdir//'/'/$'-'}
-
-  PACKAGE_NAME=SysTray-X-$VERSION-$BASE_NAME
-
-  rm -rf $PACKAGE_NAME
-  mkdir -p $PACKAGE_NAME
-  pushd $PACKAGE_NAME > /dev/null 2>&1
-
   #
   # Get index.html
   #
+  rm -f index.html
   wget -q "$OBS_BASE/$rpmdir/"
 
   #
   # Find rpm
   #
   RPM_FILE=`grep ">systray.*<" index.html | sed -e "s/.*>\(systray-x.*rpm\)<.*/\1/"`
-  
-  echo $rpmdir/$RPM_FILE
+  rm -f index.html
 
+  echo $rpmdir/$RPM_FILE
+  
+  FOUND_VERSION=`echo $RPM_FILE | sed -e "s/systray-x-\(.*\)-.*/\1/"`
+
+  echo $FOUND_VERSION
+
+  if [ "$VERSION" != "$FOUND_VERSION" ] ; then
+    echo "---------------Wrong version !!!!---------------"
+  fi
+
+  #
+  # Get base name
+  #
+  BASE_NAME=${rpmdir//'/'/$'-'}
+
+  PACKAGE_NAME=SysTray-X-$FOUND_VERSION-$BASE_NAME
+
+  rm -rf $PACKAGE_NAME
+  mkdir -p $PACKAGE_NAME
+  pushd $PACKAGE_NAME > /dev/null 2>&1
+  
   #
   # Get rpm
   #
@@ -84,7 +99,6 @@ for rpmdir in $OBS_RPM_ARCHS ; do
   #
   # Cleanup
   #
-  rm -f index.html
   mv -f $RPM_FILE ..
 
   tar cJf ../$PACKAGE_NAME.tar.xz .
@@ -99,16 +113,16 @@ for rpmdir in $OBS_RPM_ARCHS ; do
   echo "Ext: "$PACKAGE_EXT
   
   if [ "$PACKAGE_EXT" != "_" ] ; then
-    NEW_RPM_FILE=`echo $RPM_FILE | sed -s "s/\($OBS_PACKAGE-$VERSION-\)\(.*\)/\1$PACKAGE_EXT\.\2/"`
+    NEW_RPM_FILE=`echo $RPM_FILE | sed -s "s/\($OBS_PACKAGE-$FOUND_VERSION-\)\(.*\)/\1$PACKAGE_EXT\.\2/"`
     mv -f $RPM_FILE $NEW_RPM_FILE
   fi
 
   #
   # Create installer
   #
-  cp -f ../dist/install.sh SysTray-X-$VERSION-$BASE_NAME-install.sh
-  cat $PACKAGE_NAME.tar.xz >> SysTray-X-$VERSION-$BASE_NAME-install.sh
-  chmod 755 SysTray-X-$VERSION-$BASE_NAME-install.sh
+  cp -f ../dist/install.sh SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh
+  cat $PACKAGE_NAME.tar.xz >> SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh
+  chmod 755 SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh
 
   #
   # Cleanup
@@ -129,29 +143,35 @@ done
 INDEX=1
 for debdir in $OBS_DEB_ARCHS ; do
 
+  #
+  # Get index.html
+  #
+  rm -f index.html
+  wget -q "$OBS_BASE/$debdir/"
+  
+  #
+  # Find deb
+  #
+  DEB_FILE=`grep ">systray-x_.*\.deb<" index.html | sed -e "s/.*>\(systray-x.*deb\)<.*/\1/"`
+  rm -f index.html
+
+  echo $debdir/$DEB_FILE
+  
+  FOUND_VERSION=`echo $DEB_FILE | sed -e "s/systray-x_\(.*\)_.*/\1/"`
+
+  echo $FOUND_VERSION
+
   #
   # Get base name
   #
   BASE_NAME=${debdir//'/'/$'-'}
 
-  PACKAGE_NAME=SysTray-X-$VERSION-$BASE_NAME
+  PACKAGE_NAME=SysTray-X-$FOUND_VERSION-$BASE_NAME
 
   rm -rf $PACKAGE_NAME
   mkdir -p $PACKAGE_NAME
   pushd $PACKAGE_NAME > /dev/null 2>&1
 
-  #
-  # Get index.html
-  #
-  wget -q "$OBS_BASE/$debdir/"
-
-  #
-  # Find deb
-  #
-  DEB_FILE=`grep ">systray.*\.deb<" index.html | sed -e "s/.*>\(systray-x.*deb\)<.*/\1/"`
-
-  echo $debdir/$DEB_FILE
-
   #
   # Get deb
   #
@@ -173,7 +193,6 @@ for debdir in $OBS_DEB_ARCHS ; do
   #
   # Cleanup
   #
-  rm -f index.html
   mv -f $DEB_FILE ..
 
   tar cJf ../$PACKAGE_NAME.tar.xz .
@@ -188,16 +207,16 @@ for debdir in $OBS_DEB_ARCHS ; do
   echo "Ext: "$PACKAGE_EXT
 
   if [ "$PACKAGE_EXT" != "_" ] ; then
-    NEW_DEB_FILE=`echo $DEB_FILE | sed -s "s/\($OBS_PACKAGE\_$VERSION\_\)\(.*\)/\1$PACKAGE_EXT\_\2/"`
+    NEW_DEB_FILE=`echo $DEB_FILE | sed -s "s/\($OBS_PACKAGE\_$FOUND_VERSION\_\)\(.*\)/\1$PACKAGE_EXT\_\2/"`
     mv -f $DEB_FILE $NEW_DEB_FILE
   fi
 
   #
   # Create installer
   #
-  cp -f ../dist/install.sh SysTray-X-$VERSION-$BASE_NAME-install.sh
-  cat $PACKAGE_NAME.tar.xz >> SysTray-X-$VERSION-$BASE_NAME-install.sh
-  chmod 755 SysTray-X-$VERSION-$BASE_NAME-install.sh
+  cp -f ../dist/install.sh SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh
+  cat $PACKAGE_NAME.tar.xz >> SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh
+  chmod 755 SysTray-X-$FOUND_VERSION-$BASE_NAME-install.sh
 
   #
   # Cleanup