diff -Nru blackchocobo-1.9.900/about.cpp blackchocobo-1.9.910/about.cpp
--- blackchocobo-1.9.900/about.cpp	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/about.cpp	2018-12-29 20:35:46.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-//    copyright 2010-2016 Chris Rizzitello <sithlord48@gmail.com>           //
+//    copyright 2010-2018 Chris Rizzitello <sithlord48@gmail.com>           //
 //                                                                          //
 //    This file is part of Black Chocobo.                                   //
 //                                                                          //
@@ -25,8 +25,9 @@
     ui->setupUi(this);
     settings = config_data;
     restoreGeometry(settings->value("AboutGeometry").toByteArray());
-	ui->lbl_icon->setFixedSize(64*settings->value("scale").toReal(),64*settings->value("scale").toReal());
-	ui->lbl_icon->setPixmap(QPixmap(":/icon/bchoco").scaled(ui->lbl_icon->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation));
+    ui->pushButton->setIcon(QIcon::fromTheme("window-close", style()->standardIcon(QStyle::SP_DialogCloseButton)));
+    ui->lbl_icon->setFixedSize(fontMetrics().height()* 3, fontMetrics().height() * 3);
+    ui->lbl_icon->setPixmap(QPixmap(":/icon/bchoco").scaled(ui->lbl_icon->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation));
     ui->lbl_name->setText(QCoreApplication::applicationName().toLatin1());
     ui->lbl_bc_version->setText(QString(tr("Version: %1")).arg(QCoreApplication::applicationVersion()));
     ui->lbl_qt_version->setText(QString(tr("Using Qt: %1")).arg(qVersion()));
diff -Nru blackchocobo-1.9.900/about.h blackchocobo-1.9.910/about.h
--- blackchocobo-1.9.900/about.h	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/about.h	2018-12-29 20:35:46.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-//    copyright 2010-2016 Chris Rizzitello <sithlord48@gmail.com>           //
+//    copyright 2010-2018 Chris Rizzitello <sithlord48@gmail.com>           //
 //                                                                          //
 //    This file is part of Black Chocobo.                                   //
 //                                                                          //
diff -Nru blackchocobo-1.9.900/about.ui blackchocobo-1.9.910/about.ui
--- blackchocobo-1.9.900/about.ui	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/about.ui	2018-12-29 20:35:46.000000000 +0000
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>329</width>
-    <height>383</height>
+    <width>714</width>
+    <height>660</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -121,7 +121,7 @@
        <item>
         <widget class="QLabel" name="copyleft">
          <property name="text">
-          <string notr="true">(C) 2010 - 2015 Chris Rizzitello</string>
+          <string notr="true">(C) 2010 - 2018 Chris Rizzitello</string>
          </property>
          <property name="indent">
           <number>9</number>
@@ -210,37 +210,42 @@
          </property>
          <item>
           <property name="text">
-           <string>New: Scaling support for HiDpi</string>
+           <string>New: Further Improve HiDpi</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>New: Psv Signing Place Keys in Options</string>
+           <string>Fixed: Track hex Editor's cursor on tab change.</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>New: Save/Restore Geometry for MainWindow and Options</string>
+           <string>ff7tk: Fixed Loading Psv file crashes host</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>New: Auto guess Slot location for VMC formats.</string>
+           <string>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/12</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Fixed: Menu Editor Backward Columns</string>
+           <string>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/17</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>New: Achievement Editor.</string>
+           <string>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/37</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>FF7tk: LocationViewer Contains Field Items (Finished!)</string>
+           <string>ff7tk: Fixed Chocobo  pCount / Personality layout was overlapping Speed Notes.</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>ff7tk: Chocobo name not showing place holder text at right times</string>
           </property>
          </item>
         </widget>
@@ -275,8 +280,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>378</width>
-            <height>491</height>
+            <width>658</width>
+            <height>699</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="_8">
@@ -867,8 +872,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>273</width>
-            <height>690</height>
+            <width>658</width>
+            <height>756</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="_27">
diff -Nru blackchocobo-1.9.900/.appveyor.yml blackchocobo-1.9.910/.appveyor.yml
--- blackchocobo-1.9.900/.appveyor.yml	1970-01-01 00:00:00.000000000 +0000
+++ blackchocobo-1.9.910/.appveyor.yml	2018-12-29 20:35:46.000000000 +0000
@@ -0,0 +1,82 @@
+version: '{branch}.{build}'
+image: Visual Studio 2015
+configuration: release
+platform: x86
+init:
+- ps: >-
+    $env:commit = $env:appveyor_repo_commit.SubString(0,7)
+
+    Update-AppveyorBuild -Version ("{0}-{1}-{2}" -f $env:appveyor_repo_branch,$env:appveyor_build_number,$env:commit )
+environment:
+  VSVER: 14.0 
+  matrix:
+  - MSVC: 15
+    RUNTIME_LINKAGE: static
+    ICU_VERSION: 57.1
+    ICU_LINKAGE: static
+    QTDIR: C:\Qt\5.11.2\mingw53_32
+    MGWDIR: C:\Qt\Tools\mingw530_32\bin
+    QT_VERSION: 5.11.2
+    QT_LINKAGE: static
+install:
+- cmd: >-
+    %QTDIR%\bin\qtenv2.bat
+
+    qmake -v
+
+    set QTDIR
+
+    if %QTDIR:_64=%==%QTDIR% ( set ARCH=x86 ) else set ARCH=x64
+
+    if %QTDIR:msvc=%==%QTDIR% g++ --version
+
+    if %QTDIR:msvc=%==%QTDIR% set make=mingw32-make.exe
+
+    if %QTDIR:msvc=%==%QTDIR% %make% --version
+
+    if not %QTDIR:msvc=%==%QTDIR% call "%ProgramFiles(x86)%\Microsoft Visual Studio %VSVER%\VC\vcvarsall.bat" %ARCH%
+
+    if not %QTDIR:msvc=%==%QTDIR% set make=nmake.exe
+
+    if not %QTDIR:msvc=%==%QTDIR% %make% /? > nul
+
+    set QTBIN=%QTDIR%\bin
+build_script:
+- cmd: >-
+    cd C:\projects\blackchocobo
+
+    qmake "DEFINES+=OPENSSL=1" "INCLUDEPATH += C:\OpenSSL-Win32\include" "LIBS += -L"C:\OpenSSL-Win32\lib" -llibeay32" Black_Chocobo.pro
+
+    mkdir Black_Chocobo-%commit%-win32
+
+    mkdir Black_Chocobo-%commit%-win32\lang
+
+    move lang\*.qm Black_Chocobo-%commit%-win32\lang\
+
+    move COPYING.TXT Black_Chocobo-%commit%-win32\
+
+    copy C:\OpenSSL-Win32\libeay32.dll Black_Chocobo-%commit%-win32\
+
+    %make%
+
+    move release\Black_Chocobo.exe Black_Chocobo-%commit%-win32\
+
+    windeployqt --compiler-runtime Black_Chocobo-%commit%-win32\Black_Chocobo.exe
+
+    echo "" > Black_Chocobo-%commit%-win32\settings.ini
+
+    dir Black_Chocobo-%commit%-win32
+
+    7z a -tzip Black_Chocobo-win32.zip Black_Chocobo-%commit%-win32 -r
+
+artifacts:
+- path: Black_Chocobo-win32.zip
+  name: blackchocobo
+deploy:
+- provider: GitHub
+  tag: continuous
+  description: continuous
+  auth_token:
+    secure: yG66EEKasiTmuCDPStbz0nVsvcETsQlnpDD2ScfNWUwT81kKfALCVFRTPMrp6R6E
+  artifact: blackchocobo
+  force_update: true
diff -Nru blackchocobo-1.9.900/Black_Chocobo.desktop blackchocobo-1.9.910/Black_Chocobo.desktop
--- blackchocobo-1.9.900/Black_Chocobo.desktop	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/Black_Chocobo.desktop	2018-12-29 20:35:46.000000000 +0000
@@ -7,7 +7,7 @@
 GenericName[es]=Editor de partidas guardadas para FF7
 GenericName[fr]=Éditeur de sauvegardes FF7
 GenericName[de]=FF7 Spielstand-Bearbeitungsprogramm
-Icon=Black_Chocobo.png
+Icon=Black_Chocobo
 MimeType=application/x-blackchocobo;
 Name=Black Chocobo
 Name[en]=Black Chocobo
@@ -17,5 +17,4 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Version=1.9.90
 X-KDE-SubstituteUID=false
diff -Nru blackchocobo-1.9.900/Black_Chocobo.pro blackchocobo-1.9.910/Black_Chocobo.pro
--- blackchocobo-1.9.900/Black_Chocobo.pro	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/Black_Chocobo.pro	2018-12-29 20:35:46.000000000 +0000
@@ -154,8 +154,8 @@
 unix:!macx:!symbian:!android {
 	#remember to ship debian/menu and debian/blackchocobo.sharedmimeinfo
 
-	DEFINES += OPENSSL=1							# Enable openSSL support
-	LIBS += -lcrypto								# Enable crypto lib
+	#DEFINES += OPENSSL=1							# Enable openSSL support
+	#LIBS += -lcrypto								# Enable crypto lib
 	
 	TARGET = blackchocobo
 	target.path = /usr/bin
@@ -172,7 +172,7 @@
 	INSTALLS += target langfiles icon desktop
 }
 android:{
-	INCLUDEPATH += /home/chris/Downloads/openssl-1.0.1i/include
+	#INCLUDEPATH += /home/chris/Downloads/openssl-1.0.1i/include
 	#DEFINES += OPENSSL=1						# Enable openSSL support
 	#LIBS += -L "" -lcrypto						# Enable crypto lib
 	TARGET = blackchocobo
diff -Nru blackchocobo-1.9.900/debian/bzr-builder.manifest blackchocobo-1.9.910/debian/bzr-builder.manifest
--- blackchocobo-1.9.900/debian/bzr-builder.manifest	2016-06-05 13:17:59.000000000 +0000
+++ blackchocobo-1.9.910/debian/bzr-builder.manifest	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# bzr-builder format 0.3 deb-version {debupstream}-0~1269
-lp:~sithlord48/blackchocobo/trunk revid:git-v1:a58029a4174ab07d450ff68c76227502d4a282d0
diff -Nru blackchocobo-1.9.900/debian/changelog blackchocobo-1.9.910/debian/changelog
--- blackchocobo-1.9.900/debian/changelog	2016-06-05 13:17:59.000000000 +0000
+++ blackchocobo-1.9.910/debian/changelog	2018-12-29 20:35:46.000000000 +0000
@@ -1,13 +1,27 @@
-blackchocobo (1.9.900-0~1269~ubuntu16.04.1) xenial; urgency=low
+blackchocobo (1.9.910-0~201812290556~ubuntu16.04.1) xenial; urgency=low
 
   * Auto build.
 
- -- sithlord48 <sithlord48@gmail.com>  Sun, 05 Jun 2016 13:17:59 +0000
+ -- sithlord48 <sithlord48@gmail.com>  Sat, 29 Dec 2018 20:35:46 +0000
+
+blackchocobo (1.9.910) trusty; urgency=low
+  *New: More HiDpi Adjustments
+  *Fixed: track the hex Editor tab's curosr position on tab changes. 
+  *ff7tk: Fixed Loading Psv file crashes host.
+  *ff7tk: Fixed Issue#12, https://github.com/sithlord48/ff7tk/issues/12
+  *ff7tk: Fixed Issue#17, https://github.com/sithlord48/ff7tk/issues/17
+  *ff7tk: Fixed Issue#37, https://github.com/sithlord48/ff7tk/issues/37
+  *ff7tk: Fixed Chocobo  pCount / Personality layout was overlapping Speed Notes.
+  *ff7tk: Chocobo name not showing place holder text at right times
+ -- Chris Rizzitello <sithlord48@gmail.com>  Fri, 21 Dec 2018 10:32:16 -0400
 
 blackchocobo (1.9.900) trusty; urgency=low
-  *New: Items Tab now Contains command buttons for keyitems and flyers for easier access.
-  *New: Advanced modes for different ff7tk widgets can be set indpendently in options.
-  *New: Apply Button for Replay Missions;Browse the options without changing your data.
+  *New: Items Tab now Contains command buttons for keyitems and flyers for 
+  easier access.
+  *New: Advanced modes for different ff7tk widgets can be set indpendently in 
+  options.
+  *New: Apply Button for Replay Missions;Browse the options without changing 
+  your data.
   *Fixed: Cloud's Flashback now set Sephiroth's char data for you
   *Fixed: Snowboard times are now saved / read correctly.
   *Fixed: Backwards label for turtle paradise / keyItems
diff -Nru blackchocobo-1.9.900/debian/compat blackchocobo-1.9.910/debian/compat
--- blackchocobo-1.9.900/debian/compat	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/debian/compat	2018-12-29 20:35:46.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru blackchocobo-1.9.900/debian/control blackchocobo-1.9.910/debian/control
--- blackchocobo-1.9.900/debian/control	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/debian/control	2018-12-29 20:35:46.000000000 +0000
@@ -2,14 +2,22 @@
 Section: games
 Priority: extra
 Maintainer: Chris Rizzitello <sithlord48@gmail.com>
-Build-Depends: debhelper (>= 7.0.50~),qt5-default,qttools5-dev-tools,cdbs,libssl-dev
-Standards-Version: 3.9.5
+Build-Depends:
+ cmake,
+ debhelper (>= 9.0),
+ qt5-default,
+ qttools5-dev-tools,
+ libssl-dev
+Standards-Version: 3.9.7
 Homepage: http://blackchocobo.sourceforge.net
 #Vcs-Git: git://git.debian.org/collab-maint/blackchocobo.git
 #Vcs-Browser: http://git.debian.org/?p=collab-maint/blackchocobo.git;a=summary
 
 Package: blackchocobo
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
 Description: FF7 Savegame Editor
- Do lots of stuff w/ final fantasy vii savegame for pc,psx,emulators,psp, or psn versions
+ Do lots of stuff w/ final fantasy vii savegame for pc,psx,emulators,psp, or psn
+ versions
diff -Nru blackchocobo-1.9.900/debian/copyright blackchocobo-1.9.910/debian/copyright
--- blackchocobo-1.9.900/debian/copyright	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/debian/copyright	2018-12-29 20:35:46.000000000 +0000
@@ -1,9 +1,9 @@
 Format: http://dep.debian.net/deps/dep5
 Upstream-Name: blackchocobo
-Source: http://blackchocobo.sourceforge.net
+Source: https://github.com/sithlord48/blackchocobo
 
 Files: debian/*
-Copyright: 2010 -2013 Chris Rizzitello <sithlord48@gmail.com>
+Copyright: 2010 -2018 Chris Rizzitello <sithlord48@gmail.com>
 License: GPL-3+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff -Nru blackchocobo-1.9.900/debian/docs blackchocobo-1.9.910/debian/docs
--- blackchocobo-1.9.900/debian/docs	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/debian/docs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-COPYING.txt
diff -Nru blackchocobo-1.9.900/debian/git-build-recipe.manifest blackchocobo-1.9.910/debian/git-build-recipe.manifest
--- blackchocobo-1.9.900/debian/git-build-recipe.manifest	1970-01-01 00:00:00.000000000 +0000
+++ blackchocobo-1.9.910/debian/git-build-recipe.manifest	2018-12-29 20:35:46.000000000 +0000
@@ -0,0 +1,2 @@
+# git-build-recipe format 0.4 deb-version {debupstream}-0~201812290556
+lp:blackchocobo git-commit:c1942a4da44b24d27abc785dbb2a4f40ae09ef73
diff -Nru blackchocobo-1.9.900/debian/preinst blackchocobo-1.9.910/debian/preinst
--- blackchocobo-1.9.900/debian/preinst	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/debian/preinst	2018-12-29 20:35:46.000000000 +0000
@@ -1,10 +1,7 @@
-#! /bin/bash
+#! /bin/bash -e
 #DEBHELPER#
 echo -e "Checking for and removing old install...\c"
-if [ -d /usr/bin/blackchocobo ];then #check to see if older version installed.
-  rm -r /usr/bin/blackchocobo/
-  echo "RM:/usr/bin/blackchcobo"
-elif [ -d /opt/blackchocobo ];then 
+if [ -d /opt/blackchocobo ];then 
   rm -r /opt/blackchocobo
   echo "RM: /opt/blackchocobo"
 else echo "Not Found"
diff -Nru blackchocobo-1.9.900/debian/rules blackchocobo-1.9.910/debian/rules
--- blackchocobo-1.9.900/debian/rules	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/debian/rules	2018-12-29 20:35:46.000000000 +0000
@@ -1,4 +1,14 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/qmake.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+#DPKG_EXPORT_BUILDFLAGS = 1
+#include /usr/share/dpkg/buildflags.mk
+
+%:
+	dh $@ --parallel --buildsystem=cmake
+	
+override_dh_auto_install:
+	find . -name "COPYING.txt" -delete
+	dh_auto_install
diff -Nru blackchocobo-1.9.900/ff7tk/data/FF7FieldItemList.h blackchocobo-1.9.910/ff7tk/data/FF7FieldItemList.h
--- blackchocobo-1.9.900/ff7tk/data/FF7FieldItemList.h	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/ff7tk/data/FF7FieldItemList.h	2018-12-29 20:35:46.000000000 +0000
@@ -69,7 +69,7 @@
 };
 
 static const FieldItemList FILIST[]=
-{//don't forget to update count on entry
+{
 	{QList<quint16>()<<0x0BC8,QList<quint8>()<<0,QStringList()<<"mds7st1",QT_TRANSLATE_NOOP("FieldItems","Hi-Potion")},
 	{QList<quint16>()<<0x0BC8,QList<quint8>()<<1,QStringList()<<"mds7st1",QT_TRANSLATE_NOOP("FieldItems","Echo Screen")},
 	{QList<quint16>()<<0x0BC8,QList<quint8>()<<2,QStringList()<<"mds7st2",QT_TRANSLATE_NOOP("FieldItems","Potion")},
@@ -289,6 +289,10 @@
 	{QList<quint16>()<<0x0E3D,QList<quint8>()<<1,QStringList()<<"games_2",QT_TRANSLATE_NOOP("FieldItems","Cauldron")},
 	{QList<quint16>()<<0x0E3D,QList<quint8>()<<2,QStringList()<<"farm",QT_TRANSLATE_NOOP("FieldItems","Chocobo Lure")},
 
+	{QList<quint16>()<<0x0EA5,QList<quint8>()<<1,QStringList()<<"niv_ti2",QT_TRANSLATE_NOOP("FieldItems","Final Heaven (+other stuff?)")},
+	//{QList<quint16>()<<0x0EA5,QList<quint8>()<<2,QStringList()<<"niv_ti2",QT_TRANSLATE_NOOP("FieldItems","Played piano durring flashback")},
+	{QList<quint16>()<<0x0EA5,QList<quint8>()<<4,QStringList()<<"niv_ti2",QT_TRANSLATE_NOOP("FieldItems","Elemental(+other stuff?)")},
+
 	{QList<quint16>()<<0x0FA4,QList<quint8>()<<1,QStringList()<<"gaiin_4",QT_TRANSLATE_NOOP("FieldItems","Enhance Sword")},
 	{QList<quint16>()<<0x0FA4,QList<quint8>()<<2,QStringList()<<"gaiin_5",QT_TRANSLATE_NOOP("FieldItems","Fire Armlet")},
 	{QList<quint16>()<<0x0FA4,QList<quint8>()<<3,QStringList()<<"gaiin_3",QT_TRANSLATE_NOOP("FieldItems","Elixir")},
diff -Nru blackchocobo-1.9.900/ff7tk/data/FF7Save.cpp blackchocobo-1.9.910/ff7tk/data/FF7Save.cpp
--- blackchocobo-1.9.900/ff7tk/data/FF7Save.cpp	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/ff7tk/data/FF7Save.cpp	2018-12-29 20:35:46.000000000 +0000
@@ -2230,7 +2230,7 @@
 	setFileModified(true,s);
 }
 quint32 FF7Save::gil(int s){return slot[s].gil;}
-void FF7Save::setGil(int s,int gil)
+void FF7Save::setGil(int s,quint32 gil)
 {
 	if(gil<0){gil =0;}
 	slot[s].gil = gil;
@@ -4738,3 +4738,15 @@
 	}
 	return ratings;
 }
+bool FF7Save::playedPianoOnFlashback(int s)
+{
+	if(s<0 || s>14){return false;}
+	return ((slot[s].z_36[0])& (1<<2) );
+}
+void FF7Save::setPlayedPianoOnFlashback(int s,bool played)
+{
+	if(s<0 || s>14){return;}
+	if(played){slot[s].z_36[0] |= (1<<2);}
+	else {slot[s].z_36[0] &= ~(1<<2);}
+	setFileModified(true,s);
+}
diff -Nru blackchocobo-1.9.900/ff7tk/data/FF7Save.h blackchocobo-1.9.910/ff7tk/data/FF7Save.h
--- blackchocobo-1.9.900/ff7tk/data/FF7Save.h	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/ff7tk/data/FF7Save.h	2018-12-29 20:35:46.000000000 +0000
@@ -615,7 +615,7 @@
 	QString location(int s);// return save location string
 	void setLocation(int s, QString new_location);//set save location string to new_location
 	quint32 gil(int s);
-	void setGil(int s,int gil);
+    void setGil(int s,quint32 gil);
 	quint16 gp (int s);
 	void setGp(int s,int gp);
 	quint16 battles (int s);
@@ -947,6 +947,22 @@
 
 	bool subMiniGameVictory(int s);
 	void setSubMiniGameVictory(int s,bool won);
+
+	/**	\brief Did Cloud play piano durring the flashback?.
+	 *
+	 * \return True if the player played the piano durring the flashback
+	 * \param s slot number (0-14)
+	 */
+	bool playedPianoOnFlashback(int s);
+
+	/**	\brief Set if Cloud played piano durring the flashback.
+	 *
+	 * \param s slot number (0-14)
+	 * \param played True = Cloud Played piano
+	 */
+	void setPlayedPianoOnFlashback(int s,bool played);
+
+
 	/**	\brief Get Choco Billy's Rating of a chocobo.
 	 *
 	 * This is the rating that Choco Billy give to a chocobo it follows the same format as FF7Save::chocoboPen()
diff -Nru blackchocobo-1.9.900/ff7tk/widgets/CharEditor.cpp blackchocobo-1.9.910/ff7tk/widgets/CharEditor.cpp
--- blackchocobo-1.9.900/ff7tk/widgets/CharEditor.cpp	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/ff7tk/widgets/CharEditor.cpp	2018-12-29 20:35:46.000000000 +0000
@@ -16,25 +16,25 @@
 #include "CharEditor.h"
 //#include <QDebug>
 CharEditor::CharEditor(qreal Scale,QWidget *parent) : QWidget(parent)
+  , load(false)
+  , autolevel(true)
+  , autostatcalc(true)
+  , editable(true)
+  , advancedMode(false)
+  , mslotsel(-1)
+  , scale(Scale)
 {
-	scale = Scale;
 	init_display();
 	init_connections();
 	//auto level and auto stat calc are enabled by default.
 	//always check them when doing these actions.
-	autolevel=true;
-	autostatcalc=true;
-	load=false;
-	editable=true;
-	advancedMode=false;
-    mslotsel =-1;
 }
 
 void CharEditor::init_display()
 {
 
     lbl_avatar = new QLabel;
-	lbl_avatar->setFixedSize(86*scale,98*scale);
+    lbl_avatar->setFixedSize(int(86*scale),int(98*scale));
 	line_name = new QLineEdit;
 	line_name->setPlaceholderText(tr("Name"));
 	lbl_hp = new QLabel(tr("HP"));
@@ -80,8 +80,8 @@
 	bar_tnl = new QProgressBar;
 	bar_tnl->setMaximum(61);//strange indeed..
 	bar_tnl->setTextVisible(false);
-	bar_tnl->setFixedHeight(10*scale);
-	bar_tnl->setFixedWidth(61*scale);
+    bar_tnl->setFixedHeight(int(10*scale));
+    bar_tnl->setFixedWidth(int(61*scale));
 	lbl_level_next = new QLabel(tr("Next"));
 	sb_total_exp = new QSpinBox;
 	sb_total_exp->setPrefix(tr("Exp: "));
@@ -91,7 +91,7 @@
 
 	lbl_limit_bar = new QLabel (tr("Limit Bar"));
 	slider_limit = new QSlider;
-	slider_limit->setMaximumHeight(20*scale);
+    slider_limit->setMaximumHeight(int(20*scale));
 	slider_limit->setMaximum(255);
 	slider_limit->setOrientation(Qt::Horizontal);
 	lcd_limit_value = new QLCDNumber;
@@ -476,7 +476,7 @@
 	QLabel *lbl_0x34= new QLabel(QString(tr("0x34")));
 	lcd_0x34 = new QLCDNumber;
 	lcd_0x34->setDigitCount(2);
-	lcd_0x34->setFixedSize(32*scale,20*scale);
+    lcd_0x34->setFixedSize(int(32*scale), int(20*scale));
 	lcd_0x34->setHexMode();
 	lcd_0x34->setSegmentStyle(QLCDNumber::Flat);
 	QVBoxLayout *_0x34_layout = new QVBoxLayout;
@@ -488,7 +488,7 @@
 	QLabel *lbl_0x35= new QLabel(QString(tr("0x35")));
 	lcd_0x35 = new QLCDNumber;
 	lcd_0x35->setDigitCount(2);
-	lcd_0x35->setFixedSize(32*scale,20*scale);
+    lcd_0x35->setFixedSize(int (32*scale),int(20*scale));
 	lcd_0x35->setHexMode();
 	lcd_0x35->setSegmentStyle(QLCDNumber::Flat);
 	QVBoxLayout *_0x35_layout = new QVBoxLayout;
@@ -500,7 +500,7 @@
 	QLabel *lbl_0x36= new QLabel(QString(tr("0x36")));
 	lcd_0x36 = new QLCDNumber;
 	lcd_0x36->setDigitCount(2);
-	lcd_0x36->setFixedSize(32*scale,20*scale);
+    lcd_0x36->setFixedSize(int(32*scale),int(20*scale));
 	lcd_0x36->setHexMode();
 	lcd_0x36->setSegmentStyle(QLCDNumber::Flat);
 	QVBoxLayout *_0x36_layout = new QVBoxLayout;
@@ -512,7 +512,7 @@
 	QLabel *lbl_0x37= new QLabel(QString(tr("0x37")));
 	lcd_0x37 = new QLCDNumber;
 	lcd_0x37->setDigitCount(2);
-	lcd_0x37->setFixedSize(32*scale,20*scale);
+    lcd_0x37->setFixedSize(int(32*scale),int(20*scale));
 	lcd_0x37->setHexMode();
 
 	lcd_0x37->setSegmentStyle(QLCDNumber::Flat);
@@ -553,7 +553,7 @@
 	QVBoxLayout *lower_section = new QVBoxLayout;
 	lower_section->setContentsMargins(0,0,0,0);
 	lower_section->setSpacing(0);
-	lower_section->addLayout(stat_layout_2);
+    lower_section->addLayout(stat_layout_2);
 	lower_section->addLayout(limit_box);
 
 	QVBoxLayout *left_Final = new QVBoxLayout;
@@ -562,19 +562,21 @@
 	left_Final->addLayout(avatar_name_layout);
 	left_Final->addLayout(lower_section);
 	left_Final->addSpacerItem(new QSpacerItem(0,0,QSizePolicy::Preferred,QSizePolicy::MinimumExpanding));
-
+    QSize iconSize = QSize(fontMetrics().height(),fontMetrics().height());
 	weapon_selection = new QComboBox;
-
+    weapon_selection->setIconSize(iconSize);
 
 	armor_selection = new QComboBox;
+    armor_selection->setIconSize(iconSize);
     for(int i=256;i<288;i++){armor_selection->addItem(QPixmap::fromImage(Items.image(i)),Items.name(i));}
 
 	accessory_selection = new QComboBox;
+    accessory_selection->setIconSize(iconSize);
 
 	for(int i=288;i<320;i++){accessory_selection->addItem(QPixmap::fromImage(Items.image(i)),Items.name(i));}
 	accessory_selection->addItem(QPixmap::fromImage(Items.image(288)),tr("-NONE-"));
 	materia_edit  = new MateriaEditor(scale,this);
-	materia_edit->setStarsSize(32*scale);
+    materia_edit->setStarsSize(int(32*scale));
 
 	elemental_effects = new QListWidget();
 	QHBoxLayout *elemental = new QHBoxLayout();
@@ -623,9 +625,11 @@
 	//I Like the No Growth Slots They Look Better so i always use them
 	// you can use FF7Item::Style_m_grow_slot() to get the style of that slot
 
+    QSize slotSize = QSize(int(32*scale), int(32*scale));
+    QSize linkSize = QSize(int(12*scale), int(16*scale));
 	weapon_slot_1 = new QPushButton();
-	weapon_slot_1->setFixedSize(32*scale,32*scale);
-	weapon_slot_1->setIconSize(QSize(32*scale,32*scale));
+    weapon_slot_1->setFixedSize(slotSize);
+    weapon_slot_1->setIconSize(QSize(slotSize));
 	weapon_slot_1->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	weapon_slot_1->setHidden(1);
 
@@ -634,17 +638,17 @@
 	weapon_slot_1_layout->addWidget(weapon_slot_1);
 
 	weapon_frm_1 = new QFrame;
-	weapon_frm_1->setFixedSize(32*scale,32*scale);
+    weapon_frm_1->setFixedSize(slotSize);
 	weapon_frm_1->setFrameShape(QFrame::NoFrame);
 	weapon_frm_1->setFrameShadow(QFrame::Plain);
 	weapon_frm_1->setLayout(weapon_slot_1_layout);
 
 	weapon_m_link_1= new QLabel();
-	weapon_m_link_1->setFixedSize(12*scale,16*scale);
+    weapon_m_link_1->setFixedSize(linkSize);
 
 	weapon_slot_2 = new QPushButton();
-	weapon_slot_2->setFixedSize(32*scale,32*scale);
-	weapon_slot_2->setIconSize(QSize(32*scale,32*scale));
+    weapon_slot_2->setFixedSize(slotSize);
+    weapon_slot_2->setIconSize(QSize(slotSize));
 	weapon_slot_2->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	weapon_slot_2->setHidden(1);
 
@@ -653,7 +657,7 @@
 	weapon_slot_2_layout->addWidget(weapon_slot_2);
 
 	weapon_frm_2 = new QFrame;
-	weapon_frm_2->setFixedSize(32*scale,32*scale);
+    weapon_frm_2->setFixedSize(slotSize);
 	weapon_frm_2->setFrameShape(QFrame::NoFrame);
 	weapon_frm_2->setFrameShadow(QFrame::Plain);
 	weapon_frm_2->setLayout(weapon_slot_2_layout);
@@ -666,10 +670,10 @@
 	weapon_slots_1_and_2->setSpacing(0);
 
 	weapon_slot_3 = new QPushButton();
-	weapon_slot_3->setFixedSize(32*scale,32*scale);
+    weapon_slot_3->setFixedSize(slotSize);
 	weapon_slot_3->setFlat(true);
 	weapon_slot_3->setAutoFillBackground(true);
-	weapon_slot_3->setIconSize(QSize(32*scale,32*scale));
+    weapon_slot_3->setIconSize(QSize(slotSize));
 	weapon_slot_3->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	weapon_slot_3->setHidden(1);
 
@@ -678,20 +682,20 @@
 	weapon_slot_3_layout->addWidget(weapon_slot_3);
 
 	weapon_frm_3 = new QFrame;
-	weapon_frm_3->setFixedSize(32*scale,32*scale);
+    weapon_frm_3->setFixedSize(slotSize);
 	weapon_frm_3->setFrameShape(QFrame::NoFrame);
 	weapon_frm_3->setFrameShadow(QFrame::Plain);
 	weapon_frm_3->setLayout(weapon_slot_3_layout);
 
 	weapon_m_link_2 = new QLabel();
-	weapon_m_link_2->setFixedSize(12*scale,16*scale);
+    weapon_m_link_2->setFixedSize(linkSize);
 
 	weapon_slot_4 = new QPushButton();
-	weapon_slot_4->setFixedSize(32*scale,32*scale);
+    weapon_slot_4->setFixedSize(slotSize);
 	weapon_slot_1->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	weapon_slot_4->setFlat(true);
 	weapon_slot_4->setAutoFillBackground(true);
-	weapon_slot_4->setIconSize(QSize(32*scale,32*scale));
+    weapon_slot_4->setIconSize(QSize(slotSize));
 	weapon_slot_4->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	weapon_slot_4->setHidden(1);
 
@@ -700,7 +704,7 @@
 	weapon_slot_4_layout->addWidget(weapon_slot_4);
 
 	weapon_frm_4 = new QFrame;
-	weapon_frm_4->setFixedSize(32*scale,32*scale);
+    weapon_frm_4->setFixedSize(slotSize);
 	weapon_frm_4->setFrameShape(QFrame::NoFrame);
 	weapon_frm_4->setFrameShadow(QFrame::Plain);
 	weapon_frm_4->setLayout(weapon_slot_4_layout);
@@ -713,10 +717,10 @@
 	weapon_slots_3_and_4->setSpacing(0);
 
 	weapon_slot_5 = new QPushButton();
-	weapon_slot_5->setFixedSize(32*scale,32*scale);
+    weapon_slot_5->setFixedSize(slotSize);
 	weapon_slot_5->setFlat(true);
 	weapon_slot_5->setAutoFillBackground(true);
-	weapon_slot_5->setIconSize(QSize(32*scale,32*scale));
+    weapon_slot_5->setIconSize(QSize(slotSize));
 	weapon_slot_5->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	weapon_slot_5->setHidden(1);
 
@@ -725,19 +729,19 @@
 	weapon_slot_5_layout->addWidget(weapon_slot_5);
 
 	weapon_frm_5 = new QFrame;
-	weapon_frm_5->setFixedSize(32*scale,32*scale);
+    weapon_frm_5->setFixedSize(slotSize);
 	weapon_frm_5->setFrameShape(QFrame::NoFrame);
 	weapon_frm_5->setFrameShadow(QFrame::Plain);
 	weapon_frm_5->setLayout(weapon_slot_5_layout);
 
 	weapon_m_link_3 = new QLabel();
-	weapon_m_link_3->setFixedSize(12*scale,16*scale);
+    weapon_m_link_3->setFixedSize(linkSize);
 
 	weapon_slot_6 = new QPushButton();
-	weapon_slot_6->setFixedSize(32*scale,32*scale);
+    weapon_slot_6->setFixedSize(slotSize);
 	weapon_slot_6->setFlat(true);
 	weapon_slot_6->setAutoFillBackground(true);
-	weapon_slot_6->setIconSize(QSize(32*scale,32*scale));
+    weapon_slot_6->setIconSize(QSize(slotSize));
 	weapon_slot_6->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	weapon_slot_6->setHidden(1);
 
@@ -746,7 +750,7 @@
 	weapon_slot_6_layout->addWidget(weapon_slot_6);
 
 	weapon_frm_6 = new QFrame;
-	weapon_frm_6->setFixedSize(32*scale,32*scale);
+    weapon_frm_6->setFixedSize(slotSize);
 	weapon_frm_6->setFrameShape(QFrame::NoFrame);
 	weapon_frm_6->setFrameShadow(QFrame::Plain);
 	weapon_frm_6->setLayout(weapon_slot_6_layout);
@@ -759,10 +763,10 @@
 	weapon_slots_5_and_6->setSpacing(0);
 
 	weapon_slot_7 = new QPushButton();
-	weapon_slot_7->setFixedSize(32*scale,32*scale);
+    weapon_slot_7->setFixedSize(slotSize);
 	weapon_slot_7->setFlat(true);
 	weapon_slot_7->setAutoFillBackground(true);
-	weapon_slot_7->setIconSize(QSize(32*scale,32*scale));
+    weapon_slot_7->setIconSize(QSize(slotSize));
 	weapon_slot_7->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	weapon_slot_7->setHidden(1);
 
@@ -771,19 +775,19 @@
 	weapon_slot_7_layout->addWidget(weapon_slot_7);
 
 	weapon_frm_7 = new QFrame;
-	weapon_frm_7->setFixedSize(32*scale,32*scale);
+    weapon_frm_7->setFixedSize(slotSize);
 	weapon_frm_7->setFrameShape(QFrame::NoFrame);
 	weapon_frm_7->setFrameShadow(QFrame::Plain);
 	weapon_frm_7->setLayout(weapon_slot_7_layout);
 
 	weapon_m_link_4 = new QLabel();
-	weapon_m_link_4->setFixedSize(12*scale,16*scale);
+    weapon_m_link_4->setFixedSize(linkSize);
 
 	weapon_slot_8 = new QPushButton();
-	weapon_slot_8->setFixedSize(32*scale,32*scale);
+    weapon_slot_8->setFixedSize(slotSize);
 	weapon_slot_8->setFlat(true);
 	weapon_slot_8->setAutoFillBackground(true);
-	weapon_slot_8->setIconSize(QSize(32*scale,32*scale));
+    weapon_slot_8->setIconSize(QSize(slotSize));
 	weapon_slot_8->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	weapon_slot_8->setHidden(1);
 
@@ -792,7 +796,7 @@
 	weapon_slot_8_layout->addWidget(weapon_slot_8);
 
 	weapon_frm_8 = new QFrame;
-	weapon_frm_8->setFixedSize(32*scale,32*scale);
+    weapon_frm_8->setFixedSize(slotSize);
 	weapon_frm_8->setFrameShape(QFrame::NoFrame);
 	weapon_frm_8->setFrameShadow(QFrame::Plain);
 	weapon_frm_8->setLayout(weapon_slot_8_layout);
@@ -836,8 +840,8 @@
 	// you can use FF7Item::Style_m_grow_slot() to get the style of that slot
 
 	armor_slot_1 = new QPushButton();
-	armor_slot_1->setFixedSize(32*scale,32*scale);
-	armor_slot_1->setIconSize(QSize(32*scale,32*scale));
+    armor_slot_1->setFixedSize(slotSize);
+    armor_slot_1->setIconSize(QSize(slotSize));
 	armor_slot_1->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	armor_slot_1->setHidden(1);
 
@@ -846,17 +850,17 @@
 	armor_slot_1_layout->addWidget(armor_slot_1);
 
 	armor_frm_1 = new QFrame;
-	armor_frm_1->setFixedSize(32*scale,32*scale);
+    armor_frm_1->setFixedSize(slotSize);
 	armor_frm_1->setFrameShape(QFrame::NoFrame);
 	armor_frm_1->setFrameShadow(QFrame::Plain);
 	armor_frm_1->setLayout(armor_slot_1_layout);
 
 	armor_m_link_1= new QLabel();
-	armor_m_link_1->setFixedSize(12*scale,16*scale);
+    armor_m_link_1->setFixedSize(linkSize);
 
 	armor_slot_2 = new QPushButton();
-	armor_slot_2->setFixedSize(32*scale,32*scale);
-	armor_slot_2->setIconSize(QSize(32*scale,32*scale));
+    armor_slot_2->setFixedSize(slotSize);
+    armor_slot_2->setIconSize(QSize(slotSize));
 	armor_slot_2->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	armor_slot_2->setHidden(1);
 
@@ -865,7 +869,7 @@
 	armor_slot_2_layout->addWidget(armor_slot_2);
 
 	armor_frm_2 = new QFrame;
-	armor_frm_2->setFixedSize(32*scale,32*scale);
+    armor_frm_2->setFixedSize(slotSize);
 	armor_frm_2->setFrameShape(QFrame::NoFrame);
 	armor_frm_2->setFrameShadow(QFrame::Plain);
 	armor_frm_2->setLayout(armor_slot_2_layout);
@@ -878,10 +882,10 @@
 	armor_slots_1_and_2->setSpacing(0);
 
 	armor_slot_3 = new QPushButton();
-	armor_slot_3->setFixedSize(32*scale,32*scale);
+    armor_slot_3->setFixedSize(slotSize);
 	armor_slot_3->setFlat(true);
 	armor_slot_3->setAutoFillBackground(true);
-	armor_slot_3->setIconSize(QSize(32*scale,32*scale));
+    armor_slot_3->setIconSize(QSize(slotSize));
 	armor_slot_3->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	armor_slot_3->setHidden(1);
 
@@ -890,21 +894,21 @@
 	armor_slot_3_layout->addWidget(armor_slot_3);
 
 	armor_frm_3 = new QFrame;
-	armor_frm_3->setFixedSize(32*scale,32*scale);
+    armor_frm_3->setFixedSize(slotSize);
 	armor_frm_3->setFrameShape(QFrame::NoFrame);
 	armor_frm_3->setFrameShadow(QFrame::Plain);
 	armor_frm_3->setLayout(armor_slot_3_layout);
 
 	armor_m_link_2 = new QLabel();
-	armor_m_link_2->setFixedSize(12*scale,16*scale);
+    armor_m_link_2->setFixedSize(linkSize);
 	armor_m_link_2->setScaledContents(1);
 
 	armor_slot_4 = new QPushButton();
-	armor_slot_4->setFixedSize(32*scale,32*scale);
+    armor_slot_4->setFixedSize(slotSize);
 	armor_slot_1->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	armor_slot_4->setFlat(true);
 	armor_slot_4->setAutoFillBackground(true);
-	armor_slot_4->setIconSize(QSize(32*scale,32*scale));
+    armor_slot_4->setIconSize(QSize(slotSize));
 	armor_slot_4->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	armor_slot_4->setHidden(1);
 
@@ -913,7 +917,7 @@
 	armor_slot_4_layout->addWidget(armor_slot_4);
 
 	armor_frm_4 = new QFrame;
-	armor_frm_4->setFixedSize(32*scale,32*scale);
+    armor_frm_4->setFixedSize(slotSize);
 	armor_frm_4->setFrameShape(QFrame::NoFrame);
 	armor_frm_4->setFrameShadow(QFrame::Plain);
 	armor_frm_4->setLayout(armor_slot_4_layout);
@@ -926,10 +930,10 @@
 	armor_slots_3_and_4->setSpacing(0);
 
 	armor_slot_5 = new QPushButton();
-	armor_slot_5->setFixedSize(32*scale,32*scale);
+    armor_slot_5->setFixedSize(slotSize);
 	armor_slot_5->setFlat(true);
 	armor_slot_5->setAutoFillBackground(true);
-	armor_slot_5->setIconSize(QSize(32*scale,32*scale));
+    armor_slot_5->setIconSize(QSize(slotSize));
 	armor_slot_5->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	armor_slot_5->setHidden(1);
 
@@ -938,20 +942,20 @@
 	armor_slot_5_layout->addWidget(armor_slot_5);
 
 	armor_frm_5 = new QFrame;
-	armor_frm_5->setFixedSize(32*scale,32*scale);
+    armor_frm_5->setFixedSize(slotSize);
 	armor_frm_5->setFrameShape(QFrame::NoFrame);
 	armor_frm_5->setFrameShadow(QFrame::Plain);
 	armor_frm_5->setLayout(armor_slot_5_layout);
 
 	armor_m_link_3 = new QLabel();
-	armor_m_link_3->setFixedSize(12*scale,16*scale);
+    armor_m_link_3->setFixedSize(linkSize);
 	armor_m_link_3->setScaledContents(1);
 
 	armor_slot_6 = new QPushButton();
-	armor_slot_6->setFixedSize(32*scale,32*scale);
+    armor_slot_6->setFixedSize(slotSize);
 	armor_slot_6->setFlat(true);
 	armor_slot_6->setAutoFillBackground(true);
-	armor_slot_6->setIconSize(QSize(32*scale,32*scale));
+    armor_slot_6->setIconSize(QSize(slotSize));
 	armor_slot_6->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	armor_slot_6->setHidden(1);
 
@@ -960,7 +964,7 @@
 	armor_slot_6_layout->addWidget(armor_slot_6);
 
 	armor_frm_6 = new QFrame;
-	armor_frm_6->setFixedSize(32*scale,32*scale);
+    armor_frm_6->setFixedSize(slotSize);
 	armor_frm_6->setFrameShape(QFrame::NoFrame);
 	armor_frm_6->setFrameShadow(QFrame::Plain);
 	armor_frm_6->setLayout(armor_slot_6_layout);
@@ -973,10 +977,10 @@
 	armor_slots_5_and_6->setSpacing(0);
 
 	armor_slot_7 = new QPushButton();
-	armor_slot_7->setFixedSize(32*scale,32*scale);
+    armor_slot_7->setFixedSize(slotSize);
 	armor_slot_7->setFlat(true);
 	armor_slot_7->setAutoFillBackground(true);
-	armor_slot_7->setIconSize(QSize(32*scale,32*scale));
+    armor_slot_7->setIconSize(QSize(slotSize));
 	armor_slot_7->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	armor_slot_7->setHidden(1);
 
@@ -985,20 +989,20 @@
 	armor_slot_7_layout->addWidget(armor_slot_7);
 
 	armor_frm_7 = new QFrame;
-	armor_frm_7->setFixedSize(32*scale,32*scale);
+    armor_frm_7->setFixedSize(slotSize);
 	armor_frm_7->setFrameShape(QFrame::NoFrame);
 	armor_frm_7->setFrameShadow(QFrame::Plain);
 	armor_frm_7->setLayout(armor_slot_7_layout);
 
 	armor_m_link_4 = new QLabel();
-	armor_m_link_4->setFixedSize(12*scale,16*scale);
+    armor_m_link_4->setFixedSize(linkSize);
 	armor_m_link_4->setScaledContents(1);
 
 	armor_slot_8 = new QPushButton();
-	armor_slot_8->setFixedSize(32*scale,32*scale);
+    armor_slot_8->setFixedSize(slotSize);
 	armor_slot_8->setFlat(true);
 	armor_slot_8->setAutoFillBackground(true);
-	armor_slot_8->setIconSize(QSize(32*scale,32*scale));
+    armor_slot_8->setIconSize(QSize(slotSize));
 	armor_slot_8->setStyleSheet(Items.styleMateriaSlotNoGrowth());
 	armor_slot_8->setHidden(1);
 
@@ -1007,7 +1011,7 @@
 	armor_slot_8_layout->addWidget(armor_slot_8);
 
 	armor_frm_8 = new QFrame;
-	armor_frm_8->setFixedSize(32*scale,32*scale);
+    armor_frm_8->setFixedSize(slotSize);
 	armor_frm_8->setFrameShape(QFrame::NoFrame);
 	armor_frm_8->setFrameShadow(QFrame::Plain);
 	armor_frm_8->setLayout(armor_slot_8_layout);
@@ -1059,7 +1063,7 @@
 	QVBoxLayout *right_bottom = new QVBoxLayout;
 	right_bottom->setContentsMargins(0,0,0,0);
 	right_bottom->addWidget(materia_edit);
-	right_bottom->addLayout(effects_layout);
+    right_bottom->addLayout(effects_layout);
 
 	QVBoxLayout *right_Final = new QVBoxLayout;
 	right_Final->setContentsMargins(3,0,3,0);
@@ -1067,23 +1071,23 @@
 	right_Final->setSpacing(3);
 	right_Final->addLayout(right_bottom);
 
-	toolbox = new QToolBox;
+    toolbox = new QToolBox;
 
-	QFrame *tabStatus = new QFrame;
-	tabStatus->setLayout(left_Final);
-	tabStatus->adjustSize();
-	toolbox->addItem(tabStatus,Chars.icon(0),QString(tr("Status Info")));
-
-	QFrame *tabEquipment = new QFrame;
-	tabEquipment->setLayout(right_Final);
-	tabEquipment->adjustSize();
-	toolbox->addItem(tabEquipment,QIcon(QPixmap::fromImage(Items.image(256))),QString(tr("Equipment")));
-
-	QVBoxLayout *toolbox_layout = new QVBoxLayout;
-	toolbox_layout->setContentsMargins(0,0,0,0);
-	toolbox_layout->addWidget(toolbox);
+    QFrame *tabStatus = new QFrame;
+    tabStatus->setLayout(left_Final);
+    tabStatus->adjustSize();
+    toolbox->addItem(tabStatus,Chars.icon(0),QString(tr("Status Info")));
+
+    QFrame *tabEquipment = new QFrame;
+    tabEquipment->setLayout(right_Final);
+    tabEquipment->adjustSize();
+    toolbox->addItem(tabEquipment,QIcon(QPixmap::fromImage(Items.image(256))),QString(tr("Equipment")));
+
+    QVBoxLayout *toolbox_layout = new QVBoxLayout;
+    toolbox_layout->setContentsMargins(0,0,0,0);
+    toolbox_layout->addWidget(toolbox);
 
-	this->setLayout(toolbox_layout);
+    this->setLayout(toolbox_layout);
 }
 void CharEditor::setToolBoxStyle(QString stylesheet){toolbox->setStyleSheet(stylesheet);}
 void CharEditor::setMateriaHoverStyle(QString hoverColor){materia_edit->setHoverStyle(hoverColor);}
@@ -1205,8 +1209,8 @@
 	disconnect(materia_edit,SIGNAL(ap_changed(qint32)),this,SLOT(matAp_changed(qint32)));
 	disconnect(materia_edit,SIGNAL(id_changed(qint8)),this,SLOT(matId_changed(qint8)));
 }
-qint8 CharEditor::id(){return data.id;}
-qint8 CharEditor::level(){return data.level;}
+quint8 CharEditor::id(){return data.id;}
+quint8 CharEditor::level(){return data.level;}
 quint8 CharEditor::str(){return data.strength;}
 quint8 CharEditor::vit(){return data.vitality;}
 quint8 CharEditor::mag(){return data.magic;}
@@ -2363,39 +2367,39 @@
 	armor_m_link_4->setStyleSheet(QString("background-color:rgba(0,0,0,0);"));
 
 	 //fill the slots.
-
-	 if(data.materias[0].id!=FF7Materia::EmptyId){weapon_slot_1->setIcon(QIcon(Materias.pixmap(data.materias[0].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_1->setIcon(QIcon(QString("")));}
-	 if(data.materias[0].id!=FF7Materia::EmptyId){weapon_slot_1->setToolTip(Materias.name(data.materias[0].id));}else{weapon_slot_1->setToolTip(QString(tr("-Empty-")));}
-	 if(data.materias[1].id!=FF7Materia::EmptyId){weapon_slot_2->setIcon(QIcon(Materias.pixmap(data.materias[1].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_2->setIcon(QIcon(QString("")));}
-	 if(data.materias[1].id!=FF7Materia::EmptyId){weapon_slot_2->setToolTip(Materias.name(data.materias[1].id));}else{weapon_slot_2->setToolTip(QString(tr("-Empty-")));}
-	 if(data.materias[2].id!=FF7Materia::EmptyId){weapon_slot_3->setIcon(QIcon(Materias.pixmap(data.materias[2].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_3->setIcon(QIcon(QString("")));}
-	 if(data.materias[2].id!=FF7Materia::EmptyId){weapon_slot_3->setToolTip(Materias.name(data.materias[2].id));}else{weapon_slot_3->setToolTip(QString(tr("-Empty-")));}
-	 if(data.materias[3].id!=FF7Materia::EmptyId){weapon_slot_4->setIcon(QIcon(Materias.pixmap(data.materias[3].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_4->setIcon(QIcon(QString("")));}
-	 if(data.materias[3].id!=FF7Materia::EmptyId){weapon_slot_4->setToolTip(Materias.name(data.materias[3].id));}else{weapon_slot_4->setToolTip(QString(tr("-Empty-")));}
-	 if(data.materias[4].id!=FF7Materia::EmptyId){weapon_slot_5->setIcon(QIcon(Materias.pixmap(data.materias[4].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_5->setIcon(QIcon(QString("")));}
-	 if(data.materias[4].id!=FF7Materia::EmptyId){weapon_slot_5->setToolTip(Materias.name(data.materias[4].id));}else{weapon_slot_5->setToolTip(QString(tr("-Empty-")));}
-	 if(data.materias[5].id!=FF7Materia::EmptyId){weapon_slot_6->setIcon(QIcon(Materias.pixmap(data.materias[5].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_6->setIcon(QIcon(QString("")));}
-	 if(data.materias[5].id!=FF7Materia::EmptyId){weapon_slot_6->setToolTip(Materias.name(data.materias[5].id));}else{weapon_slot_6->setToolTip(QString(tr("-Empty-")));}
-	 if(data.materias[6].id!=FF7Materia::EmptyId){weapon_slot_7->setIcon(QIcon(Materias.pixmap(data.materias[6].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_7->setIcon(QIcon(QString("")));}
-	 if(data.materias[6].id!=FF7Materia::EmptyId){weapon_slot_7->setToolTip(Materias.name(data.materias[6].id));}else{weapon_slot_7->setToolTip(QString(tr("-Empty-")));}
-	 if(data.materias[7].id!=FF7Materia::EmptyId){weapon_slot_8->setIcon(QIcon(Materias.pixmap(data.materias[7].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_8->setIcon(QIcon(QString("")));}
-	 if(data.materias[7].id!=FF7Materia::EmptyId){weapon_slot_8->setToolTip(Materias.name(data.materias[7].id));}else{weapon_slot_8->setToolTip(QString(tr("-Empty-")));}
-	 if(data.materias[8].id!=FF7Materia::EmptyId){armor_slot_1->setIcon(QIcon(Materias.pixmap(data.materias[8].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_1->setIcon(QIcon(QString("")));}
-	 if(data.materias[8].id!=FF7Materia::EmptyId){armor_slot_1->setToolTip(Materias.name(data.materias[8].id));}else{armor_slot_1->setToolTip(QString(tr("-Empty-")));}
-	 if(data.materias[9].id!=FF7Materia::EmptyId){armor_slot_2->setIcon(QIcon(Materias.pixmap(data.materias[9].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_2->setIcon(QIcon(QString("")));}
-	 if(data.materias[9].id!=FF7Materia::EmptyId){armor_slot_2->setToolTip(Materias.name(data.materias[9].id));}else{armor_slot_2->setToolTip(QString(tr("-Empty-")));}
-	 if(data.materias[10].id!=FF7Materia::EmptyId){armor_slot_3->setIcon(QIcon(Materias.pixmap(data.materias[10].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_3->setIcon(QIcon(QString("")));}
-	 if(data.materias[10].id!=FF7Materia::EmptyId){armor_slot_3->setToolTip(Materias.name(data.materias[10].id));}else{armor_slot_3->setToolTip(QString(tr("-Empty-")));}
-	 if(data.materias[11].id!=FF7Materia::EmptyId){armor_slot_4->setIcon(QIcon(Materias.pixmap(data.materias[11].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_4->setIcon(QIcon(QString("")));}
-	 if(data.materias[11].id!=FF7Materia::EmptyId){armor_slot_4->setToolTip(Materias.name(data.materias[11].id));}else{armor_slot_4->setToolTip(QString(tr("-Empty-")));}
-	 if(data.materias[12].id!=FF7Materia::EmptyId){armor_slot_5->setIcon(QIcon(Materias.pixmap(data.materias[12].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_5->setIcon(QIcon(QString("")));}
-	 if(data.materias[12].id!=FF7Materia::EmptyId){armor_slot_5->setToolTip(Materias.name(data.materias[12].id));}else{armor_slot_5->setToolTip(QString(tr("-Empty-")));}
-	 if(data.materias[13].id!=FF7Materia::EmptyId){armor_slot_6->setIcon(QIcon(Materias.pixmap(data.materias[13].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_6->setIcon(QIcon(QString("")));}
-	 if(data.materias[13].id!=FF7Materia::EmptyId){armor_slot_6->setToolTip(Materias.name(data.materias[13].id));}else{armor_slot_6->setToolTip(QString(tr("-Empty-")));}
-	 if(data.materias[14].id!=FF7Materia::EmptyId){armor_slot_7->setIcon(QIcon(Materias.pixmap(data.materias[14].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_7->setIcon(QIcon(QString("")));}
-	 if(data.materias[14].id!=FF7Materia::EmptyId){armor_slot_7->setToolTip(Materias.name(data.materias[14].id));}else{armor_slot_7->setToolTip(QString(tr("-Empty-")));}
-	 if(data.materias[15].id!=FF7Materia::EmptyId){armor_slot_8->setIcon(QIcon(Materias.pixmap(data.materias[15].id).scaled(24*scale,24*scale,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_8->setIcon(QIcon(QString("")));}
-	 if(data.materias[15].id!=FF7Materia::EmptyId){armor_slot_8->setToolTip(Materias.name(data.materias[15].id));}else{armor_slot_8->setToolTip(QString(tr("-Empty-")));}
+    QSize isize = QSize(int(24*scale), int(24*scale));
+    if(data.materias[0].id!=FF7Materia::EmptyId){weapon_slot_1->setIcon(QIcon(Materias.pixmap(data.materias[0].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_1->setIcon(QIcon(QString("")));}
+    if(data.materias[0].id!=FF7Materia::EmptyId){weapon_slot_1->setToolTip(Materias.name(data.materias[0].id));}else{weapon_slot_1->setToolTip(QString(tr("-Empty-")));}
+    if(data.materias[1].id!=FF7Materia::EmptyId){weapon_slot_2->setIcon(QIcon(Materias.pixmap(data.materias[1].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_2->setIcon(QIcon(QString("")));}
+    if(data.materias[1].id!=FF7Materia::EmptyId){weapon_slot_2->setToolTip(Materias.name(data.materias[1].id));}else{weapon_slot_2->setToolTip(QString(tr("-Empty-")));}
+    if(data.materias[2].id!=FF7Materia::EmptyId){weapon_slot_3->setIcon(QIcon(Materias.pixmap(data.materias[2].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_3->setIcon(QIcon(QString("")));}
+    if(data.materias[2].id!=FF7Materia::EmptyId){weapon_slot_3->setToolTip(Materias.name(data.materias[2].id));}else{weapon_slot_3->setToolTip(QString(tr("-Empty-")));}
+    if(data.materias[3].id!=FF7Materia::EmptyId){weapon_slot_4->setIcon(QIcon(Materias.pixmap(data.materias[3].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_4->setIcon(QIcon(QString("")));}
+    if(data.materias[3].id!=FF7Materia::EmptyId){weapon_slot_4->setToolTip(Materias.name(data.materias[3].id));}else{weapon_slot_4->setToolTip(QString(tr("-Empty-")));}
+    if(data.materias[4].id!=FF7Materia::EmptyId){weapon_slot_5->setIcon(QIcon(Materias.pixmap(data.materias[4].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_5->setIcon(QIcon(QString("")));}
+    if(data.materias[4].id!=FF7Materia::EmptyId){weapon_slot_5->setToolTip(Materias.name(data.materias[4].id));}else{weapon_slot_5->setToolTip(QString(tr("-Empty-")));}
+    if(data.materias[5].id!=FF7Materia::EmptyId){weapon_slot_6->setIcon(QIcon(Materias.pixmap(data.materias[5].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_6->setIcon(QIcon(QString("")));}
+    if(data.materias[5].id!=FF7Materia::EmptyId){weapon_slot_6->setToolTip(Materias.name(data.materias[5].id));}else{weapon_slot_6->setToolTip(QString(tr("-Empty-")));}
+    if(data.materias[6].id!=FF7Materia::EmptyId){weapon_slot_7->setIcon(QIcon(Materias.pixmap(data.materias[6].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_7->setIcon(QIcon(QString("")));}
+    if(data.materias[6].id!=FF7Materia::EmptyId){weapon_slot_7->setToolTip(Materias.name(data.materias[6].id));}else{weapon_slot_7->setToolTip(QString(tr("-Empty-")));}
+    if(data.materias[7].id!=FF7Materia::EmptyId){weapon_slot_8->setIcon(QIcon(Materias.pixmap(data.materias[7].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{weapon_slot_8->setIcon(QIcon(QString("")));}
+    if(data.materias[7].id!=FF7Materia::EmptyId){weapon_slot_8->setToolTip(Materias.name(data.materias[7].id));}else{weapon_slot_8->setToolTip(QString(tr("-Empty-")));}
+    if(data.materias[8].id!=FF7Materia::EmptyId){armor_slot_1->setIcon(QIcon(Materias.pixmap(data.materias[8].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_1->setIcon(QIcon(QString("")));}
+    if(data.materias[8].id!=FF7Materia::EmptyId){armor_slot_1->setToolTip(Materias.name(data.materias[8].id));}else{armor_slot_1->setToolTip(QString(tr("-Empty-")));}
+    if(data.materias[9].id!=FF7Materia::EmptyId){armor_slot_2->setIcon(QIcon(Materias.pixmap(data.materias[9].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_2->setIcon(QIcon(QString("")));}
+    if(data.materias[9].id!=FF7Materia::EmptyId){armor_slot_2->setToolTip(Materias.name(data.materias[9].id));}else{armor_slot_2->setToolTip(QString(tr("-Empty-")));}
+    if(data.materias[10].id!=FF7Materia::EmptyId){armor_slot_3->setIcon(QIcon(Materias.pixmap(data.materias[10].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_3->setIcon(QIcon(QString("")));}
+    if(data.materias[10].id!=FF7Materia::EmptyId){armor_slot_3->setToolTip(Materias.name(data.materias[10].id));}else{armor_slot_3->setToolTip(QString(tr("-Empty-")));}
+    if(data.materias[11].id!=FF7Materia::EmptyId){armor_slot_4->setIcon(QIcon(Materias.pixmap(data.materias[11].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_4->setIcon(QIcon(QString("")));}
+    if(data.materias[11].id!=FF7Materia::EmptyId){armor_slot_4->setToolTip(Materias.name(data.materias[11].id));}else{armor_slot_4->setToolTip(QString(tr("-Empty-")));}
+    if(data.materias[12].id!=FF7Materia::EmptyId){armor_slot_5->setIcon(QIcon(Materias.pixmap(data.materias[12].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_5->setIcon(QIcon(QString("")));}
+    if(data.materias[12].id!=FF7Materia::EmptyId){armor_slot_5->setToolTip(Materias.name(data.materias[12].id));}else{armor_slot_5->setToolTip(QString(tr("-Empty-")));}
+    if(data.materias[13].id!=FF7Materia::EmptyId){armor_slot_6->setIcon(QIcon(Materias.pixmap(data.materias[13].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_6->setIcon(QIcon(QString("")));}
+    if(data.materias[13].id!=FF7Materia::EmptyId){armor_slot_6->setToolTip(Materias.name(data.materias[13].id));}else{armor_slot_6->setToolTip(QString(tr("-Empty-")));}
+    if(data.materias[14].id!=FF7Materia::EmptyId){armor_slot_7->setIcon(QIcon(Materias.pixmap(data.materias[14].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_7->setIcon(QIcon(QString("")));}
+    if(data.materias[14].id!=FF7Materia::EmptyId){armor_slot_7->setToolTip(Materias.name(data.materias[14].id));}else{armor_slot_7->setToolTip(QString(tr("-Empty-")));}
+    if(data.materias[15].id!=FF7Materia::EmptyId){armor_slot_8->setIcon(QIcon(Materias.pixmap(data.materias[15].id).scaled(isize,Qt::KeepAspectRatio,Qt::SmoothTransformation)));}else{armor_slot_8->setIcon(QIcon(QString("")));}
+    if(data.materias[15].id!=FF7Materia::EmptyId){armor_slot_8->setToolTip(Materias.name(data.materias[15].id));}else{armor_slot_8->setToolTip(QString(tr("-Empty-")));}
 
 	 //set up weapon
 	 QString ap_rate =tr("AP:x%1").arg(Items.materiaGrowthRate(data.weapon +128));
diff -Nru blackchocobo-1.9.900/ff7tk/widgets/CharEditor.h blackchocobo-1.9.910/ff7tk/widgets/CharEditor.h
--- blackchocobo-1.9.900/ff7tk/widgets/CharEditor.h	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/ff7tk/widgets/CharEditor.h	2018-12-29 20:35:46.000000000 +0000
@@ -47,8 +47,8 @@
 	void setSliderStyle(QString style);
 	void MaxStats();
 	void MaxEquip();
-	qint8 id();
-	qint8 level();
+    quint8 id();
+    quint8 level();
 	quint8 str();
 	quint8 vit();
 	quint8 mag();
diff -Nru blackchocobo-1.9.900/ff7tk/widgets/ChocoboEditor.cpp blackchocobo-1.9.910/ff7tk/widgets/ChocoboEditor.cpp
--- blackchocobo-1.9.900/ff7tk/widgets/ChocoboEditor.cpp	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/ff7tk/widgets/ChocoboEditor.cpp	2018-12-29 20:35:46.000000000 +0000
@@ -153,7 +153,7 @@
 void ChocoboEditor::setName(QString new_name)
 {
 	choco_name=new_name.mid(0,6);
-	if(choco_name.startsWith('\xFF') || choco_name == QString(6,'\x20')){line_name->setText("");}
+    if(choco_name.startsWith(QString("\xff"),Qt::CaseInsensitive) || choco_name == QString(6,' ')){line_name->setText("");}
 	else{line_name->setText(choco_name);}
 }
 void ChocoboEditor::setCantMate(bool cantMate)
@@ -252,6 +252,7 @@
 	//create Gui Widgets.
 	combo_sex = new QComboBox;
 	combo_type = new QComboBox;
+    combo_type->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));
 	line_name = new QLineEdit;
 	sb_speed = new QSpinBox;
 	sb_mSpeed = new QSpinBox;
@@ -449,7 +450,7 @@
 void ChocoboEditor::SetChocobo(FF7CHOCOBO choco, QString Processed_Name, bool cant_mate, quint16 stamina,quint8 rating)
 {
 	choco_data = choco;
-	if( Processed_Name.startsWith('\xff') || Processed_Name == QString(6,'\x20')){Processed_Name ="";}
+    if( Processed_Name.startsWith(QString("\xff"),Qt::CaseInsensitive) || Processed_Name == QString(6,'\x20')){Processed_Name ="";}
 	choco_name = Processed_Name;
 	choco_cant_mate = cant_mate;
 	choco_stamina = stamina;
diff -Nru blackchocobo-1.9.900/ff7tk/widgets/ItemList.cpp blackchocobo-1.9.910/ff7tk/widgets/ItemList.cpp
--- blackchocobo-1.9.900/ff7tk/widgets/ItemList.cpp	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/ff7tk/widgets/ItemList.cpp	2018-12-29 20:35:46.000000000 +0000
@@ -21,7 +21,7 @@
     {//our object will be the itemlist always in this event.
         int row=-1;//row @ -1 this way we can catch when were not over A QTableWidgetItem
         QTableWidgetItem *tbl_item=itemAt(mapFromGlobal(viewport()->cursor().pos()));
-        if(tbl_item !=0){row =tbl_item->row();}//And only update our row if vaild.
+        if(tbl_item){row =tbl_item->row();}//And only update our row if vaild.
         if(ev->type() == QEvent::ToolTip)
         {//ToolTip Event Popup.
             if(createdTooltip)
@@ -80,9 +80,17 @@
                     }
                 }
             }//End Of HoverLeave Processing
-            else{return event(ev);}
+            else {return true;}
         }
-        else{return event(ev);}
+        else if(ev->type() == QEvent::Resize)
+        {
+            if(createdSelector) {
+                itemupdate();
+            }
+            return event(ev);
+        }
+        else
+        {return event(ev);}
     }
     else{return false;}
 }
@@ -94,6 +102,7 @@
     createdTooltip=false;
     itemQtyLimit=127;
     setRowCount(320);
+    setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));
     setColumnCount(3);
     setStyleSheet(QString(";"));//set a style and itemSelector will have a normal size column 1
     setEditTriggers(QAbstractItemView::NoEditTriggers);// thats a long 0
@@ -128,7 +137,6 @@
         {//qty not above limit and item is not empty.
             itemlist.replace(i,Items.itemEncode(Items.itemId(itemlist.at(i)),itemQtyLimit));
         }
-        else{continue;}
     }
     itemupdate();
 }
@@ -136,7 +144,7 @@
 void ItemList::setItems(QList<quint16> items)
 {
     itemlist = items;
-    if(createdSelector){itemSelector->close();createdSelector=false;}
+    if(createdSelector){itemSelector->setVisible(false);createdSelector=false;}
     if(createdTooltip){itemPreview->close();createdTooltip=false;}
     itemupdate();
 }
@@ -155,59 +163,23 @@
         newItem = new QTableWidgetItem("",0);
         setItem(sender()->objectName().toInt(),2,newItem);
     }
-    else if(createdSelector)
-    {
-        for(int i=0;i<3;i++)
-        {
-            QTableWidgetItem* newItem = new QTableWidgetItem("",0);
-            setItem(sender()->objectName().toInt(),i,newItem);
-        }
-    }
     emit(itemsChanged(itemlist));
 }
 
 void ItemList::itemupdate()
 {
-    int j= currentRow();
-    int column0width =columnWidth(0);
-    int column1width =columnWidth(1);
-    int column2width =columnWidth(2);
-    int selectorLocation=321;
+
     clearContents();
-    setColumnWidth(0,column0width);
-    setColumnWidth(1,column1width);
-    setColumnWidth(2,column2width);
-    setRowCount(320);
-    if(createdSelector){selectorLocation = itemSelector->objectName().toInt(); itemSelector->setMaximumQty(itemQtyLimit);}
     for (int i=0;i<320;i++) // set up items
     {
-        if(i == selectorLocation){continue;}
-        else{updateItem(i);}
-
-    }
-    blockSignals(true);
-    if(createdSelector)
-    {
-        setCurrentCell(j,0);
-        setCellWidget(j,0,itemSelector);
-        if(itemlist.at(j)== FF7Item::EmptyItemData){/*nice empty under the selector*/}
-        else
-        {//wipe the data under the selector so its easier to read.
-            for(int i=0;i<3;i++)
-            {
-                QTableWidgetItem *newItem = new QTableWidgetItem("",0);
-                setItem(j,i,newItem);
-            }
-        }
-        itemSelector->setCurrentItem(itemlist.at(j));
+            updateItem(i);
     }
-    blockSignals(false);
 }
 void ItemList::listSelectionChanged(int row,int colum,int prevRow,int prevColum)
 {
+    Q_UNUSED(prevColum)
     if(createdSelector){itemSelector->close();createdSelector=false;}
     if(createdTooltip){itemPreview->close();createdTooltip=false;}
-    if(prevColum>=0 ||prevColum<=0){/*Stop warning about unused var.*/}
     if(colum<0||row <0){return;}//Ingore if selecting -1 (clearContents)
     if (prevRow>=0){updateItem(prevRow);}//update the previews Row so its filled again.
     itemSelector = new ItemSelector;
@@ -215,16 +187,6 @@
     createdSelector = true;
     itemSelector->setMaximumQty(itemQtyLimit);
     itemSelector->setObjectName(QString::number(row));
-   
-    if(itemlist.at(row)==FF7Item::EmptyItemData){/*nice Empty Item under the selector*/}
-    else
-    {//Clear whats under the selector 
-        for(int i=0;i<3;i++)
-        {
-            QTableWidgetItem *newItem = new QTableWidgetItem("",0);
-            setItem(row,i,newItem);
-        }
-    }
     itemSelector->setMinimumWidth(itemSelector->width());
     setCellWidget(row,0,itemSelector);
     itemSelector->setCurrentItem(itemlist.at(row));
@@ -236,7 +198,7 @@
     if (itemlist.at(row) == FF7Item::EmptyItemData)
     {
         newItem = new QTableWidgetItem("",0);
-		setItem(row,0,newItem);
+        setItem(row,0,newItem);
         newItem = new QTableWidgetItem(tr("-------EMPTY--------"),0);
         setItem(row,1,newItem);
         newItem = new QTableWidgetItem("",0);
@@ -262,6 +224,6 @@
         newItem = new QTableWidgetItem(qty.setNum(Items.itemQty(itemlist.at(row))),0);
         setItem(row,2,newItem);
     }
-	setRowHeight(row,fontMetrics().height()+9);
+    setRowHeight(row,fontMetrics().height()+9);
 }
 void ItemList::setEditableItemCombo(bool editable){editableItemCombo=editable;}
diff -Nru blackchocobo-1.9.900/ff7tk/widgets/ItemSelector.cpp blackchocobo-1.9.910/ff7tk/widgets/ItemSelector.cpp
--- blackchocobo-1.9.900/ff7tk/widgets/ItemSelector.cpp	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/ff7tk/widgets/ItemSelector.cpp	2018-12-29 20:35:46.000000000 +0000
@@ -24,8 +24,11 @@
 }
 void ItemSelector::init_display()
 {
+    QSize iconSize = QSize(fontMetrics().height(),fontMetrics().height());
 	combo_type = new QComboBox;
+    combo_type->setIconSize(iconSize);
 	combo_item = new QComboBox;
+    combo_item->setIconSize(iconSize);
 
 	sb_qty = new QSpinBox;
 	sb_qty->setAlignment(Qt::AlignCenter);
@@ -35,7 +38,8 @@
 	sb_qty->setWrapping(true);
 
     btn_remove = new QPushButton();
-	btn_remove->setIcon(QIcon::fromTheme(QString("edit-clear"),QPixmap(":/common/edit-clear")));
+    btn_remove->setIconSize(iconSize);
+    btn_remove->setIcon(QIcon::fromTheme(QString("edit-clear"),QPixmap(":/common/edit-clear")));
 	btn_remove->setToolTip(tr("Empty Item"));
     btn_remove->setFixedWidth(fontMetrics().width(QString("WW")));
 	btn_remove->setShortcut(QKeySequence::Delete);
@@ -62,6 +66,7 @@
 }
 void ItemSelector::init_data()
 {
+
     combo_type->addItem(Items->icon(FF7Item::Potion),tr(""));
     combo_type->addItem(Items->icon(FF7Item::BronzeBangle),tr(""));
     combo_type->addItem(Items->icon(FF7Item::Ribbon),tr(""));
diff -Nru blackchocobo-1.9.900/ff7tk/widgets/LocationViewer.cpp blackchocobo-1.9.910/ff7tk/widgets/LocationViewer.cpp
--- blackchocobo-1.9.900/ff7tk/widgets/LocationViewer.cpp	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/ff7tk/widgets/LocationViewer.cpp	2018-12-29 20:35:46.000000000 +0000
@@ -123,10 +123,7 @@
 	actionCaseSensitive = new QAction(tr("Case Sensitive"),btnSearchOptions);
 	actionCaseSensitive->setCheckable(true);
 
-	QString menuStyle = QString("QCheckbox::indicator { width: %1px; height: %2px;}").arg(QString::number(16*scale),QString::number(16*scale));
-
 	QMenu * newMenu=new QMenu;
-	newMenu->setStyleSheet(menuStyle);
 	newMenu->addAction(actionNameSearch);
 	newMenu->addAction(actionItemSearch);
 	newMenu->addSeparator();
diff -Nru blackchocobo-1.9.900/ff7tk/widgets/MateriaEditor.cpp blackchocobo-1.9.910/ff7tk/widgets/MateriaEditor.cpp
--- blackchocobo-1.9.900/ff7tk/widgets/MateriaEditor.cpp	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/ff7tk/widgets/MateriaEditor.cpp	2018-12-29 20:35:46.000000000 +0000
@@ -34,8 +34,11 @@
 void MateriaEditor::init_display()
 {//Make Widgets and set Properties.
 	//Widget Creation.
+    QSize iconSize = QSize(fontMetrics().height(), fontMetrics().height());
 	combo_type =new QComboBox;
+    combo_type->setIconSize(iconSize);
 	combo_materia = new QComboBox;
+    combo_materia->setIconSize(iconSize);
 	sb_ap = new QSpinBox;
 	lbl_slash = new QLabel("/");
 	lbl_max_ap = new QLabel;
@@ -71,8 +74,11 @@
 	//Special Properties Of Above Widgets
 	sb_ap->setWrapping(1);
 	sb_ap->setAlignment(Qt::AlignCenter);
-	btn_rm_materia->setIcon(QIcon::fromTheme(QString("edit-clear"),QPixmap(":/common/edit-clear")));
+    btn_rm_materia->setIconSize(iconSize);
+    btn_rm_materia->setIcon(QIcon::fromTheme(QString("edit-clear"),QPixmap(":/common/edit-clear")));
+    btn_copy_materia->setIconSize(iconSize);
 	btn_copy_materia->setIcon(QIcon::fromTheme(QString("edit-copy"),QPixmap(":/common/edit-copy")));
+    btn_paste_materia->setIconSize(iconSize);
 	btn_paste_materia->setIcon(QIcon::fromTheme(QString("edit-paste"),QPixmap(":/common/edit-paste")));
 
 	QString style=QString("QPushButton:enabled{background-color: rgba(0,0,0,0);border:0px solid;} QPushButton:hover{background-color:rgba(%1,%2,%3,96);}").arg(QString::number(this->palette().highlight().color().red()),QString::number(this->palette().highlight().color().green()),QString::number(this->palette().highlight().color().blue()));
@@ -259,17 +265,19 @@
 		newItem->setCheckState(Qt::Unchecked);
 		eskill_list->addItem(newItem);
 	}
-	QString style=QString("QListView::indicator:unchecked {image: url(:/materia/command_star_empty);} QListView::indicator:checked{image: url(:/materia/command_star_full);}");
+    QString style=QString("QListWidget::item { padding-left: 0px; padding-top: 1px; padding-bottom: 1px;}QListView::indicator { width: %1px; height: %1px; }QListView::indicator:unchecked {image: url(:/materia/command_star_empty);} QListView::indicator:checked{image: url(:/materia/command_star_full);}").arg(fontMetrics().height());
 	eskill_list->setStyleSheet(style);
-	eskill_list->setMaximumHeight(eskill_list->sizeHintForRow(0)*24 +eskill_list->contentsMargins().top() + eskill_list->contentsMargins().bottom());
+	eskill_list->setMaximumHeight(eskill_list->sizeHintForRow(0)*48 +eskill_list->contentsMargins().top() + eskill_list->contentsMargins().bottom());
 	eskill_list->setSelectionMode(QAbstractItemView::NoSelection);
+	eskill_list->setUniformItemSizes(true);
+
 	//Fill Combo_type
-	combo_type->addItem(data->iconAllMateria(),tr("All Materia"));
-	combo_type->addItem(data->icon(FF7Materia::MasterMagic),tr("Magic"));
-	combo_type->addItem(data->icon(FF7Materia::MasterSummon),tr("Summon"));
-	combo_type->addItem(data->icon(FF7Materia::Underwater),tr("Independent"));
-	combo_type->addItem(data->icon(FF7Materia::StealAsWell),tr("Support"));
-	combo_type->addItem(data->icon(FF7Materia::MasterCommand),tr("Command"));
+    combo_type->addItem(QIcon(QPixmap::fromImage(data->imageAllMateria()).scaledToWidth(fontMetrics().height(), Qt::SmoothTransformation)),tr("All Materia"));
+    combo_type->addItem(QIcon(data->pixmap(FF7Materia::MasterMagic).scaledToWidth(fontMetrics().height(), Qt::SmoothTransformation)),tr("Magic"));
+    combo_type->addItem(QIcon(data->pixmap(FF7Materia::MasterSummon).scaledToWidth(fontMetrics().height(), Qt::SmoothTransformation)),tr("Summon"));
+    combo_type->addItem(QIcon(data->pixmap(FF7Materia::Underwater).scaledToWidth(fontMetrics().height(), Qt::SmoothTransformation)),tr("Independent"));
+    combo_type->addItem(QIcon(data->pixmap(FF7Materia::StealAsWell).scaledToWidth(fontMetrics().height(), Qt::SmoothTransformation)),tr("Support"));
+    combo_type->addItem(QIcon(data->pixmap(FF7Materia::MasterCommand).scaledToWidth(fontMetrics().height(), Qt::SmoothTransformation)),tr("Command"));
 
 	//Set initial combo_materia info.
 	for(int i=0;i<91;i++)
@@ -472,10 +480,10 @@
 		eskill_group->setHidden(true);
 		v_spacer->changeSize(0,0,QSizePolicy::Preferred,QSizePolicy::Expanding);
 		v_spacer->invalidate();
-		switch (_level)
+        switch (_level)
 		{// no breaks on purpose
-			case 5:if(data->skills(_id).count()>4){list_skills->insertItem(0,data->skills(_id).at(4));}
-			case 4:if(data->skills(_id).count()>3){list_skills->insertItem(0,data->skills(_id).at(3));}
+            case 5: if(data->skills(_id).count()>4){list_skills->insertItem(0,data->skills(_id).at(4));}
+            case 4:if(data->skills(_id).count()>3){list_skills->insertItem(0,data->skills(_id).at(3));}
 			case 3:if(data->skills(_id).count()>2){list_skills->insertItem(0,data->skills(_id).at(2));}
 			case 2:if(data->skills(_id).count()>1){list_skills->insertItem(0,data->skills(_id).at(1));}
 			case 1:if(data->skills(_id).count()>0){list_skills->insertItem(0,data->skills(_id).at(0));}
diff -Nru blackchocobo-1.9.900/ff7tk/widgets/OptionsWidget.cpp blackchocobo-1.9.910/ff7tk/widgets/OptionsWidget.cpp
--- blackchocobo-1.9.900/ff7tk/widgets/OptionsWidget.cpp	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/ff7tk/widgets/OptionsWidget.cpp	2018-12-29 20:35:46.000000000 +0000
@@ -150,11 +150,11 @@
 	speedLayout->addLayout(battleMessageSpeedLayout,1,1);
 	speedLayout->addLayout(fieldMessageSpeedLayout,2,1);
 
-	QLabel *lblBtnUp = new QLabel(tr("Up"));
+    QLabel *lblBtnUp = new QLabel(tr("Up"));
 	lblBtnUp->setAlignment(Qt::AlignRight);
 	comboBtnUp = new QComboBox;
-    //comboBtnUp->setMinimumSize(52,32);
-	comboBtnUp->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
+    comboBtnUp->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
+    comboBtnUp->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtnUp->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtnUp->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
 	comboBtnUp->addItem(QIcon(QPixmap(":/psxButtons/r1")),"");
@@ -178,7 +178,7 @@
 	QLabel *lblBtnRight = new QLabel(tr("Right"));
 	lblBtnRight->setAlignment(Qt::AlignRight);
 	comboBtnRight = new QComboBox;
-    //comboBtnRight->setMinimumSize(52,32);
+    comboBtnRight->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
 	comboBtnRight->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtnRight->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtnRight->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
@@ -202,8 +202,8 @@
 	QLabel *lblBtnDown = new QLabel(tr("Down"));
 	lblBtnDown->setAlignment(Qt::AlignRight);
 	comboBtnDown = new QComboBox;
-    //comboBtnDown->setMinimumSize(52,32);
-	comboBtnDown->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
+    comboBtnDown->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
+    comboBtnDown->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtnDown->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtnDown->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
 	comboBtnDown->addItem(QIcon(QPixmap(":/psxButtons/r1")),"");
@@ -226,7 +226,7 @@
 	QLabel *lblBtnLeft = new QLabel(tr("Left"));
 	lblBtnLeft->setAlignment(Qt::AlignRight);
 	comboBtnLeft = new QComboBox;
-    //comboBtnLeft->setMinimumSize(52,32);
+    comboBtnLeft->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
 	comboBtnLeft->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtnLeft->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtnLeft->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
@@ -250,7 +250,7 @@
 	QLabel *lblBtnMenu = new QLabel(tr("Menu"));
 	lblBtnMenu->setAlignment(Qt::AlignRight);
 	comboBtnMenu = new QComboBox;
-    //comboBtnMenu->setMinimumSize(52,32);
+    comboBtnMenu->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
 	comboBtnMenu->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtnMenu->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtnMenu->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
@@ -274,7 +274,7 @@
 	QLabel *lblBtnOk = new QLabel(tr("Ok"));
 	lblBtnOk->setAlignment(Qt::AlignRight);
 	comboBtnOk = new QComboBox;
-    //comboBtnOk->setMinimumSize(52,32);
+    comboBtnOk->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
 	comboBtnOk->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtnOk->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtnOk->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
@@ -298,7 +298,7 @@
 	QLabel *lblBtnCancel = new QLabel(tr("Cancel"));
 	lblBtnCancel->setAlignment(Qt::AlignRight);
 	comboBtnCancel = new QComboBox;
-    //comboBtnCancel->setMinimumSize(52,32);
+    comboBtnCancel->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
 	comboBtnCancel->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtnCancel->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtnCancel->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
@@ -322,7 +322,7 @@
 	QLabel *lblBtnSwitch = new QLabel(tr("Switch"));
 	lblBtnSwitch->setAlignment(Qt::AlignRight);
 	comboBtnSwitch = new QComboBox;
-    //comboBtnSwitch->setMinimumSize(52,32);
+    comboBtnSwitch->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
 	comboBtnSwitch->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtnSwitch->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtnSwitch->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
@@ -346,7 +346,7 @@
 	QLabel *lblBtnCamera = new QLabel(tr("Camera"));
 	lblBtnCamera->setAlignment(Qt::AlignRight);
 	comboBtnCamera = new QComboBox;
-    //comboBtnCamera->setMinimumSize(52,32);
+    comboBtnCamera->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
 	comboBtnCamera->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtnCamera->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtnCamera->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
@@ -370,7 +370,7 @@
 	QLabel *lblBtnTarget = new QLabel(tr("Target"));
 	lblBtnTarget->setAlignment(Qt::AlignRight);
 	comboBtnTarget = new QComboBox;
-    //comboBtnTarget->setMinimumSize(52,32);
+    comboBtnTarget->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
 	comboBtnTarget->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtnTarget->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtnTarget->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
@@ -394,7 +394,7 @@
 	QLabel *lblBtnPgUp = new QLabel(tr("Page Up"));
 	lblBtnPgUp->setAlignment(Qt::AlignRight);
 	comboBtnPgUp = new QComboBox;
-    //comboBtnPgUp->setMinimumSize(52,32);
+    comboBtnPgUp->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
 	comboBtnPgUp->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtnPgUp->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtnPgUp->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
@@ -418,7 +418,7 @@
 	QLabel *lblBtnPgDn = new QLabel(tr("Page Down"));
 	lblBtnPgDn->setAlignment(Qt::AlignRight);
 	comboBtnPgDn = new QComboBox;
-    //comboBtnPgDn->setMinimumSize(52,32);
+    comboBtnPgDn->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
 	comboBtnPgDn->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtnPgDn->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtnPgDn->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
@@ -442,7 +442,7 @@
 	QLabel *lblBtnHelp = new QLabel(tr("Help"));
 	lblBtnHelp->setAlignment(Qt::AlignRight);
 	comboBtnHelp = new QComboBox;
-    //comboBtnHelp->setMinimumSize(52,32);
+    comboBtnHelp->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
 	comboBtnHelp->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtnHelp->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtnHelp->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
@@ -466,7 +466,7 @@
 	QLabel *lblBtnPause = new QLabel(tr("Pause"));
 	lblBtnPause->setAlignment(Qt::AlignRight);
     comboBtnPause = new QComboBox;
-    //comboBtnPause->setMinimumSize(52,32);
+    comboBtnPause->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
 	comboBtnPause->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtnPause->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtnPause->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
@@ -490,7 +490,7 @@
 	QLabel *lblBtn9 = new QLabel(tr("Unknown (9)"));
 	lblBtn9->setAlignment(Qt::AlignRight);
 	comboBtn9 = new QComboBox;
-    //comboBtn9->setMinimumSize(52,32);
+    comboBtn9->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
 	comboBtn9->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtn9->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtn9->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
@@ -514,7 +514,7 @@
 	QLabel *lblBtn10 = new QLabel(tr("Unknown(10)"));
 	lblBtn10->setAlignment(Qt::AlignRight);
 	comboBtn10 = new QComboBox;
-    //comboBtn10->setMinimumSize(52,32);
+    comboBtn10->setIconSize(QSize(fontMetrics().height(), fontMetrics().height()));;
 	comboBtn10->addItem(QIcon(QPixmap(":/psxButtons/l2")),"");
 	comboBtn10->addItem(QIcon(QPixmap(":/psxButtons/r2")),"");
 	comboBtn10->addItem(QIcon(QPixmap(":/psxButtons/l1")),"");
diff -Nru blackchocobo-1.9.900/lang/bchoco_de.ts blackchocobo-1.9.910/lang/bchoco_de.ts
--- blackchocobo-1.9.900/lang/bchoco_de.ts	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/lang/bchoco_de.ts	2018-12-29 20:35:46.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de">
+<TS version="2.1" language="de">
 <context>
     <name>About</name>
     <message>
@@ -60,34 +60,6 @@
         <translation>Neueste Features</translation>
     </message>
     <message>
-        <source>New: Scaling support for HiDpi</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New: Psv Signing Place Keys in Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New: Save/Restore Geometry for MainWindow and Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New: Auto guess Slot location for VMC formats.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fixed: Menu Editor Backward Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New: Achievement Editor.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FF7tk: LocationViewer Contains Field Items (Finished!)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Credits</source>
         <translation>Credits</translation>
     </message>
@@ -203,6 +175,38 @@
         <source>Using Qt: %1</source>
         <translation type="unfinished">Mit Qt: %1</translation>
     </message>
+    <message>
+        <source>New: Further Improve HiDpi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed: Track hex Editor&apos;s cursor on tab change.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed Loading Psv file crashes host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/12</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/17</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/37</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed Chocobo  pCount / Personality layout was overlapping Speed Notes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Chocobo name not showing place holder text at right times</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Achievement_Names</name>
@@ -2288,6 +2292,14 @@
         <source>Cauldron</source>
         <translation type="unfinished">Kessel</translation>
     </message>
+    <message>
+        <source>Final Heaven (+other stuff?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Elemental(+other stuff?)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ItemList</name>
@@ -5432,7 +5444,7 @@
     <message>
         <source>Runs</source>
         <translatorcomment>&quot;Runs&quot;- you mean the amount of flees?</translatorcomment>
-        <translation>Fluchten</translation>
+        <translation type="vanished">Fluchten</translation>
     </message>
     <message>
         <source>Gil</source>
@@ -5868,7 +5880,7 @@
     </message>
     <message>
         <source>Number Steps</source>
-        <translation>Anzahl der Schritte</translation>
+        <translation type="vanished">Anzahl der Schritte</translation>
     </message>
     <message>
         <source>Y: </source>
@@ -5948,7 +5960,7 @@
     </message>
     <message>
         <source>Team Avalanche Has Run To Hideout</source>
-        <translation>Team Avalanche ist zum Versteck gerannt</translation>
+        <translation type="vanished">Team Avalanche ist zum Versteck gerannt</translation>
     </message>
     <message>
         <source>Can Show Pillar Pan Video</source>
@@ -5977,7 +5989,7 @@
     </message>
     <message>
         <source>Trigger Game Over (countdown timer out)</source>
-        <translation>Löse Game Over aus (Countdown wurde erreicht)</translation>
+        <translation type="vanished">Löse Game Over aus (Countdown wurde erreicht)</translation>
     </message>
     <message>
         <source>Post Electrical Effect MD8_3</source>
@@ -6007,31 +6019,31 @@
     </message>
     <message>
         <source>Sector 5</source>
-        <translation>Sektor 5</translation>
+        <translation type="vanished">Sektor 5</translation>
     </message>
     <message>
         <source>Talked with Sick Man</source>
-        <translation>Mit krankem Mann geredet</translation>
+        <translation type="vanished">Mit krankem Mann geredet</translation>
     </message>
     <message>
         <source>Aeris Talked About Sick Man</source>
-        <translation>Aeris hat über kranken Mann geredet</translation>
+        <translation type="vanished">Aeris hat über kranken Mann geredet</translation>
     </message>
     <message>
         <source>cb_s5_1</source>
-        <translation>cb_s5_1</translation>
+        <translation type="vanished">cb_s5_1</translation>
     </message>
     <message>
         <source>cb_s5_2</source>
-        <translation>cb_s5_2</translation>
+        <translation type="vanished">cb_s5_2</translation>
     </message>
     <message>
         <source>cb_s5_5</source>
-        <translation>cb_s5_5</translation>
+        <translation type="vanished">cb_s5_5</translation>
     </message>
     <message>
         <source>Jesse Has Been Unstuck</source>
-        <translation>Jesse wurde befreit</translation>
+        <translation type="vanished">Jesse wurde befreit</translation>
     </message>
     <message>
         <source>Talked to Biggs</source>
@@ -6039,11 +6051,11 @@
     </message>
     <message>
         <source>Talked to Jesse Before Looking At Map</source>
-        <translation>Mit Jesse geredet bevor Karte angeschaut</translation>
+        <translation type="vanished">Mit Jesse geredet bevor Karte angeschaut</translation>
     </message>
     <message>
         <source>After Aeris Church Scene</source>
-        <translation>Nach Aeris Kirchen Szene</translation>
+        <translation type="vanished">Nach Aeris Kirchen Szene</translation>
     </message>
     <message>
         <source>Sector 7 - Slums Progress</source>
@@ -6139,7 +6151,7 @@
     </message>
     <message>
         <source>SnowBoard Mini Game </source>
-        <translation type="unfinished">Snowboard Mini-Spiel</translation>
+        <translation type="obsolete">Snowboard Mini-Spiel</translation>
     </message>
     <message>
         <source>Beginner Course</source>
@@ -6431,7 +6443,7 @@
     </message>
     <message>
         <source>Team Avalanche had meeting after Bombing Mission</source>
-        <translation type="unfinished">Team Avalanche hatte Sitzung nach Mission Bombardierung</translation>
+        <translation type="obsolete">Team Avalanche hatte Sitzung nach Mission Bombardierung</translation>
     </message>
     <message>
         <source>Cait Sith and Vincent should not be enabled if they are disabled in the Party tab.</source>
@@ -6741,7 +6753,51 @@
     </message>
     <message>
         <source>G-Bike High Score</source>
-        <translation type="unfinished">G-Bike High Score</translation>
+        <translation type="obsolete">G-Bike High Score</translation>
+    </message>
+    <message>
+        <source>Escapes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jessie Has Been Unstuck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trigger Game Over (countdown reached 0)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Talked to Jessie Before Looking At Map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Avalanche had meeting after Bombing Mission</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Avalanche Has Run To Hideout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ho&amp;ur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number of Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Snowboard Mini Game </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G-Bi&amp;ke High Score</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Played piano durring flashback</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
diff -Nru blackchocobo-1.9.900/lang/bchoco_en.ts blackchocobo-1.9.910/lang/bchoco_en.ts
--- blackchocobo-1.9.900/lang/bchoco_en.ts	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/lang/bchoco_en.ts	2018-12-29 20:35:46.000000000 +0000
@@ -48,34 +48,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New: Scaling support for HiDpi</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New: Psv Signing Place Keys in Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New: Save/Restore Geometry for MainWindow and Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New: Auto guess Slot location for VMC formats.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fixed: Menu Editor Backward Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New: Achievement Editor.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FF7tk: LocationViewer Contains Field Items (Finished!)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Credits</source>
         <translation type="unfinished"></translation>
     </message>
@@ -191,6 +163,38 @@
         <source>Using Qt: %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New: Further Improve HiDpi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed: Track hex Editor&apos;s cursor on tab change.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed Loading Psv file crashes host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/12</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/17</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/37</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed Chocobo  pCount / Personality layout was overlapping Speed Notes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Chocobo name not showing place holder text at right times</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Achievement_Names</name>
@@ -2273,6 +2277,14 @@
         <source>Cauldron</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Final Heaven (+other stuff?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Elemental(+other stuff?)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ItemList</name>
@@ -5414,10 +5426,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Runs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Gil</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5839,10 +5847,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Number Steps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Y: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -5919,10 +5923,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Team Avalanche Has Run To Hideout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Can Show Pillar Pan Video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5947,10 +5947,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Trigger Game Over (countdown timer out)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Post Electrical Effect MD8_3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5973,46 +5969,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sector 5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Talked with Sick Man</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aeris Talked About Sick Man</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>cb_s5_1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>cb_s5_2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>cb_s5_5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jesse Has Been Unstuck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Talked to Biggs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Talked to Jesse Before Looking At Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After Aeris Church Scene</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Sector 7 - Slums Progress</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6103,10 +6063,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SnowBoard Mini Game </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Beginner Course</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6399,10 +6355,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Team Avalanche had meeting after Bombing Mission</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cait Sith and Vincent should not be enabled if they are disabled in the Party tab.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6699,7 +6651,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>G-Bike High Score</source>
+        <source>Escapes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jessie Has Been Unstuck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trigger Game Over (countdown reached 0)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Talked to Jessie Before Looking At Map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Avalanche had meeting after Bombing Mission</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Avalanche Has Run To Hideout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ho&amp;ur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number of Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Snowboard Mini Game </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G-Bi&amp;ke High Score</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Played piano durring flashback</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff -Nru blackchocobo-1.9.900/lang/bchoco_es.ts blackchocobo-1.9.910/lang/bchoco_es.ts
--- blackchocobo-1.9.900/lang/bchoco_es.ts	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/lang/bchoco_es.ts	2018-12-29 20:35:46.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
+<TS version="2.1" language="es_ES">
 <context>
     <name>About</name>
     <message>
@@ -61,31 +61,31 @@
     </message>
     <message>
         <source>New: Scaling support for HiDpi</source>
-        <translation type="unfinished">Nuevo: Soporte para escalar en HiDpi</translation>
+        <translation type="obsolete">Nuevo: Soporte para escalar en HiDpi</translation>
     </message>
     <message>
         <source>New: Psv Signing Place Keys in Options</source>
-        <translation>Nuevo: Claves para firmas de PSV en Opciones</translation>
+        <translation type="vanished">Nuevo: Claves para firmas de PSV en Opciones</translation>
     </message>
     <message>
         <source>New: Save/Restore Geometry for MainWindow and Options</source>
-        <translation type="unfinished">Nuevo: Guardar/Recuperar Geometría para MainWindow y Opciones</translation>
+        <translation type="obsolete">Nuevo: Guardar/Recuperar Geometría para MainWindow y Opciones</translation>
     </message>
     <message>
         <source>New: Auto guess Slot location for VMC formats.</source>
-        <translation>Nuevo: Localización de ranura de manera predictiva para los formatos VMC.</translation>
+        <translation type="vanished">Nuevo: Localización de ranura de manera predictiva para los formatos VMC.</translation>
     </message>
     <message>
         <source>Fixed: Menu Editor Backward Columns</source>
-        <translation type="unfinished">Corrección: Editor de menú - Columnas atrasadas</translation>
+        <translation type="obsolete">Corrección: Editor de menú - Columnas atrasadas</translation>
     </message>
     <message>
         <source>New: Achievement Editor.</source>
-        <translation>Corrección: Editor de Logros.</translation>
+        <translation type="vanished">Corrección: Editor de Logros.</translation>
     </message>
     <message>
         <source>FF7tk: LocationViewer Contains Field Items (Finished!)</source>
-        <translation>FF7tk: LocationViewer Contiene los Elementos de Campo (Terminado!)</translation>
+        <translation type="vanished">FF7tk: LocationViewer Contiene los Elementos de Campo (Terminado!)</translation>
     </message>
     <message>
         <source>Credits</source>
@@ -203,6 +203,38 @@
         <source>Using Qt: %1</source>
         <translation>Usando Qt: %1</translation>
     </message>
+    <message>
+        <source>New: Further Improve HiDpi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed: Track hex Editor&apos;s cursor on tab change.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed Loading Psv file crashes host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/12</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/17</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/37</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed Chocobo  pCount / Personality layout was overlapping Speed Notes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Chocobo name not showing place holder text at right times</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Achievement_Names</name>
@@ -2322,6 +2354,14 @@
         <source>Cauldron</source>
         <translation>Caldera</translation>
     </message>
+    <message>
+        <source>Final Heaven (+other stuff?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Elemental(+other stuff?)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ItemList</name>
@@ -5462,7 +5502,7 @@
     </message>
     <message>
         <source>Runs</source>
-        <translation>Huídas</translation>
+        <translation type="vanished">Huídas</translation>
     </message>
     <message>
         <source>Gil</source>
@@ -5900,7 +5940,7 @@
     </message>
     <message>
         <source>Number Steps</source>
-        <translation>Número de pasos</translation>
+        <translation type="vanished">Número de pasos</translation>
     </message>
     <message>
         <source>Y: </source>
@@ -5980,7 +6020,7 @@
     </message>
     <message>
         <source>Team Avalanche Has Run To Hideout</source>
-        <translation>Avalancha huye al escondite</translation>
+        <translation type="vanished">Avalancha huye al escondite</translation>
     </message>
     <message>
         <source>Can Show Pillar Pan Video</source>
@@ -6008,7 +6048,7 @@
     </message>
     <message>
         <source>Trigger Game Over (countdown timer out)</source>
-        <translation>Activar Game Over (reloj de cuenta atrás)</translation>
+        <translation type="vanished">Activar Game Over (reloj de cuenta atrás)</translation>
     </message>
     <message>
         <source>Post Electrical Effect MD8_3</source>
@@ -6036,31 +6076,31 @@
     </message>
     <message>
         <source>Sector 5</source>
-        <translation>Sector 5</translation>
+        <translation type="vanished">Sector 5</translation>
     </message>
     <message>
         <source>Talked with Sick Man</source>
-        <translation>Hablar con hombre enfermo</translation>
+        <translation type="vanished">Hablar con hombre enfermo</translation>
     </message>
     <message>
         <source>Aeris Talked About Sick Man</source>
-        <translation>Aeris habla sobre el hombre enfermo</translation>
+        <translation type="vanished">Aeris habla sobre el hombre enfermo</translation>
     </message>
     <message>
         <source>cb_s5_1</source>
-        <translation>cb_s5_1</translation>
+        <translation type="vanished">cb_s5_1</translation>
     </message>
     <message>
         <source>cb_s5_2</source>
-        <translation>cb_s5_2</translation>
+        <translation type="vanished">cb_s5_2</translation>
     </message>
     <message>
         <source>cb_s5_5</source>
-        <translation>cb_s5_5</translation>
+        <translation type="vanished">cb_s5_5</translation>
     </message>
     <message>
         <source>Jesse Has Been Unstuck</source>
-        <translation>Jesse se ha desenganchado</translation>
+        <translation type="vanished">Jesse se ha desenganchado</translation>
     </message>
     <message>
         <source>Talked to Biggs</source>
@@ -6068,11 +6108,11 @@
     </message>
     <message>
         <source>Talked to Jesse Before Looking At Map</source>
-        <translation>Hablar con Jesse antes de mirar al mapa</translation>
+        <translation type="vanished">Hablar con Jesse antes de mirar al mapa</translation>
     </message>
     <message>
         <source>After Aeris Church Scene</source>
-        <translation>Después de la escena de la iglesia de Aeris</translation>
+        <translation type="vanished">Después de la escena de la iglesia de Aeris</translation>
     </message>
     <message>
         <source>Sector 7 - Slums Progress</source>
@@ -6168,7 +6208,7 @@
     </message>
     <message>
         <source>SnowBoard Mini Game </source>
-        <translation>Mini Juego de Snowboard</translation>
+        <translation type="vanished">Mini Juego de Snowboard</translation>
     </message>
     <message>
         <source>Beginner Course</source>
@@ -6460,7 +6500,7 @@
     </message>
     <message>
         <source>Team Avalanche had meeting after Bombing Mission</source>
-        <translation>Avalancha tuvo la reunión despues de la &apos;Bombing mission&apos;</translation>
+        <translation type="vanished">Avalancha tuvo la reunión despues de la &apos;Bombing mission&apos;</translation>
     </message>
     <message>
         <source>Cait Sith and Vincent should not be enabled if they are disabled in the Party tab.</source>
@@ -6768,7 +6808,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>G-Bike High Score</source>
+        <source>Escapes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jessie Has Been Unstuck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trigger Game Over (countdown reached 0)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Talked to Jessie Before Looking At Map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Avalanche had meeting after Bombing Mission</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Avalanche Has Run To Hideout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ho&amp;ur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number of Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Snowboard Mini Game </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G-Bi&amp;ke High Score</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Played piano durring flashback</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff -Nru blackchocobo-1.9.900/lang/bchoco_fr.ts blackchocobo-1.9.910/lang/bchoco_fr.ts
--- blackchocobo-1.9.900/lang/bchoco_fr.ts	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/lang/bchoco_fr.ts	2018-12-29 20:35:46.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr" sourcelanguage="en_US">
+<TS version="2.1" language="fr" sourcelanguage="en_US">
 <context>
     <name>About</name>
     <message>
@@ -61,31 +61,31 @@
     </message>
     <message>
         <source>New: Scaling support for HiDpi</source>
-        <translation>Nouveau : support de la mise à l&apos;échelle pour écran HiDPI</translation>
+        <translation type="vanished">Nouveau : support de la mise à l&apos;échelle pour écran HiDPI</translation>
     </message>
     <message>
         <source>New: Psv Signing Place Keys in Options</source>
-        <translation>Nouveau : Gestion des clés de signature PSV dans les options</translation>
+        <translation type="vanished">Nouveau : Gestion des clés de signature PSV dans les options</translation>
     </message>
     <message>
         <source>New: Save/Restore Geometry for MainWindow and Options</source>
-        <translation>Nouveau : Sauvegarder/restaurer la géométrie des fenêtres principale et options</translation>
+        <translation type="vanished">Nouveau : Sauvegarder/restaurer la géométrie des fenêtres principale et options</translation>
     </message>
     <message>
         <source>New: Auto guess Slot location for VMC formats.</source>
-        <translation>Nouveau : Deviner automatiquement l&apos;emplacement pour les formats VMC.</translation>
+        <translation type="vanished">Nouveau : Deviner automatiquement l&apos;emplacement pour les formats VMC.</translation>
     </message>
     <message>
         <source>Fixed: Menu Editor Backward Columns</source>
-        <translation>Corrigé : Colonnes arrières de l&apos;éditeur de menu</translation>
+        <translation type="vanished">Corrigé : Colonnes arrières de l&apos;éditeur de menu</translation>
     </message>
     <message>
         <source>New: Achievement Editor.</source>
-        <translation>Nouveau : éditeur de succès.</translation>
+        <translation type="vanished">Nouveau : éditeur de succès.</translation>
     </message>
     <message>
         <source>FF7tk: LocationViewer Contains Field Items (Finished!)</source>
-        <translation>FF7tk : Le visualisateur de lieux contient les écrans (terminé !)</translation>
+        <translation type="vanished">FF7tk : Le visualisateur de lieux contient les écrans (terminé !)</translation>
     </message>
     <message>
         <source>Credits</source>
@@ -203,6 +203,38 @@
         <source>Using Qt: %1</source>
         <translation>Version de Qt : %1</translation>
     </message>
+    <message>
+        <source>New: Further Improve HiDpi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed: Track hex Editor&apos;s cursor on tab change.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed Loading Psv file crashes host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/12</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/17</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/37</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed Chocobo  pCount / Personality layout was overlapping Speed Notes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Chocobo name not showing place holder text at right times</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Achievement_Names</name>
@@ -2287,6 +2319,14 @@
         <source>Cauldron</source>
         <translation>Chaudron</translation>
     </message>
+    <message>
+        <source>Final Heaven (+other stuff?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Elemental(+other stuff?)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ItemList</name>
@@ -5426,7 +5466,7 @@
     </message>
     <message>
         <source>Runs</source>
-        <translation>Fuites</translation>
+        <translation type="vanished">Fuites</translation>
     </message>
     <message>
         <source>Gil</source>
@@ -5864,7 +5904,7 @@
     </message>
     <message>
         <source>Number Steps</source>
-        <translation>Nombre de pas</translation>
+        <translation type="vanished">Nombre de pas</translation>
     </message>
     <message>
         <source>Y: </source>
@@ -5944,7 +5984,7 @@
     </message>
     <message>
         <source>Team Avalanche Has Run To Hideout</source>
-        <translation>AVALANCHE s&apos;est dirigée vers la planque</translation>
+        <translation type="vanished">AVALANCHE s&apos;est dirigée vers la planque</translation>
     </message>
     <message>
         <source>Can Show Pillar Pan Video</source>
@@ -5972,7 +6012,7 @@
     </message>
     <message>
         <source>Trigger Game Over (countdown timer out)</source>
-        <translation>Activer la Fin de Partie à 00:00</translation>
+        <translation type="vanished">Activer la Fin de Partie à 00:00</translation>
     </message>
     <message>
         <source>Post Electrical Effect MD8_3</source>
@@ -6000,31 +6040,31 @@
     </message>
     <message>
         <source>Sector 5</source>
-        <translation>Secteur 5</translation>
+        <translation type="vanished">Secteur 5</translation>
     </message>
     <message>
         <source>Talked with Sick Man</source>
-        <translation>Parlé avec l&apos;homme malade</translation>
+        <translation type="vanished">Parlé avec l&apos;homme malade</translation>
     </message>
     <message>
         <source>Aeris Talked About Sick Man</source>
-        <translation>Aéris vous a parlé de l&apos;homme malade</translation>
+        <translation type="vanished">Aéris vous a parlé de l&apos;homme malade</translation>
     </message>
     <message>
         <source>cb_s5_1</source>
-        <translation>cb_s5_1</translation>
+        <translation type="vanished">cb_s5_1</translation>
     </message>
     <message>
         <source>cb_s5_2</source>
-        <translation>cb_s5_2</translation>
+        <translation type="vanished">cb_s5_2</translation>
     </message>
     <message>
         <source>cb_s5_5</source>
-        <translation>cb_s5_5</translation>
+        <translation type="vanished">cb_s5_5</translation>
     </message>
     <message>
         <source>Jesse Has Been Unstuck</source>
-        <translation>Jambe de Jesse décoincée</translation>
+        <translation type="vanished">Jambe de Jesse décoincée</translation>
     </message>
     <message>
         <source>Talked to Biggs</source>
@@ -6032,11 +6072,11 @@
     </message>
     <message>
         <source>Talked to Jesse Before Looking At Map</source>
-        <translation>Parler à Jesse avant de regarder la carte</translation>
+        <translation type="vanished">Parler à Jesse avant de regarder la carte</translation>
     </message>
     <message>
         <source>After Aeris Church Scene</source>
-        <translation>Passé la scène de l&apos;église d&apos;Aéris</translation>
+        <translation type="vanished">Passé la scène de l&apos;église d&apos;Aéris</translation>
     </message>
     <message>
         <source>Sector 7 - Slums Progress</source>
@@ -6132,7 +6172,7 @@
     </message>
     <message>
         <source>SnowBoard Mini Game </source>
-        <translation>Mini jeu de snowboard</translation>
+        <translation type="vanished">Mini jeu de snowboard</translation>
     </message>
     <message>
         <source>Beginner Course</source>
@@ -6424,7 +6464,7 @@
     </message>
     <message>
         <source>Team Avalanche had meeting after Bombing Mission</source>
-        <translation>L&apos;équipe d&apos;AVALANCHE a fait une réunion après la première mission</translation>
+        <translation type="vanished">L&apos;équipe d&apos;AVALANCHE a fait une réunion après la première mission</translation>
     </message>
     <message>
         <source>Cait Sith and Vincent should not be enabled if they are disabled in the Party tab.</source>
@@ -6736,7 +6776,51 @@
     </message>
     <message>
         <source>G-Bike High Score</source>
-        <translation type="unfinished">Meilleur score G-Bike</translation>
+        <translation type="obsolete">Meilleur score G-Bike</translation>
+    </message>
+    <message>
+        <source>Escapes</source>
+        <translation type="unfinished">Fuites</translation>
+    </message>
+    <message>
+        <source>Jessie Has Been Unstuck</source>
+        <translation type="unfinished">Jambe de Jesse décoincée</translation>
+    </message>
+    <message>
+        <source>Trigger Game Over (countdown reached 0)</source>
+        <translation type="unfinished">Activer la Fin de Partie à 00:00</translation>
+    </message>
+    <message>
+        <source>Talked to Jessie Before Looking At Map</source>
+        <translation type="unfinished">Parler à Jesse avant de regarder la carte</translation>
+    </message>
+    <message>
+        <source>Avalanche had meeting after Bombing Mission</source>
+        <translation type="unfinished">L&apos;équipe d&apos;AVALANCHE a fait une réunion après la première mission</translation>
+    </message>
+    <message>
+        <source>Avalanche Has Run To Hideout</source>
+        <translation type="unfinished">AVALANCHE s&apos;est dirigée vers la planque</translation>
+    </message>
+    <message>
+        <source>Ho&amp;ur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number of Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Snowboard Mini Game </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G-Bi&amp;ke High Score</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Played piano durring flashback</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
diff -Nru blackchocobo-1.9.900/lang/bchoco_ja.ts blackchocobo-1.9.910/lang/bchoco_ja.ts
--- blackchocobo-1.9.900/lang/bchoco_ja.ts	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/lang/bchoco_ja.ts	2018-12-29 20:35:46.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ja" sourcelanguage="en_US">
+<TS version="2.1" language="ja" sourcelanguage="en_US">
 <context>
     <name>About</name>
     <message>
@@ -57,31 +57,31 @@
     </message>
     <message>
         <source>New: Scaling support for HiDpi</source>
-        <translation type="unfinished">新規：HiDpiのサポートをスケーリング</translation>
+        <translation type="obsolete">新規：HiDpiのサポートをスケーリング</translation>
     </message>
     <message>
         <source>New: Psv Signing Place Keys in Options</source>
-        <translation type="unfinished">新規：PSVはオプションに置きキーの署名</translation>
+        <translation type="obsolete">新規：PSVはオプションに置きキーの署名</translation>
     </message>
     <message>
         <source>New: Save/Restore Geometry for MainWindow and Options</source>
-        <translation type="unfinished">新規：/保存メインウィンドウとオプションのためのジオメトリを復元します</translation>
+        <translation type="obsolete">新規：/保存メインウィンドウとオプションのためのジオメトリを復元します</translation>
     </message>
     <message>
         <source>New: Auto guess Slot location for VMC formats.</source>
-        <translation type="unfinished">新：VMCフォーマットの自動推測スロットの場所。</translation>
+        <translation type="obsolete">新：VMCフォーマットの自動推測スロットの場所。</translation>
     </message>
     <message>
         <source>Fixed: Menu Editor Backward Columns</source>
-        <translation type="unfinished">修正：メニューエディタの下位列</translation>
+        <translation type="obsolete">修正：メニューエディタの下位列</translation>
     </message>
     <message>
         <source>New: Achievement Editor.</source>
-        <translation type="unfinished">新：達成エディタ。</translation>
+        <translation type="obsolete">新：達成エディタ。</translation>
     </message>
     <message>
         <source>FF7tk: LocationViewer Contains Field Items (Finished!)</source>
-        <translation type="unfinished">FF7tkは：LocationViewerは、フィールド項目が含まれ（完成を！）</translation>
+        <translation type="obsolete">FF7tkは：LocationViewerは、フィールド項目が含まれ（完成を！）</translation>
     </message>
     <message>
         <source>Credits</source>
@@ -201,6 +201,38 @@
         <source>Using Qt: %1</source>
         <translation type="unfinished">QTを使用します：%1</translation>
     </message>
+    <message>
+        <source>New: Further Improve HiDpi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed: Track hex Editor&apos;s cursor on tab change.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed Loading Psv file crashes host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/12</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/17</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/37</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Fixed Chocobo  pCount / Personality layout was overlapping Speed Notes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ff7tk: Chocobo name not showing place holder text at right times</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Achievement_Names</name>
@@ -2284,6 +2316,14 @@
         <source>Cauldron</source>
         <translation type="unfinished">魔女の大釜</translation>
     </message>
+    <message>
+        <source>Final Heaven (+other stuff?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Elemental(+other stuff?)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ItemList</name>
@@ -4434,7 +4474,7 @@
     <message>
         <source>Mideel,Clinic</source>
         <translatorcomment>Riped from SLPS-01057-60</translatorcomment>
-        <translation>ミディール　治療所</translation>
+        <translation>ミディール&#x3000;治療所</translation>
     </message>
     <message>
         <source>Sector 6</source>
@@ -5501,7 +5541,7 @@
     </message>
     <message>
         <source>Runs</source>
-        <translation>逃走回数</translation>
+        <translation type="vanished">逃走回数</translation>
     </message>
     <message>
         <source>Gil</source>
@@ -5935,7 +5975,7 @@
     </message>
     <message>
         <source>Number Steps</source>
-        <translation>フィールドの総歩数</translation>
+        <translation type="vanished">フィールドの総歩数</translation>
     </message>
     <message>
         <source>Y: </source>
@@ -6015,7 +6055,7 @@
     </message>
     <message>
         <source>Team Avalanche Has Run To Hideout</source>
-        <translation>アバランチ チームがアジトへ向かう</translation>
+        <translation type="vanished">アバランチ チームがアジトへ向かう</translation>
     </message>
     <message>
         <source>Can Show Pillar Pan Video</source>
@@ -6043,7 +6083,7 @@
     </message>
     <message>
         <source>Trigger Game Over (countdown timer out)</source>
-        <translation>ゲーム オーバー トリガー (カウントダウン タイマー)</translation>
+        <translation type="vanished">ゲーム オーバー トリガー (カウントダウン タイマー)</translation>
     </message>
     <message>
         <source>Post Electrical Effect MD8_3</source>
@@ -6071,31 +6111,31 @@
     </message>
     <message>
         <source>Sector 5</source>
-        <translation>５番街</translation>
+        <translation type="vanished">５番街</translation>
     </message>
     <message>
         <source>Talked with Sick Man</source>
-        <translation>土管の病人と会話</translation>
+        <translation type="vanished">土管の病人と会話</translation>
     </message>
     <message>
         <source>Aeris Talked About Sick Man</source>
-        <translation>エアリスの病人に関する話を聞く</translation>
+        <translation type="vanished">エアリスの病人に関する話を聞く</translation>
     </message>
     <message>
         <source>cb_s5_1</source>
-        <translation>cb_s5_1</translation>
+        <translation type="vanished">cb_s5_1</translation>
     </message>
     <message>
         <source>cb_s5_2</source>
-        <translation>cb_s5_2</translation>
+        <translation type="vanished">cb_s5_2</translation>
     </message>
     <message>
         <source>cb_s5_5</source>
-        <translation>cb_s5_5</translation>
+        <translation type="vanished">cb_s5_5</translation>
     </message>
     <message>
         <source>Jesse Has Been Unstuck</source>
-        <translation>ジェシーを助ける</translation>
+        <translation type="vanished">ジェシーを助ける</translation>
     </message>
     <message>
         <source>Talked to Biggs</source>
@@ -6103,11 +6143,11 @@
     </message>
     <message>
         <source>Talked to Jesse Before Looking At Map</source>
-        <translation>ジェシーと会話してマップを見る</translation>
+        <translation type="vanished">ジェシーと会話してマップを見る</translation>
     </message>
     <message>
         <source>After Aeris Church Scene</source>
-        <translation>エアリスとの教会イベント完了</translation>
+        <translation type="vanished">エアリスとの教会イベント完了</translation>
     </message>
     <message>
         <source>Sector 7 - Slums Progress</source>
@@ -6204,7 +6244,7 @@
     </message>
     <message>
         <source>SnowBoard Mini Game </source>
-        <translation type="unfinished">スノーボードのミニゲーム</translation>
+        <translation type="obsolete">スノーボードのミニゲーム</translation>
     </message>
     <message>
         <source>Beginner Course</source>
@@ -6497,7 +6537,7 @@
     </message>
     <message>
         <source>Team Avalanche had meeting after Bombing Mission</source>
-        <translation type="unfinished">チーム雪崩は、ミッションを爆撃した後にミーティングを行いました</translation>
+        <translation type="obsolete">チーム雪崩は、ミッションを爆撃した後にミーティングを行いました</translation>
     </message>
     <message>
         <source>Cait Sith and Vincent should not be enabled if they are disabled in the Party tab.</source>
@@ -6806,7 +6846,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>G-Bike High Score</source>
+        <source>Escapes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jessie Has Been Unstuck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trigger Game Over (countdown reached 0)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Talked to Jessie Before Looking At Map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Avalanche had meeting after Bombing Mission</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Avalanche Has Run To Hideout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ho&amp;ur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number of Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Snowboard Mini Game </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G-Bi&amp;ke High Score</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Played piano durring flashback</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8676,27 +8756,27 @@
     </message>
     <message>
         <source>Restore,Attack,Indirect</source>
-        <translation>回復　攻撃　間接</translation>
+        <translation>回復&#x3000;攻撃&#x3000;間接</translation>
     </message>
     <message>
         <source>Restore,Indirect,Attack</source>
-        <translation>回復　間接　攻撃</translation>
+        <translation>回復&#x3000;間接&#x3000;攻撃</translation>
     </message>
     <message>
         <source>Attack,Indirect,Restore</source>
-        <translation>攻撃　間接　回復</translation>
+        <translation>攻撃&#x3000;間接&#x3000;回復</translation>
     </message>
     <message>
         <source>Attack,Restore,Indirect</source>
-        <translation>攻撃　回復　間接</translation>
+        <translation>攻撃&#x3000;回復&#x3000;間接</translation>
     </message>
     <message>
         <source>Indirect,Restore,Attack</source>
-        <translation>間接　回復　攻撃</translation>
+        <translation>間接&#x3000;回復&#x3000;攻撃</translation>
     </message>
     <message>
         <source>Indirect,Attack,Restore</source>
-        <translation>間接　攻撃　回復</translation>
+        <translation>間接&#x3000;攻撃&#x3000;回復</translation>
     </message>
     <message>
         <source>Cursor Type</source>
@@ -8740,11 +8820,11 @@
     </message>
     <message>
         <source>Fast</source>
-        <translation>速い　</translation>
+        <translation>速い&#x3000;</translation>
     </message>
     <message>
         <source>Slow</source>
-        <translation>　遅い</translation>
+        <translation>&#x3000;遅い</translation>
     </message>
     <message>
         <source>Battle Message Speed:</source>
diff -Nru blackchocobo-1.9.900/lang/bchoco_re.ts blackchocobo-1.9.910/lang/bchoco_re.ts
--- blackchocobo-1.9.900/lang/bchoco_re.ts	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/lang/bchoco_re.ts	2018-12-29 20:35:46.000000000 +0000
@@ -57,182 +57,187 @@
     </message>
     <message>
         <location filename="../about.ui" line="213"/>
-        <source>New: Scaling support for HiDpi</source>
+        <source>New: Further Improve HiDpi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../about.ui" line="218"/>
-        <source>New: Psv Signing Place Keys in Options</source>
+        <source>Fixed: Track hex Editor&apos;s cursor on tab change.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../about.ui" line="223"/>
-        <source>New: Save/Restore Geometry for MainWindow and Options</source>
+        <source>ff7tk: Fixed Loading Psv file crashes host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../about.ui" line="228"/>
-        <source>New: Auto guess Slot location for VMC formats.</source>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../about.ui" line="233"/>
-        <source>Fixed: Menu Editor Backward Columns</source>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/17</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../about.ui" line="238"/>
-        <source>New: Achievement Editor.</source>
+        <source>ff7tk: Fixed https://github.com/sithlord48/ff7tk/issues/37</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../about.ui" line="243"/>
-        <source>FF7tk: LocationViewer Contains Field Items (Finished!)</source>
+        <source>ff7tk: Fixed Chocobo  pCount / Personality layout was overlapping Speed Notes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="252"/>
+        <location filename="../about.ui" line="248"/>
+        <source>ff7tk: Chocobo name not showing place holder text at right times</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../about.ui" line="257"/>
         <source>Credits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="258"/>
+        <location filename="../about.ui" line="263"/>
         <source>Giving Credit Where Credit is Due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="299"/>
+        <location filename="../about.ui" line="304"/>
         <source>Programmers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="318"/>
+        <location filename="../about.ui" line="323"/>
         <source>Almost All code and GUI design; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="349"/>
+        <location filename="../about.ui" line="354"/>
         <source>Various code help/debug; Windows QA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="380"/>
+        <location filename="../about.ui" line="385"/>
         <source>Psx Icon Class &amp; PC string convertor for japanese</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="416"/>
+        <location filename="../about.ui" line="421"/>
         <source>Bug Testers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="438"/>
+        <location filename="../about.ui" line="443"/>
         <source>Main Bug Tester, for win/gnome + ingame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="469"/>
+        <location filename="../about.ui" line="474"/>
         <source>Early Win32 Tester</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="500"/>
-        <location filename="../about.ui" line="531"/>
+        <location filename="../about.ui" line="505"/>
+        <location filename="../about.ui" line="536"/>
         <source>Mac Os Tester</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="562"/>
+        <location filename="../about.ui" line="567"/>
         <source>Windows Tester</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="598"/>
+        <location filename="../about.ui" line="603"/>
         <source>Translators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="613"/>
+        <location filename="../about.ui" line="618"/>
         <source>Spanish Translation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="644"/>
+        <location filename="../about.ui" line="649"/>
         <source>French Translation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="675"/>
+        <location filename="../about.ui" line="680"/>
         <source>Japanese Translation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="706"/>
+        <location filename="../about.ui" line="711"/>
         <source>German Translation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="752"/>
+        <location filename="../about.ui" line="757"/>
         <source>Icons Used In this Program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="781"/>
+        <location filename="../about.ui" line="786"/>
         <source>Buff Icons (and one or two more) by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="838"/>
+        <location filename="../about.ui" line="843"/>
         <source>Thanks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="853"/>
+        <location filename="../about.ui" line="858"/>
         <source>A Big Thank You  To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="884"/>
+        <location filename="../about.ui" line="889"/>
         <source>Thank you for providing the source to Jenova. This program uses modified versions of Jenova&apos;s savefile struct and Item/Materia lists. Access to its source code saved a lot of time during the early stages of development.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="903"/>
+        <location filename="../about.ui" line="908"/>
         <source>Thank you for all of your help with Black Chocobo. Translating, bug testing, helping with finding data in the savemap, theme testing, etc. You&apos;ve done a lot to help.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="922"/>
+        <location filename="../about.ui" line="927"/>
         <source>Thank you for the old checksum program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="941"/>
+        <location filename="../about.ui" line="946"/>
         <source>Thank you for helping me see the light of stupid errors.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="960"/>
+        <location filename="../about.ui" line="965"/>
         <source>Thank you for providing a better understanding of Qt&apos;s functions when the help files failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="979"/>
+        <location filename="../about.ui" line="984"/>
         <source>Cause she&apos;s just awesome!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.ui" line="1000"/>
+        <location filename="../about.ui" line="1005"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="31"/>
+        <location filename="../about.cpp" line="32"/>
         <source>Version: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../about.cpp" line="32"/>
+        <location filename="../about.cpp" line="33"/>
         <source>Using Qt: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -459,13 +464,13 @@
     </message>
     <message>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="59"/>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2284"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2288"/>
         <source>Fury</source>
         <translation>Anger</translation>
     </message>
     <message>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="60"/>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2285"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2289"/>
         <source>Sadness</source>
         <translation></translation>
     </message>
@@ -606,342 +611,340 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="575"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="577"/>
         <source>-NONE-</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="587"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="589"/>
         <source>Elemental Effects</source>
         <translation>Force Effects</translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="603"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="605"/>
         <source>Status Effects</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="826"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="830"/>
         <source>Weapon</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1039"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1043"/>
         <source>Armor</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1046"/>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2002"/>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2037"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1050"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2006"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2041"/>
         <source>Accessory</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1075"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1079"/>
         <source>Status Info</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1080"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1084"/>
         <source>Equipment</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1312"/>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2182"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1316"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2186"/>
         <source>Next: %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1335"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1339"/>
         <source>Young Cloud</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1336"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1340"/>
         <source>Sephiroth</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1911"/>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1956"/>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2401"/>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2422"/>
-        <source>AP:x%1</source>
-        <translation></translation>
-    </message>
-    <message>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="1915"/>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1959"/>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2005"/>
-        <source> Str:+%1</source>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1960"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2405"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2426"/>
+        <source>AP:x%1</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="1919"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="1963"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="2009"/>
-        <source> Vit:+%1</source>
+        <source> Str:+%1</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="1923"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="1967"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="2013"/>
-        <source> Dex:+%1</source>
-        <translation> Agi:+%1</translation>
+        <source> Vit:+%1</source>
+        <translation></translation>
     </message>
     <message>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="1927"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="1971"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="2017"/>
-        <source> Spi:+%1</source>
-        <translation> Int:+%1</translation>
+        <source> Dex:+%1</source>
+        <translation> Agi:+%1</translation>
     </message>
     <message>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="1931"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="1975"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="2021"/>
-        <source> Mag:+%1</source>
-        <translation></translation>
+        <source> Spi:+%1</source>
+        <translation> Int:+%1</translation>
     </message>
     <message>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="1935"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="1979"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="2025"/>
-        <source> Lck:+%1</source>
+        <source> Mag:+%1</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="1939"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="1983"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="2029"/>
-        <source> Hp:+%1%</source>
+        <source> Lck:+%1</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="1943"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="1987"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="2033"/>
+        <source> Hp:+%1%</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1947"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="1991"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2037"/>
         <source> Mp:+%1%</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2209"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2213"/>
         <source>Restoration</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2210"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2214"/>
         <source>Fire</source>
         <translation>Flame</translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2211"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2215"/>
         <source>Cold</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2212"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2216"/>
         <source>Lightning</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2213"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2217"/>
         <source>Earth</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2214"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2218"/>
         <source>Wind</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2215"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2219"/>
         <source>Water</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2216"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2220"/>
         <source>Gravity</source>
         <translation>Gravity</translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2217"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2221"/>
         <source>Holy</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2218"/>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2283"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2222"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2287"/>
         <source>Poison</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2219"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2223"/>
         <source>Cut</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2220"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2224"/>
         <source>Shoot</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2221"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2225"/>
         <source>Punch</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2222"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2226"/>
         <source>Hit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2226"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2230"/>
         <source>Absorb:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2227"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2231"/>
         <source>Nullify:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2228"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2232"/>
         <source>Halve:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2230"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2234"/>
         <source>Attack:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2272"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2276"/>
         <source>Death</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2273"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2277"/>
         <source>Slow-Numb</source>
         <translation>Gradual-Petrif.</translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2274"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2278"/>
         <source>D.Sentence</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2275"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2279"/>
         <source>Paralysis</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2276"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2280"/>
         <source>Petrify</source>
         <translation>Petrification</translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2277"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2281"/>
         <source>Silence</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2278"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2282"/>
         <source>Sleep</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2279"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2283"/>
         <source>Confusion</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2280"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2284"/>
         <source>Berserk</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2281"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2285"/>
         <source>Frog</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2282"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2286"/>
         <source>Mini</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2286"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2290"/>
         <source>Darkness</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2287"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2291"/>
         <source>Haste</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2288"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2292"/>
         <source>Slow</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2289"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2293"/>
         <source>Stop</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2290"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2294"/>
         <source>Barrier</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2291"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2295"/>
         <source>M.Barrier</source>
         <translation>Magic-Barrier</translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2292"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2296"/>
         <source>Reflect</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2293"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2297"/>
         <source>Shield</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2294"/>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2295"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2298"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2299"/>
         <source>Regen</source>
         <translation>Regenerate</translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2299"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2303"/>
         <source>Protect:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2300"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2304"/>
         <source>Remove:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2302"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2306"/>
         <source>Inflict:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2303"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2307"/>
         <source>OnBattle:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2368"/>
-        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2370"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="2372"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="2374"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="2376"/>
@@ -956,6 +959,8 @@
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="2394"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="2396"/>
         <location filename="../ff7tk/widgets/CharEditor.cpp" line="2398"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2400"/>
+        <location filename="../ff7tk/widgets/CharEditor.cpp" line="2402"/>
         <source>-Empty-</source>
         <translation></translation>
     </message>
@@ -1306,147 +1311,147 @@
 <context>
     <name>ChocoboEditor</name>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="267"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="268"/>
         <source>Unable To Mate</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="270"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="271"/>
         <source>Stamina</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="271"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="272"/>
         <source>Run Speed</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="275"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="276"/>
         <source>Sprint Speed</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="279"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="280"/>
         <source>Acceleration</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="280"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="281"/>
         <source>Races Won</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="281"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="282"/>
         <source>Cooperation</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="282"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="283"/>
         <source>pCount</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="283"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="284"/>
         <source>Intelligence</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="284"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="285"/>
         <source>Personality</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="285"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="286"/>
         <source>Choco Billy&apos;s Rating: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="288"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="289"/>
         <source>Name</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="324"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="325"/>
         <source>Empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="325"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="326"/>
         <source>Wonderful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="326"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="327"/>
         <source>Great</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="327"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="328"/>
         <source>Good</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="328"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="329"/>
         <source>Fair</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="329"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="330"/>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="330"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="331"/>
         <source>Poor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="331"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="332"/>
         <source>Bad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="332"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="333"/>
         <source>Terrible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="335"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="336"/>
         <source>Male %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="336"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="337"/>
         <source>Female %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="338"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="339"/>
         <source>Yellow</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="339"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="340"/>
         <source>Green</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="340"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="341"/>
         <source>Blue</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="341"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="342"/>
         <source>Black</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="342"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="343"/>
         <source>Gold</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="398"/>
+        <location filename="../ff7tk/widgets/ChocoboEditor.cpp" line="399"/>
         <source>Speed Values Are The Raw Values
 The km/h speeds are calculated while playing </source>
         <translation></translation>
@@ -1708,13 +1713,13 @@
         <location filename="../ff7tk/data/FF7Materia.h" line="169"/>
         <location filename="../ff7tk/data/FF7Materia.h" line="177"/>
         <source>[Fire]</source>
-        <translation>[Flame]</translation>
+        <translation type="unfinished">[Fire]</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="143"/>
         <location filename="../ff7tk/data/FF7Materia.h" line="168"/>
         <source>[Ice]</source>
-        <translation>[Cold]</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="144"/>
@@ -1769,7 +1774,7 @@
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="73"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="77"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="80"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="370"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="374"/>
         <source>Hi-Potion</source>
         <translation>High Potion</translation>
     </message>
@@ -1785,15 +1790,15 @@
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="83"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="89"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="269"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="312"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="313"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="314"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="316"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="317"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="318"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="320"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="321"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="322"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="367"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="324"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="325"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="326"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="371"/>
         <source>Potion</source>
         <translation></translation>
     </message>
@@ -1804,12 +1809,12 @@
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="137"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="144"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="271"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="300"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="326"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="369"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="375"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="412"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="415"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="304"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="330"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="373"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="379"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="416"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="419"/>
         <source>Ether</source>
         <translation></translation>
     </message>
@@ -1822,18 +1827,18 @@
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="145"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="153"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="216"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="294"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="297"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="348"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="359"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="371"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="387"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="390"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="398"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="483"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="484"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="494"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="511"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="298"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="301"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="352"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="363"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="375"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="391"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="394"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="402"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="487"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="488"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="498"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="515"/>
         <source>Elixir</source>
         <translation></translation>
     </message>
@@ -1844,13 +1849,13 @@
     </message>
     <message>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="85"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="400"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="424"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="436"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="458"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="404"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="428"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="440"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="462"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="489"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="508"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="466"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="493"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="512"/>
         <source>Mind Source</source>
         <translation></translation>
     </message>
@@ -1867,7 +1872,7 @@
     <message>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="90"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="126"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="315"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="319"/>
         <source>Phoenix Down</source>
         <translation>Phoenix Tail</translation>
     </message>
@@ -1915,8 +1920,8 @@
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="103"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="110"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="141"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="304"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="403"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="308"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="407"/>
         <source>X-Potion</source>
         <translation></translation>
     </message>
@@ -1926,16 +1931,16 @@
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="217"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="232"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="258"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="305"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="435"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="456"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="309"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="439"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="460"/>
         <source>Turbo Ether</source>
         <translation>Ether Turbo</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="105"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="303"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="502"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="307"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="506"/>
         <source>Vaccine</source>
         <translation></translation>
     </message>
@@ -1947,9 +1952,9 @@
     <message>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="108"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="283"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="295"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="393"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="467"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="299"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="397"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="471"/>
         <source>Speed Source</source>
         <translation></translation>
     </message>
@@ -1962,13 +1967,13 @@
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="112"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="214"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="219"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="465"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="469"/>
         <source>Luck Source</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="113"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="500"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="504"/>
         <source>Remedy</source>
         <translation>Panacea</translation>
     </message>
@@ -2005,8 +2010,8 @@
     <message>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="122"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="276"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="330"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="411"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="334"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="415"/>
         <source>Enemy Skill</source>
         <translation></translation>
     </message>
@@ -2017,11 +2022,11 @@
     </message>
     <message>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="128"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="339"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="389"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="413"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="485"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="499"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="343"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="393"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="417"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="489"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="503"/>
         <source>Magic Source</source>
         <translation></translation>
     </message>
@@ -2030,7 +2035,7 @@
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="205"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="245"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="270"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="349"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="353"/>
         <source>All</source>
         <translation></translation>
     </message>
@@ -2057,7 +2062,7 @@
     <message>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="146"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="151"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="423"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="427"/>
         <source>HP Absorb</source>
         <translation></translation>
     </message>
@@ -2123,16 +2128,16 @@
     </message>
     <message>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="200"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="325"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="363"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="385"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="386"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="395"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="396"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="418"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="442"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="480"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="495"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="329"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="367"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="389"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="390"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="399"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="400"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="422"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="446"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="484"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="499"/>
         <source>Megalixir</source>
         <translation>Last Elixir</translation>
     </message>
@@ -2198,152 +2203,162 @@
     </message>
     <message>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="292"/>
+        <source>Final Heaven (+other stuff?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="294"/>
+        <source>Elemental(+other stuff?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="296"/>
         <source>Enhance Sword</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="293"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="297"/>
         <source>Fire Armlet</source>
         <translation>Inferno Bracelet</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="296"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="300"/>
         <source>Javelin</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="298"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="446"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="302"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="450"/>
         <source>Ribbon</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="301"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="305"/>
         <source>Catastrophe</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="302"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="309"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="501"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="509"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="306"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="313"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="505"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="513"/>
         <source>Hero Drink</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="307"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="311"/>
         <source>Neo Bahamut</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="308"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="312"/>
         <source>Poison Ring</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="310"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="314"/>
         <source>MP Turbo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="316"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="320"/>
         <source>Poison</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="323"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="327"/>
         <source>Bolt Armlet</source>
         <translation>Thunder Bracelet</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="324"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="328"/>
         <source>HypnoCrown</source>
         <translation>Hypno Crown</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="327"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="331"/>
         <source>Kujata</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="329"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="333"/>
         <source>Destruct</source>
         <translation>Extinguish</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="331"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="335"/>
         <source>Odin</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="332"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="504"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="336"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="508"/>
         <source>Counter</source>
         <translation>Command Counter</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="333"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="337"/>
         <source>Magic Plus</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="335"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="339"/>
         <source>Steal</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="336"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="340"/>
         <source>Twin Viper</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="337"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="341"/>
         <source>Silver M-phone</source>
         <translation>Silver Megaphone</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="338"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="342"/>
         <source>Enemy Launcher</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="340"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="344"/>
         <source>Buntline</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="341"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="345"/>
         <source>Aurora Armlet</source>
         <translation>Aurora Bracelet</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="342"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="346"/>
         <source>Viper Halberd</source>
         <translation>She Mao</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="344"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="348"/>
         <source>Rune Blade</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="345"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="349"/>
         <source>Plus Barrette</source>
         <translation>Platinum Barrette</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="346"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="350"/>
         <source>Powersoul</source>
         <translation>Oversoul</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="347"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="351"/>
         <source>Sniper CR</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="253"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="350"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="354"/>
         <source>Elemental</source>
         <translation>Force</translation>
     </message>
@@ -2667,365 +2682,365 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="352"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="397"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="405"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="451"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="459"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="356"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="401"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="409"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="455"/>
         <location filename="../ff7tk/data/FF7FieldItemList.h" line="463"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="490"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="496"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="467"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="494"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="500"/>
         <source>Power Source</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="353"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="357"/>
         <source>Water Ring</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="354"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="358"/>
         <source>Typhon</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="355"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="359"/>
         <source>Supershot ST</source>
         <translation>Highbrow ST</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="356"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="360"/>
         <source>Slash-All</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="357"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="361"/>
         <source>Minerva Band</source>
         <translation>Minerva Bracelet</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="358"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="362"/>
         <source>Apocalypse</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="361"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="365"/>
         <source>Spring Gun Clip</source>
         <translation>Spriggan Clip</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="362"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="366"/>
         <source>Mop</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="364"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="368"/>
         <source>KeyItem: Key To Sector 5</source>
         <translation>KeyItem: District 5 Gate Key</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="470"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="474"/>
         <source>KeyItem: Leviathan Scales</source>
         <translation>KeyItem: Scales of Levathan</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="487"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="491"/>
         <source>KeyItem: Huge Materia:Rocket</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="366"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="425"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="460"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="370"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="429"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="464"/>
         <source>Tent</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="372"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="376"/>
         <source>Long Range</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="373"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="377"/>
         <source>Titan</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="376"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="380"/>
         <source>Comet</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="377"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="381"/>
         <source>Deathblow</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="378"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="382"/>
         <source>Hades</source>
         <translation>Hades</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="379"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="383"/>
         <source>Outsider</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="380"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="384"/>
         <source>Escort Guard</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="381"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="385"/>
         <source>Conformer</source>
         <translation>Eternal Nemesis</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="382"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="386"/>
         <source>Spirit Lance</source>
         <translation>Longinus</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="384"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="388"/>
         <source>Heaven&apos;s Cloud</source>
         <translation>Ama no Murakumo</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="388"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="399"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="414"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="417"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="420"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="464"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="491"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="498"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="392"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="403"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="418"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="421"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="424"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="468"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="495"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="502"/>
         <source>Guard Source</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="391"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="492"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="395"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="496"/>
         <source>Mystile</source>
         <translation>Mystère</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="394"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="398"/>
         <source>Tetra Elemental</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="402"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="406"/>
         <source>White M-phone</source>
         <translation>White Megaphone</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="404"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="408"/>
         <source>Drill Arm</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="406"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="410"/>
         <source>Yoshiyuki</source>
         <translation>Mutsunokami Yoshiyuki</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="407"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="411"/>
         <source>Venus Gospel</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="408"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="412"/>
         <source>Save Crystal</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="409"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="413"/>
         <source>Peacemaker</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="416"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="420"/>
         <source>Fourth Bracelet</source>
         <translation>Force Bracelet</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="421"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="425"/>
         <source>Double Cut</source>
         <translation>Consecutive Cut</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="422"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="426"/>
         <source>Highwind</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="427"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="431"/>
         <source>Show Underwater</source>
         <translation>Show Diving</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="428"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="432"/>
         <source>Show Master Command</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="429"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="433"/>
         <source>Show Master Magic</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="430"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="434"/>
         <source>Show Master Summon</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="431"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="435"/>
         <source>Show Gold Chocobo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="433"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="437"/>
         <source>Morph</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="434"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="438"/>
         <source>Luck Plus</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="439"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="443"/>
         <source>Princess Guard</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="440"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="444"/>
         <source>Trumpet Shell</source>
         <translation>Triton Trumpet</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="443"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="447"/>
         <source>Bahamut</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="444"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="448"/>
         <source>Trident</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="445"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="449"/>
         <source>Rocket Punch</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="447"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="451"/>
         <source>Silver Rifle</source>
         <translation>BB Gun</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="449"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="453"/>
         <source>Motor Drive</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="450"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="454"/>
         <source>Fire Ring</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="452"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="456"/>
         <source>Purchased The House</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="454"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="458"/>
         <source>W Machine Gun</source>
         <translation>Machine Gun</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="455"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="459"/>
         <source>Transform</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="466"/>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="468"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="470"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="472"/>
         <source>1/35 soldier</source>
         <translation>1:35 Soldier</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="471"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="475"/>
         <source>Steal-As-Well</source>
         <translation>Added Steal</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="472"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="476"/>
         <source>Dragoon Lance</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="473"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="477"/>
         <source>W-Item</source>
         <translation>Double Item</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="474"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="478"/>
         <source>Max Ray</source>
         <translation>Maximum Ray</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="475"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="479"/>
         <source>Aegis Armlet</source>
         <translation>Aegis Bracelet</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="476"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="480"/>
         <source>Scimitar</source>
         <translation>Qing Long</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="478"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="482"/>
         <source>Battle Trumpet</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="479"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="483"/>
         <source>Leviathan</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="481"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="485"/>
         <source>Oritsuru</source>
         <translation>Orizuru</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="482"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="486"/>
         <source>Starlight Phone</source>
         <translation>Starlight Megaphone</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="493"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="497"/>
         <source>Missing Score</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="503"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="507"/>
         <source>Shield</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="505"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="509"/>
         <source>W-Magic</source>
         <translation>Double Magic</translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="507"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="511"/>
         <source>Imperial Guard</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="512"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="516"/>
         <source>Contain</source>
         <translation>Forbidden</translation>
     </message>
@@ -3033,13 +3048,13 @@
 <context>
     <name>ItemList</name>
     <message>
-        <location filename="../ff7tk/widgets/ItemList.cpp" line="152"/>
-        <location filename="../ff7tk/widgets/ItemList.cpp" line="240"/>
+        <location filename="../ff7tk/widgets/ItemList.cpp" line="160"/>
+        <location filename="../ff7tk/widgets/ItemList.cpp" line="202"/>
         <source>-------EMPTY--------</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/ItemList.cpp" line="249"/>
+        <location filename="../ff7tk/widgets/ItemList.cpp" line="211"/>
         <source>-------BAD ID-------</source>
         <translation></translation>
     </message>
@@ -3291,7 +3306,7 @@
 <context>
     <name>ItemSelector</name>
     <message>
-        <location filename="../ff7tk/widgets/ItemSelector.cpp" line="39"/>
+        <location filename="../ff7tk/widgets/ItemSelector.cpp" line="43"/>
         <source>Empty Item</source>
         <translation></translation>
     </message>
@@ -4039,7 +4054,7 @@
 <context>
     <name>Items</name>
     <message>
-        <location filename="../ff7tk/data/FF7FieldItemList.h" line="368"/>
+        <location filename="../ff7tk/data/FF7FieldItemList.h" line="372"/>
         <location filename="../ff7tk/data/FF7Item.h" line="600"/>
         <source>Ether</source>
         <translation></translation>
@@ -4277,7 +4292,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Item.h" line="688"/>
         <source>Holy Torch</source>
-        <translation>Holy Touch</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Item.h" line="690"/>
@@ -4317,7 +4332,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Item.h" line="704"/>
         <source>8-inch Cannon</source>
-        <translation>203mm Shells</translation>
+        <translation>203mm Shell</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Item.h" line="706"/>
@@ -4472,7 +4487,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Item.h" line="766"/>
         <source>Tissue</source>
-        <translation>Pocket Tissue</translation>
+        <translation>Pocket Tissues</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Item.h" line="768"/>
@@ -4517,7 +4532,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Item.h" line="784"/>
         <source>1/35 soldier</source>
-        <translation>1:35 Solider</translation>
+        <translation>1:35 Soldier</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Item.h" line="786"/>
@@ -4844,7 +4859,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Item.h" line="932"/>
         <source>Silver Barrette</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Item.h" line="934"/>
@@ -5059,7 +5074,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Item.h" line="1021"/>
         <source>Wind Slash</source>
-        <translation></translation>
+        <translation>Kazekiri</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Item.h" line="1023"/>
@@ -5561,7 +5576,7 @@
     </message>
     <message>
         <location filename="../ff7tk/widgets/LocationViewer.cpp" line="71"/>
-        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="143"/>
+        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="140"/>
         <source>Location Name</source>
         <translation></translation>
     </message>
@@ -5591,42 +5606,42 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="149"/>
+        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="146"/>
         <source>MapID: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="155"/>
+        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="152"/>
         <source>LocID: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="159"/>
+        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="156"/>
         <source>X: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="166"/>
+        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="163"/>
         <source>Y: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="173"/>
+        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="170"/>
         <source>T: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="180"/>
+        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="177"/>
         <source>D: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="185"/>
+        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="182"/>
         <source>Save &amp;Location Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="199"/>
+        <location filename="../ff7tk/widgets/LocationViewer.cpp" line="196"/>
         <source>Field Items</source>
         <translation></translation>
     </message>
@@ -7310,81 +7325,81 @@
     <name>MainWindow</name>
     <message>
         <location filename="../mainwindow.ui" line="14"/>
-        <location filename="../mainwindow.cpp" line="480"/>
-        <location filename="../mainwindow.cpp" line="540"/>
-        <location filename="../mainwindow.cpp" line="541"/>
-        <location filename="../mainwindow.cpp" line="2830"/>
-        <location filename="../mainwindow.cpp" line="3035"/>
+        <location filename="../mainwindow.cpp" line="485"/>
+        <location filename="../mainwindow.cpp" line="547"/>
+        <location filename="../mainwindow.cpp" line="548"/>
+        <location filename="../mainwindow.cpp" line="2776"/>
+        <location filename="../mainwindow.cpp" line="2981"/>
         <source>Black Chocobo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="47"/>
+        <location filename="../mainwindow.ui" line="32"/>
         <source>Party</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="113"/>
+        <location filename="../mainwindow.ui" line="98"/>
         <source>In Party</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="606"/>
+        <location filename="../mainwindow.ui" line="591"/>
         <source>Money</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="638"/>
+        <location filename="../mainwindow.ui" line="623"/>
         <source>Gil</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="680"/>
+        <location filename="../mainwindow.ui" line="668"/>
         <source>GP</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="720"/>
-        <location filename="../mainwindow.ui" line="743"/>
+        <location filename="../mainwindow.ui" line="708"/>
+        <location filename="../mainwindow.ui" line="737"/>
         <source>Battles</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="776"/>
-        <source>Runs</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="206"/>
+        <location filename="../mainwindow.ui" line="191"/>
         <source>Click On A Char To edit ===========&gt;</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="323"/>
+        <location filename="../mainwindow.ui" line="308"/>
         <source>Selected Character Max Stats/Weapons/Materia</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="475"/>
+        <location filename="../mainwindow.ui" line="460"/>
         <source>Items</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="499"/>
+        <location filename="../mainwindow.ui" line="484"/>
         <source>Inventory</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="547"/>
+        <location filename="../mainwindow.ui" line="532"/>
         <source>Add Max Of All Items</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="560"/>
+        <location filename="../mainwindow.ui" line="545"/>
         <source>Clear All Items</source>
         <translation></translation>
     </message>
     <message>
+        <location filename="../mainwindow.ui" line="776"/>
+        <source>Escapes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../mainwindow.ui" line="807"/>
         <source>Turtle Paradise Flyers Collected</source>
         <translation></translation>
@@ -7417,7 +7432,7 @@
     <message>
         <location filename="../mainwindow.ui" line="895"/>
         <location filename="../mainwindow.ui" line="989"/>
-        <location filename="../mainwindow.ui" line="4670"/>
+        <location filename="../mainwindow.ui" line="4556"/>
         <source>Materia</source>
         <translation></translation>
     </message>
@@ -7428,7 +7443,7 @@
     </message>
     <message>
         <location filename="../mainwindow.ui" line="994"/>
-        <location filename="../mainwindow.ui" line="4675"/>
+        <location filename="../mainwindow.ui" line="4561"/>
         <source>AP</source>
         <translation></translation>
     </message>
@@ -7458,603 +7473,586 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1222"/>
+        <location filename="../mainwindow.ui" line="1201"/>
         <source>Visible On World Map</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1278"/>
-        <location filename="../mainwindow.ui" line="2021"/>
+        <location filename="../mainwindow.ui" line="1257"/>
+        <location filename="../mainwindow.ui" line="1982"/>
         <source>Buggy</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1291"/>
+        <location filename="../mainwindow.ui" line="1270"/>
         <source>Tiny bronco</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1304"/>
-        <location filename="../mainwindow.ui" line="2026"/>
+        <location filename="../mainwindow.ui" line="1283"/>
+        <location filename="../mainwindow.ui" line="1987"/>
         <source>Highwind</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1317"/>
+        <location filename="../mainwindow.ui" line="1296"/>
         <source>Wild chocobo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1354"/>
+        <location filename="../mainwindow.ui" line="1333"/>
         <source>Yellow chocobo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1370"/>
+        <location filename="../mainwindow.ui" line="1349"/>
         <source>Green chocobo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1386"/>
+        <location filename="../mainwindow.ui" line="1365"/>
         <source>Blue chocobo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1402"/>
+        <location filename="../mainwindow.ui" line="1381"/>
         <source>Black chocobo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1418"/>
+        <location filename="../mainwindow.ui" line="1397"/>
         <source>Gold chocobo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1439"/>
+        <location filename="../mainwindow.ui" line="1412"/>
         <source>Party leader</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1496"/>
-        <location filename="../mainwindow.ui" line="1687"/>
-        <location filename="../mainwindow.ui" line="1894"/>
-        <location filename="../mainwindow.ui" line="2118"/>
-        <location filename="../mainwindow.ui" line="2325"/>
-        <location filename="../mainwindow.ui" line="2532"/>
-        <location filename="../mainwindow.ui" line="6316"/>
+        <location filename="../mainwindow.ui" line="1469"/>
+        <location filename="../mainwindow.ui" line="1654"/>
+        <location filename="../mainwindow.ui" line="1855"/>
+        <location filename="../mainwindow.ui" line="2073"/>
+        <location filename="../mainwindow.ui" line="2274"/>
+        <location filename="../mainwindow.ui" line="2475"/>
+        <location filename="../mainwindow.ui" line="6181"/>
         <source>Y: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1545"/>
-        <location filename="../mainwindow.ui" line="1742"/>
-        <location filename="../mainwindow.ui" line="1952"/>
-        <location filename="../mainwindow.ui" line="2173"/>
-        <location filename="../mainwindow.ui" line="2380"/>
-        <location filename="../mainwindow.ui" line="2587"/>
+        <location filename="../mainwindow.ui" line="1518"/>
+        <location filename="../mainwindow.ui" line="1709"/>
+        <location filename="../mainwindow.ui" line="1913"/>
+        <location filename="../mainwindow.ui" line="2128"/>
+        <location filename="../mainwindow.ui" line="2329"/>
+        <location filename="../mainwindow.ui" line="2530"/>
         <source>angle</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1630"/>
+        <location filename="../mainwindow.ui" line="1597"/>
         <source>Tiny Bronco / Chocobo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1790"/>
-        <location filename="../mainwindow.ui" line="2221"/>
-        <location filename="../mainwindow.ui" line="2428"/>
-        <location filename="../mainwindow.ui" line="2635"/>
+        <location filename="../mainwindow.ui" line="1757"/>
+        <location filename="../mainwindow.ui" line="2176"/>
+        <location filename="../mainwindow.ui" line="2377"/>
+        <location filename="../mainwindow.ui" line="2578"/>
         <source>id</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1837"/>
+        <location filename="../mainwindow.ui" line="1798"/>
         <source>Buggy / Highwind</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2016"/>
+        <location filename="../mainwindow.ui" line="1977"/>
         <source>None</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2061"/>
-        <location filename="../mainwindow.ui" line="2871"/>
+        <location filename="../mainwindow.ui" line="2016"/>
+        <location filename="../mainwindow.ui" line="2814"/>
         <source>Sub</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2268"/>
-        <location filename="../mainwindow.ui" line="2876"/>
+        <location filename="../mainwindow.ui" line="2217"/>
+        <location filename="../mainwindow.ui" line="2819"/>
         <source>Wild Chocobo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2475"/>
+        <location filename="../mainwindow.ui" line="2418"/>
         <source>Diamond / Ultimate / Ruby  Weapon</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2842"/>
+        <location filename="../mainwindow.ui" line="2785"/>
         <source>sliders show </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2856"/>
+        <location filename="../mainwindow.ui" line="2799"/>
         <source>Party Leader</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2861"/>
+        <location filename="../mainwindow.ui" line="2804"/>
         <source>TinyBronco/Chocobo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2866"/>
+        <location filename="../mainwindow.ui" line="2809"/>
         <source>Buggy/Highwind</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2881"/>
+        <location filename="../mainwindow.ui" line="2824"/>
         <source>Diamond / Ultimate / Ruby Weapon</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2914"/>
+        <location filename="../mainwindow.ui" line="2857"/>
         <source>Game Progress</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2925"/>
+        <location filename="../mainwindow.ui" line="2868"/>
         <source>Global Progress</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2943"/>
+        <location filename="../mainwindow.ui" line="2886"/>
         <source>Main Progression</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2988"/>
+        <location filename="../mainwindow.ui" line="2931"/>
         <source>Disc  #</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3020"/>
+        <location filename="../mainwindow.ui" line="2963"/>
         <source>Event Progress</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3065"/>
+        <location filename="../mainwindow.ui" line="3008"/>
         <source>Bombing Mission Progress</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3083"/>
+        <location filename="../mainwindow.ui" line="3026"/>
         <source>Bombing Mission Start Flag</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3090"/>
+        <location filename="../mainwindow.ui" line="3033"/>
         <source>Elevator Door Open</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3097"/>
+        <location filename="../mainwindow.ui" line="3040"/>
         <source>Elevator On 2nd Floor</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3104"/>
+        <location filename="../mainwindow.ui" line="3047"/>
         <source>1st Door Open</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3111"/>
+        <location filename="../mainwindow.ui" line="3054"/>
         <source>2nd Door Opened</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3118"/>
+        <location filename="../mainwindow.ui" line="3061"/>
         <source>Post Pan NMKIN_5</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3125"/>
+        <location filename="../mainwindow.ui" line="3068"/>
         <source>The Bomb Was Set</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3132"/>
         <source>Jesse Has Been Unstuck</source>
-        <translation>Jessie Has Been Unstuck</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="3139"/>
-        <source>Trigger Game Over (countdown timer out)</source>
-        <translation></translation>
+        <translation type="vanished">Jessie Has Been Unstuck</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3149"/>
+        <location filename="../mainwindow.ui" line="3092"/>
         <source>Escape From Reactor </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3161"/>
+        <location filename="../mainwindow.ui" line="3104"/>
         <source>Post Pan MD8_2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3168"/>
+        <location filename="../mainwindow.ui" line="3111"/>
         <source>Post Electrical Effect MD8_3</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3178"/>
+        <location filename="../mainwindow.ui" line="3121"/>
         <source>Midgar Train Flags</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3190"/>
+        <location filename="../mainwindow.ui" line="3133"/>
         <source>Talked to Biggs</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3197"/>
+        <location filename="../mainwindow.ui" line="3140"/>
         <source>Talked to Wedge Twice</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3204"/>
         <source>Talked to Jesse Before Looking At Map</source>
-        <translation>Talked to Jessie Before Looking At Map</translation>
+        <translation type="vanished">Talked to Jessie Before Looking At Map</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3211"/>
+        <location filename="../mainwindow.ui" line="3154"/>
         <source> Played Video on Train?</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3221"/>
+        <location filename="../mainwindow.ui" line="3164"/>
         <source>Sector 7 Trainstation</source>
         <translation>District 7 Trainstation</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3233"/>
-        <source>Team Avalanche had meeting after Bombing Mission</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="3240"/>
+        <location filename="../mainwindow.ui" line="3183"/>
         <source>Talked To Trainman 3 times</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3247"/>
+        <location filename="../mainwindow.ui" line="3190"/>
         <source>Pair At Station agree</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3254"/>
+        <location filename="../mainwindow.ui" line="3197"/>
         <source>Set To Reactor 5 Mode</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3264"/>
+        <location filename="../mainwindow.ui" line="3207"/>
         <source>Sector 7 Pillar</source>
         <translation>District 7 Pillar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3276"/>
-        <source>Team Avalanche Has Run To Hideout</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="3283"/>
+        <location filename="../mainwindow.ui" line="3226"/>
         <source>Can Show Pillar Pan Video</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3290"/>
+        <location filename="../mainwindow.ui" line="3233"/>
         <source>Barret called us</source>
         <translation>Barrett called us</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3297"/>
+        <location filename="../mainwindow.ui" line="3240"/>
         <source>Post Pillar Pan Video</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3304"/>
+        <location filename="../mainwindow.ui" line="3247"/>
         <source>Talked To soldier two times</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3314"/>
+        <location filename="../mainwindow.ui" line="3257"/>
         <source>Sector 7 - Slums Progress</source>
         <translation>District 7 - Slums Progress</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3332"/>
+        <location filename="../mainwindow.ui" line="3275"/>
         <source>Initial Settings</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3337"/>
+        <location filename="../mainwindow.ui" line="3280"/>
         <source>Destroy the Sector 5 Reactor </source>
         <translation>Destroy the District 5 Reactor </translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3342"/>
+        <location filename="../mainwindow.ui" line="3285"/>
         <source>The Plate is Falling</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3353"/>
         <source>Sector 5</source>
-        <translation>District 5</translation>
+        <translation type="vanished">District 5</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3365"/>
         <source>Talked with Sick Man</source>
-        <translation>Talked with Scruff Man</translation>
+        <translation type="vanished">Talked with Scruff Man</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3372"/>
         <source>Aeris Talked About Sick Man</source>
-        <translation>Aerith Talked About Sick Man</translation>
+        <translation type="vanished">Aerith Talked About Sick Man</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3379"/>
         <source>After Aeris Church Scene</source>
-        <translation>After Aerith Church Scene</translation>
+        <translation type="vanished">After Aerith Church Scene</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3389"/>
+        <location filename="../mainwindow.ui" line="3296"/>
         <source>Unknowns / Unused</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3417"/>
+        <location filename="../mainwindow.ui" line="3324"/>
         <source>DonProgress</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3608"/>
-        <source>cb_s5_1</source>
-        <translation></translation>
+        <location filename="../mainwindow.ui" line="3548"/>
+        <source>Set Replay Mission below to set the game back to that mission. This will automatically set your save location and disc # as well as Quest Progression vars. DO NOT OVERWRITE YOUR CURRENT SAVE when using this feature; I cannot promise that you will be able to play from any replay until the end of the game, or that any given replay will work in your save. This feature is still under development.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3615"/>
-        <source>cb_s5_2</source>
-        <translation></translation>
+        <location filename="../mainwindow.ui" line="3620"/>
+        <source>Apply Selected Replay </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3622"/>
-        <source>cb_s5_5</source>
-        <translation></translation>
+        <location filename="../mainwindow.ui" line="3701"/>
+        <source>Ho&amp;ur</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3662"/>
-        <source>Set Replay Mission below to set the game back to that mission. This will automatically set your save location and disc # as well as Quest Progression vars. DO NOT OVERWRITE YOUR CURRENT SAVE when using this feature; I cannot promise that you will be able to play from any replay until the end of the game, or that any given replay will work in your save. This feature is still under development.</source>
+        <location filename="../mainwindow.ui" line="4082"/>
+        <source>Unlocked Vincent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3734"/>
-        <source>Apply Selected Replay </source>
+        <location filename="../mainwindow.ui" line="4089"/>
+        <source>Unlocked Yuffie </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4196"/>
-        <source>Unlocked Vincent</source>
+        <location filename="../mainwindow.ui" line="4213"/>
+        <source>Number of Steps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4203"/>
-        <source>Unlocked Yuffie </source>
+        <location filename="../mainwindow.ui" line="4616"/>
+        <source>Snowboard Mini Game </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="5545"/>
+        <source>G-Bi&amp;ke High Score</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5694"/>
+        <location filename="../mainwindow.ui" line="5580"/>
         <source>Have Won the Submarine Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7185"/>
+        <location filename="../mainwindow.ui" line="7050"/>
         <source>He&amp;lp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7210"/>
+        <location filename="../mainwindow.ui" line="7075"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7226"/>
+        <location filename="../mainwindow.ui" line="7091"/>
         <source>&amp;Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7241"/>
+        <location filename="../mainwindow.ui" line="7106"/>
         <source>&amp;Slot Region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7316"/>
+        <location filename="../mainwindow.ui" line="7181"/>
         <source>Sa&amp;ve As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7331"/>
+        <location filename="../mainwindow.ui" line="7196"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7352"/>
+        <location filename="../mainwindow.ui" line="7217"/>
         <source>&amp;Show Selection Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7418"/>
+        <location filename="../mainwindow.ui" line="7283"/>
         <source>&amp;Previous Slot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7436"/>
+        <location filename="../mainwindow.ui" line="7301"/>
         <source>&amp;Next Slot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7459"/>
+        <location filename="../mainwindow.ui" line="7324"/>
         <source>&amp;More Options...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7481"/>
+        <location filename="../mainwindow.ui" line="7346"/>
         <source>Uk &amp;English (PAL)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7492"/>
+        <location filename="../mainwindow.ui" line="7357"/>
         <source>&amp;German (PAL)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7503"/>
+        <location filename="../mainwindow.ui" line="7368"/>
         <source>&amp;Spanish (PAL)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7517"/>
+        <location filename="../mainwindow.ui" line="7382"/>
         <source>&amp;Japanese (NTSC-J)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7520"/>
+        <location filename="../mainwindow.ui" line="7385"/>
         <source>Japanese (NTSC-J)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7531"/>
+        <location filename="../mainwindow.ui" line="7396"/>
         <source>&amp;International (NTSC-J)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7534"/>
+        <location filename="../mainwindow.ui" line="7399"/>
         <source>International (NTSC-J)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7564"/>
+        <location filename="../mainwindow.ui" line="7429"/>
         <source>New &amp;Game+ </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7614"/>
+        <location filename="../mainwindow.ui" line="7479"/>
         <source>&amp;Calculate Stats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7626"/>
+        <location filename="../mainwindow.ui" line="7491"/>
         <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7640"/>
+        <location filename="../mainwindow.ui" line="7505"/>
         <source>&amp;French (PAL)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7652"/>
+        <location filename="../mainwindow.ui" line="7517"/>
         <source>&amp;Create Cloud Save Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7673"/>
+        <location filename="../mainwindow.ui" line="7538"/>
         <source>Open Achievement &amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3672"/>
+        <location filename="../mainwindow.ui" line="3558"/>
         <source>Replay Mission</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3690"/>
+        <location filename="../mainwindow.ui" line="3576"/>
         <source>Bombing Mission</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3695"/>
+        <location filename="../mainwindow.ui" line="3581"/>
         <source>The Church In The Slums</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3700"/>
+        <location filename="../mainwindow.ui" line="3586"/>
         <source>Cloud&apos;s Flashback</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3705"/>
+        <location filename="../mainwindow.ui" line="3591"/>
         <source>The Date Scene</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3710"/>
+        <location filename="../mainwindow.ui" line="3596"/>
         <source>Aeris Death</source>
         <translation>Aerith&apos;s Death</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3763"/>
+        <location filename="../mainwindow.ui" line="3649"/>
         <source>Other</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3789"/>
+        <location filename="../mainwindow.ui" line="3675"/>
         <source>Time Played</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3815"/>
-        <location filename="../mainwindow.ui" line="4379"/>
+        <location filename="../mainwindow.ui" line="4265"/>
         <source>Hour</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3851"/>
-        <location filename="../mainwindow.ui" line="4418"/>
+        <location filename="../mainwindow.ui" line="3737"/>
+        <location filename="../mainwindow.ui" line="4304"/>
         <source>Min</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3884"/>
-        <location filename="../mainwindow.ui" line="4463"/>
+        <location filename="../mainwindow.ui" line="3770"/>
+        <location filename="../mainwindow.ui" line="4349"/>
         <source>Sec</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3915"/>
+        <location filename="../mainwindow.ui" line="3801"/>
         <source>Love Points</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4162"/>
+        <location filename="../mainwindow.ui" line="4048"/>
         <source>Beat Ruby Weapon</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4169"/>
+        <location filename="../mainwindow.ui" line="4055"/>
         <source>Beat Emerald Weapon</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4189"/>
+        <location filename="../mainwindow.ui" line="4075"/>
         <source>Can Fight Mystery Ninja in Forests</source>
         <translation>Can Fight Mysterious Ninja in Forests</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4176"/>
+        <location filename="../mainwindow.ui" line="4062"/>
         <source>Have Seen Pandora&apos;s Box</source>
         <translation>Have Seen Enigma</translation>
     </message>
@@ -8074,48 +8072,48 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4356"/>
+        <location filename="../mainwindow.ui" line="4242"/>
         <source>Countdown Timer</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5474"/>
+        <location filename="../mainwindow.ui" line="5360"/>
         <source>Fort Condor</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5500"/>
+        <location filename="../mainwindow.ui" line="5386"/>
         <source>Funds </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5536"/>
+        <location filename="../mainwindow.ui" line="5422"/>
         <source>Record </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5583"/>
+        <location filename="../mainwindow.ui" line="5469"/>
         <source>/</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4587"/>
+        <location filename="../mainwindow.ui" line="4473"/>
         <source>Cait Sith and Vincent should not be enabled if they are disabled in the Party tab.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4609"/>
+        <location filename="../mainwindow.ui" line="4495"/>
         <source>Materia Stolen By Yuffie</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4683"/>
+        <location filename="../mainwindow.ui" line="4569"/>
         <source>Clear All Stolen Materia</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4253"/>
-        <location filename="../mainwindow.ui" line="4272"/>
+        <location filename="../mainwindow.ui" line="4139"/>
+        <location filename="../mainwindow.ui" line="4158"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Resets
 When you Pass thru Battle Square&apos;s Door Set Location To &amp;quot;Arena
 Lobby&amp;quot; so you can spend
@@ -8123,362 +8121,377 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6272"/>
+        <location filename="../mainwindow.ui" line="3075"/>
+        <source>Jessie Has Been Unstuck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3082"/>
+        <source>Trigger Game Over (countdown reached 0)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3147"/>
+        <source>Talked to Jessie Before Looking At Map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3176"/>
+        <source>Avalanche had meeting after Bombing Mission</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3219"/>
+        <source>Avalanche Has Run To Hideout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="6137"/>
         <source>Save Point Location In North Crater</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6363"/>
+        <location filename="../mainwindow.ui" line="6228"/>
         <source>Region String</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6427"/>
+        <location filename="../mainwindow.ui" line="6292"/>
         <source>S01</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6432"/>
+        <location filename="../mainwindow.ui" line="6297"/>
         <source>S02</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6437"/>
+        <location filename="../mainwindow.ui" line="6302"/>
         <source>S03</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6442"/>
+        <location filename="../mainwindow.ui" line="6307"/>
         <source>S04</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6447"/>
+        <location filename="../mainwindow.ui" line="6312"/>
         <source>S05</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6452"/>
+        <location filename="../mainwindow.ui" line="6317"/>
         <source>S06</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6457"/>
+        <location filename="../mainwindow.ui" line="6322"/>
         <source>S07</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6462"/>
+        <location filename="../mainwindow.ui" line="6327"/>
         <source>S08</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6467"/>
+        <location filename="../mainwindow.ui" line="6332"/>
         <source>S09</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6472"/>
+        <location filename="../mainwindow.ui" line="6337"/>
         <source>S10</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6477"/>
+        <location filename="../mainwindow.ui" line="6342"/>
         <source>S11</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6482"/>
+        <location filename="../mainwindow.ui" line="6347"/>
         <source>S12</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6487"/>
+        <location filename="../mainwindow.ui" line="6352"/>
         <source>S13</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6492"/>
+        <location filename="../mainwindow.ui" line="6357"/>
         <source>S14</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6497"/>
+        <location filename="../mainwindow.ui" line="6362"/>
         <source>S15</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4730"/>
-        <source>SnowBoard Mini Game </source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="4751"/>
+        <location filename="../mainwindow.ui" line="4637"/>
         <source>Beginner Course</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4777"/>
-        <location filename="../mainwindow.ui" line="4929"/>
-        <location filename="../mainwindow.ui" line="5081"/>
+        <location filename="../mainwindow.ui" line="4663"/>
+        <location filename="../mainwindow.ui" line="4815"/>
+        <location filename="../mainwindow.ui" line="4967"/>
         <source>Time:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4809"/>
-        <location filename="../mainwindow.ui" line="4961"/>
-        <location filename="../mainwindow.ui" line="5113"/>
+        <location filename="../mainwindow.ui" line="4695"/>
+        <location filename="../mainwindow.ui" line="4847"/>
+        <location filename="../mainwindow.ui" line="4999"/>
         <source>:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4841"/>
-        <location filename="../mainwindow.ui" line="4993"/>
-        <location filename="../mainwindow.ui" line="5145"/>
+        <location filename="../mainwindow.ui" line="4727"/>
+        <location filename="../mainwindow.ui" line="4879"/>
+        <location filename="../mainwindow.ui" line="5031"/>
         <source>.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4868"/>
-        <location filename="../mainwindow.ui" line="5020"/>
-        <location filename="../mainwindow.ui" line="5175"/>
+        <location filename="../mainwindow.ui" line="4754"/>
+        <location filename="../mainwindow.ui" line="4906"/>
+        <location filename="../mainwindow.ui" line="5061"/>
         <source>Score:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4891"/>
-        <location filename="../mainwindow.ui" line="5043"/>
-        <location filename="../mainwindow.ui" line="5198"/>
+        <location filename="../mainwindow.ui" line="4777"/>
+        <location filename="../mainwindow.ui" line="4929"/>
+        <location filename="../mainwindow.ui" line="5084"/>
         <source>Points</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4903"/>
+        <location filename="../mainwindow.ui" line="4789"/>
         <source>Expert Course</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5055"/>
+        <location filename="../mainwindow.ui" line="4941"/>
         <source>Crazy Course</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5222"/>
+        <location filename="../mainwindow.ui" line="5108"/>
         <source>Coaster Shooter High Scores</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5285"/>
+        <location filename="../mainwindow.ui" line="5171"/>
         <source>1st</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5362"/>
+        <location filename="../mainwindow.ui" line="5248"/>
         <source>2nd</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5439"/>
+        <location filename="../mainwindow.ui" line="5325"/>
         <source>3rd</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4259"/>
+        <location filename="../mainwindow.ui" line="4145"/>
         <source>Battle Points</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2893"/>
+        <location filename="../mainwindow.ui" line="2836"/>
         <source>Right click on map to easily set an item&apos;s
 location.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3403"/>
+        <location filename="../mainwindow.ui" line="3310"/>
         <source>ChurchProgress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="4327"/>
-        <source>Number Steps</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="5659"/>
-        <source>G-Bike High Score</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.ui" line="5707"/>
+        <location filename="../mainwindow.ui" line="5593"/>
         <source>Hex Editor</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5784"/>
+        <location filename="../mainwindow.ui" line="5614"/>
         <source>Playstation Save Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5808"/>
+        <location filename="../mainwindow.ui" line="5638"/>
         <source>PsxName:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5835"/>
-        <location filename="../mainwindow.ui" line="5842"/>
+        <location filename="../mainwindow.ui" line="5665"/>
+        <location filename="../mainwindow.ui" line="5672"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5863"/>
+        <location filename="../mainwindow.ui" line="5693"/>
         <source>No Description Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5884"/>
+        <location filename="../mainwindow.ui" line="5711"/>
         <source>Show:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5913"/>
+        <location filename="../mainwindow.ui" line="5740"/>
         <source>PSX Save Data</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5944"/>
+        <location filename="../mainwindow.ui" line="5814"/>
         <source>Test Data</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="5981"/>
+        <location filename="../mainwindow.ui" line="5851"/>
         <source>Misc</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6001"/>
+        <location filename="../mainwindow.ui" line="5859"/>
         <source>Battle Love Points</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6113"/>
+        <location filename="../mainwindow.ui" line="5971"/>
         <source>Ultimate Weapons Hp</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6153"/>
+        <location filename="../mainwindow.ui" line="6011"/>
+        <source>Played piano durring flashback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="6018"/>
         <source>When Box is Partally Checked (&quot;-&quot;) it will
 trigger showing that tutorial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6174"/>
+        <location filename="../mainwindow.ui" line="6039"/>
         <source>Tutorials Seen</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6200"/>
+        <location filename="../mainwindow.ui" line="6065"/>
         <source>Controling the Sub</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6233"/>
+        <location filename="../mainwindow.ui" line="6098"/>
         <source>Saving on the World Map</source>
         <translation>Saving on the World Map</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6290"/>
+        <location filename="../mainwindow.ui" line="6155"/>
         <source>Map Id: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6303"/>
+        <location filename="../mainwindow.ui" line="6168"/>
         <source>X: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6329"/>
+        <location filename="../mainwindow.ui" line="6194"/>
         <source>Z:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6538"/>
+        <location filename="../mainwindow.ui" line="6403"/>
         <source>Unknown Vars</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6600"/>
+        <location filename="../mainwindow.ui" line="6465"/>
         <source>Unknown Var:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6608"/>
-        <location filename="../mainwindow.ui" line="7014"/>
+        <location filename="../mainwindow.ui" line="6473"/>
+        <location filename="../mainwindow.ui" line="6879"/>
         <source>-None-</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6813"/>
+        <location filename="../mainwindow.ui" line="6678"/>
         <source>z_41</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6818"/>
+        <location filename="../mainwindow.ui" line="6683"/>
         <source>z_42</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6823"/>
+        <location filename="../mainwindow.ui" line="6688"/>
         <source>z_43</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6828"/>
+        <location filename="../mainwindow.ui" line="6693"/>
         <source>z_44</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6833"/>
+        <location filename="../mainwindow.ui" line="6698"/>
         <source>z_45</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6838"/>
+        <location filename="../mainwindow.ui" line="6703"/>
         <source>z_46</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6878"/>
-        <location filename="../mainwindow.ui" line="7136"/>
+        <location filename="../mainwindow.ui" line="6743"/>
+        <location filename="../mainwindow.ui" line="7001"/>
         <source>#</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6883"/>
-        <location filename="../mainwindow.ui" line="7141"/>
+        <location filename="../mainwindow.ui" line="6748"/>
+        <location filename="../mainwindow.ui" line="7006"/>
         <source>Hex</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6888"/>
-        <location filename="../mainwindow.ui" line="7146"/>
+        <location filename="../mainwindow.ui" line="6753"/>
+        <location filename="../mainwindow.ui" line="7011"/>
         <source>Dec</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6893"/>
-        <location filename="../mainwindow.ui" line="7151"/>
+        <location filename="../mainwindow.ui" line="6758"/>
+        <location filename="../mainwindow.ui" line="7016"/>
         <source>Bin</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6917"/>
+        <location filename="../mainwindow.ui" line="6782"/>
         <source>&lt;------Left Table------
 Select Unknown Var To View
 Table Entries are Editable</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6932"/>
+        <location filename="../mainwindow.ui" line="6797"/>
         <source>------Right Table------&gt;
 Select A Slot To Compare
 Table is Read Only
@@ -8486,533 +8499,533 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="6994"/>
+        <location filename="../mainwindow.ui" line="6859"/>
         <source>Compare To Slot</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7192"/>
+        <location filename="../mainwindow.ui" line="7057"/>
         <source>&amp;File</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7222"/>
+        <location filename="../mainwindow.ui" line="7087"/>
         <source>&amp;Options</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7237"/>
+        <location filename="../mainwindow.ui" line="7102"/>
         <source>&amp;Edit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7283"/>
+        <location filename="../mainwindow.ui" line="7148"/>
         <source>&amp;Quit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7298"/>
+        <location filename="../mainwindow.ui" line="7163"/>
         <source>&amp;Open</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7301"/>
+        <location filename="../mainwindow.ui" line="7166"/>
         <source>Ctrl+O</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7364"/>
+        <location filename="../mainwindow.ui" line="7229"/>
         <source>&amp;Copy Current Slot</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7382"/>
+        <location filename="../mainwindow.ui" line="7247"/>
         <source>&amp;Paste Slot</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7400"/>
+        <location filename="../mainwindow.ui" line="7265"/>
         <source>Clea&amp;r Slot</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7450"/>
+        <location filename="../mainwindow.ui" line="7315"/>
         <source>Advanced Mode</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7470"/>
+        <location filename="../mainwindow.ui" line="7335"/>
         <source>&amp;Us English (NTSC-U)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7506"/>
+        <location filename="../mainwindow.ui" line="7371"/>
         <source>Spanish (PAL)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7546"/>
+        <location filename="../mainwindow.ui" line="7411"/>
         <source>&amp;New Game</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7579"/>
+        <location filename="../mainwindow.ui" line="7444"/>
         <source>E&amp;xport Current Character</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7588"/>
+        <location filename="../mainwindow.ui" line="7453"/>
         <source>I&amp;mport Current Character</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7600"/>
+        <location filename="../mainwindow.ui" line="7465"/>
         <source>&amp;Save</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="7664"/>
+        <location filename="../mainwindow.ui" line="7529"/>
         <source>&amp;Import To Current Slot</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="126"/>
-        <location filename="../mainwindow.cpp" line="128"/>
-        <location filename="../mainwindow.cpp" line="130"/>
+        <location filename="../mainwindow.cpp" line="134"/>
+        <location filename="../mainwindow.cpp" line="136"/>
+        <location filename="../mainwindow.cpp" line="138"/>
         <source>-Empty-</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="148"/>
+        <location filename="../mainwindow.cpp" line="156"/>
         <source>Chocobo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="152"/>
+        <location filename="../mainwindow.cpp" line="160"/>
         <source>Game Options</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="214"/>
+        <location filename="../mainwindow.cpp" line="221"/>
         <source>TRANSLATE TO YOUR LANGUAGE NAME</source>
         <translation>ReTranslation</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="435"/>
+        <location filename="../mainwindow.cpp" line="440"/>
         <source>Unsaved Changes</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="435"/>
+        <location filename="../mainwindow.cpp" line="440"/>
         <source>Save Changes to the File:
 %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="470"/>
-        <location filename="../mainwindow.cpp" line="506"/>
+        <location filename="../mainwindow.cpp" line="475"/>
+        <location filename="../mainwindow.cpp" line="513"/>
         <source>Open Final Fantasy 7 Save</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="480"/>
-        <location filename="../mainwindow.cpp" line="540"/>
+        <location filename="../mainwindow.cpp" line="485"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="488"/>
+        <location filename="../mainwindow.cpp" line="493"/>
         <source>Load Failed</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="488"/>
+        <location filename="../mainwindow.cpp" line="493"/>
         <source>Failed to Load File</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="471"/>
-        <location filename="../mainwindow.cpp" line="507"/>
+        <location filename="../mainwindow.cpp" line="476"/>
+        <location filename="../mainwindow.cpp" line="514"/>
         <source>Known FF7 Save Types (*.ff7 *-S* *.psv *.vmp *.vgs *.mem *.gme *.mcr *.mcd *.mci *.mc *.ddf *.ps *.psm *.VM1 *.bin *.srm);;PC FF7 SaveGame (*.ff7);;Raw PSX FF7 SaveGame (*-S*);;MC SaveGame (*.mcr *.mcd *.mci *.mc *.ddf *.ps *.psm *.VM1 *.bin *.srm);;PSV SaveGame (*.psv);;PSP/PsVita SaveGame (*.vmp);;VGS SaveGame(*.vgs *.mem);;Dex-Drive SaveGame(*.gme);;All Files(*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="523"/>
+        <location filename="../mainwindow.cpp" line="530"/>
         <source>Imported Slot:%2 from %1 -&gt; Slot:%3</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="535"/>
+        <location filename="../mainwindow.cpp" line="542"/>
         <source>Select FF7 Character Stat File</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="535"/>
-        <location filename="../mainwindow.cpp" line="554"/>
+        <location filename="../mainwindow.cpp" line="542"/>
+        <location filename="../mainwindow.cpp" line="561"/>
         <source>FF7 Character Stat File(*.char)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="541"/>
+        <location filename="../mainwindow.cpp" line="548"/>
         <source>%1:
 %2 is Not a FF7 Character Stat File.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="553"/>
+        <location filename="../mainwindow.cpp" line="560"/>
         <source>Save FF7 Character File</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="557"/>
+        <location filename="../mainwindow.cpp" line="564"/>
         <source>Character Export Successful</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="558"/>
+        <location filename="../mainwindow.cpp" line="565"/>
         <source>Character Export Failed</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="566"/>
-        <location filename="../mainwindow.cpp" line="620"/>
+        <location filename="../mainwindow.cpp" line="573"/>
+        <location filename="../mainwindow.cpp" line="627"/>
         <source>PSP/PsVita Save Notice</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="567"/>
-        <location filename="../mainwindow.cpp" line="619"/>
+        <location filename="../mainwindow.cpp" line="574"/>
+        <location filename="../mainwindow.cpp" line="626"/>
         <source>PSV Save Notice</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="575"/>
+        <location filename="../mainwindow.cpp" line="582"/>
         <source>FF7 PC (*.ff7)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="576"/>
+        <location filename="../mainwindow.cpp" line="583"/>
         <source>Raw PSX Save(*FF7-S*)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="577"/>
+        <location filename="../mainwindow.cpp" line="584"/>
         <source>Virtual Memory Card(*.mcr *.mcd *.mci *.mc *.ddf *.ps *.psm *.VM1 *.bin *.srm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="578"/>
+        <location filename="../mainwindow.cpp" line="585"/>
         <source>Virtual Game Station(*.vgs *.mem)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="579"/>
+        <location filename="../mainwindow.cpp" line="586"/>
         <source>DEX (*.gme)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="580"/>
+        <location filename="../mainwindow.cpp" line="587"/>
         <source>PSV (*.psv)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="581"/>
+        <location filename="../mainwindow.cpp" line="588"/>
         <source>PSP (*.vmp)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="525"/>
+        <location filename="../mainwindow.cpp" line="532"/>
         <source>Imported %1 -&gt; Slot:%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="529"/>
+        <location filename="../mainwindow.cpp" line="536"/>
         <source>Error Loading File %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="566"/>
-        <location filename="../mainwindow.cpp" line="620"/>
+        <location filename="../mainwindow.cpp" line="573"/>
+        <location filename="../mainwindow.cpp" line="627"/>
         <source>This File Does Not Have An Updated Signature
  Because of this your PSP/PsVita will reject this save as corrupted
  This is normal please see the User Guide for more information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="567"/>
-        <location filename="../mainwindow.cpp" line="619"/>
+        <location filename="../mainwindow.cpp" line="574"/>
+        <location filename="../mainwindow.cpp" line="626"/>
         <source>Black Chocobo Will Attempt to Sign your Save using the keys provided in the options Dialog.
  ps3Key: %1
  ps3Seed: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="625"/>
+        <location filename="../mainwindow.cpp" line="632"/>
         <source>Export Successful</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="626"/>
+        <location filename="../mainwindow.cpp" line="633"/>
         <source>Export Failed</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="627"/>
+        <location filename="../mainwindow.cpp" line="634"/>
         <source>PSV Export Attempted</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="627"/>
+        <location filename="../mainwindow.cpp" line="634"/>
         <source>PSV Exports Are Not Allowed.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="628"/>
+        <location filename="../mainwindow.cpp" line="635"/>
         <source>VMP Export Attempted</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="628"/>
+        <location filename="../mainwindow.cpp" line="635"/>
         <source>VMP Exports Are Not Allowed.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="646"/>
+        <location filename="../mainwindow.cpp" line="653"/>
         <source>Save Error</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="646"/>
+        <location filename="../mainwindow.cpp" line="653"/>
         <source>Failed to save file
 %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="654"/>
-        <location filename="../mainwindow.cpp" line="666"/>
+        <location filename="../mainwindow.cpp" line="661"/>
+        <location filename="../mainwindow.cpp" line="673"/>
         <source>Builtin Data</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="655"/>
+        <location filename="../mainwindow.cpp" line="662"/>
         <source>New Game Created - Using: %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="667"/>
+        <location filename="../mainwindow.cpp" line="674"/>
         <source>New Game Plus Created - Using: %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="712"/>
+        <location filename="../mainwindow.cpp" line="719"/>
         <source>Select Achievement File</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="712"/>
+        <location filename="../mainwindow.cpp" line="719"/>
         <source>Dat File (*.dat);</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="750"/>
+        <location filename="../mainwindow.cpp" line="757"/>
         <source>Language Changed</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="752"/>
+        <location filename="../mainwindow.cpp" line="759"/>
         <source>You must restart for the language to change.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="980"/>
+        <location filename="../mainwindow.cpp" line="987"/>
         <source>Current Slot:%1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1011"/>
-        <location filename="../mainwindow.cpp" line="1036"/>
+        <location filename="../mainwindow.cpp" line="1018"/>
+        <location filename="../mainwindow.cpp" line="1043"/>
         <source>Would you like to correct the play time?</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1012"/>
+        <location filename="../mainwindow.cpp" line="1019"/>
         <source>In this region the game runs 60hz</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1013"/>
+        <location filename="../mainwindow.cpp" line="1020"/>
         <source>PAL -&gt; NTSC Conversion</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1037"/>
+        <location filename="../mainwindow.cpp" line="1044"/>
         <source>In this region the game runs 50hz</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1038"/>
+        <location filename="../mainwindow.cpp" line="1045"/>
         <source>NTSC -&gt; PAL Conversion</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1079"/>
-        <location filename="../mainwindow.cpp" line="1093"/>
-        <location filename="../mainwindow.cpp" line="1230"/>
+        <location filename="../mainwindow.cpp" line="1086"/>
+        <location filename="../mainwindow.cpp" line="1097"/>
+        <location filename="../mainwindow.cpp" line="1236"/>
         <source>Master</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1101"/>
-        <location filename="../mainwindow.cpp" line="1235"/>
+        <location filename="../mainwindow.cpp" line="1105"/>
+        <location filename="../mainwindow.cpp" line="1241"/>
         <source>===Empty Slot===</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1270"/>
+        <location filename="../mainwindow.cpp" line="1277"/>
         <source>
  Mid-Linked Block </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1271"/>
+        <location filename="../mainwindow.cpp" line="1278"/>
         <source>
  End Of Linked Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1273"/>
+        <location filename="../mainwindow.cpp" line="1280"/>
         <source>(Deleted)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1274"/>
+        <location filename="../mainwindow.cpp" line="1281"/>
         <source>Game Uses %1 Save Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1279"/>
+        <location filename="../mainwindow.cpp" line="1286"/>
         <source>s
    Next Data Chunk @ Slot:%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1280"/>
+        <location filename="../mainwindow.cpp" line="1287"/>
         <source>Next Data Chunk @ Slot:%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1719"/>
+        <location filename="../mainwindow.cpp" line="1723"/>
         <source>All Materia Added!</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1732"/>
+        <location filename="../mainwindow.cpp" line="1736"/>
         <source>Set Save Location: %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2012"/>
+        <location filename="../mainwindow.cpp" line="1962"/>
         <source>Replay the bombing mission from right after you get off the train.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2022"/>
+        <location filename="../mainwindow.cpp" line="1972"/>
         <source>This Will Copy Cloud as is to young cloud (caitsith&apos;s slot). Sephiroth&apos;s stats will come directly from the Default Save. Be Sure to back up your CaitSith and Vincent if you want to use them again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2059"/>
-        <location filename="../mainwindow.cpp" line="2082"/>
-        <location filename="../mainwindow.cpp" line="2112"/>
-        <location filename="../mainwindow.cpp" line="2130"/>
-        <location filename="../mainwindow.cpp" line="2150"/>
+        <location filename="../mainwindow.cpp" line="2007"/>
+        <location filename="../mainwindow.cpp" line="2028"/>
+        <location filename="../mainwindow.cpp" line="2058"/>
+        <location filename="../mainwindow.cpp" line="2076"/>
+        <location filename="../mainwindow.cpp" line="2096"/>
         <source>Progression Reset Complete</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2498"/>
-        <location filename="../mainwindow.cpp" line="2510"/>
+        <location filename="../mainwindow.cpp" line="2444"/>
+        <location filename="../mainwindow.cpp" line="2456"/>
         <source>&amp;Place Leader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2499"/>
-        <location filename="../mainwindow.cpp" line="2515"/>
+        <location filename="../mainwindow.cpp" line="2445"/>
+        <location filename="../mainwindow.cpp" line="2461"/>
         <source>Place &amp;Tiny Bronco/Chocobo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2500"/>
-        <location filename="../mainwindow.cpp" line="2520"/>
+        <location filename="../mainwindow.cpp" line="2446"/>
+        <location filename="../mainwindow.cpp" line="2466"/>
         <source>Place &amp;Buggy/Highwind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2501"/>
-        <location filename="../mainwindow.cpp" line="2525"/>
+        <location filename="../mainwindow.cpp" line="2447"/>
+        <location filename="../mainwindow.cpp" line="2471"/>
         <source>Place &amp;Sub</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2502"/>
-        <location filename="../mainwindow.cpp" line="2530"/>
+        <location filename="../mainwindow.cpp" line="2448"/>
+        <location filename="../mainwindow.cpp" line="2476"/>
         <source>Place &amp;Wild Chocobo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2503"/>
-        <location filename="../mainwindow.cpp" line="2535"/>
+        <location filename="../mainwindow.cpp" line="2449"/>
+        <location filename="../mainwindow.cpp" line="2481"/>
         <source>Place &amp;Diamond/Ultimate/Ruby Weapon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3162"/>
+        <location filename="../mainwindow.cpp" line="3108"/>
         <source>Turtle Paradise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3169"/>
+        <location filename="../mainwindow.cpp" line="3115"/>
         <source>KeyItem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2017"/>
+        <location filename="../mainwindow.cpp" line="1967"/>
         <source>Meeting Aeris</source>
         <translation>Meeting Aerith</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2027"/>
+        <location filename="../mainwindow.cpp" line="1977"/>
         <source>Replay the Date Scene, Your Location will be set To The Ropeway Station Talk to man by the Tram to start event. If Your Looking for a special Date be sure to set your love points too.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2032"/>
+        <location filename="../mainwindow.cpp" line="1982"/>
         <source>Replay the death of Aeris.This option Will remove Aeris from your PHS</source>
         <translation>Replay the death of Aerith.This option Will remove Aerith from your PHS</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2034"/>
+        <location filename="../mainwindow.cpp" line="1984"/>
         <source>         INFO ON CURRENTLY SELECTED REPLAY MISSION</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2549"/>
+        <location filename="../mainwindow.cpp" line="2495"/>
         <source>DON&apos;T USE</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2564"/>
+        <location filename="../mainwindow.cpp" line="2510"/>
         <source>All Items Added</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2830"/>
+        <location filename="../mainwindow.cpp" line="2776"/>
         <source>Do You Want To Also Replace %1&apos;s Equipment and Materia?</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="3035"/>
+        <location filename="../mainwindow.cpp" line="2981"/>
         <source>Unknown Id in Buggy/Highwind Location</source>
         <translation></translation>
     </message>
@@ -9020,73 +9033,73 @@
 <context>
     <name>MateriaEditor</name>
     <message>
-        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="91"/>
+        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="97"/>
         <source>Clear</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="92"/>
+        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="98"/>
         <source>Master</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="93"/>
-        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="375"/>
+        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="99"/>
+        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="383"/>
         <source>Skills</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="94"/>
+        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="100"/>
         <source>Stat Changes</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="95"/>
+        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="101"/>
         <source>Delete</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="98"/>
+        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="104"/>
         <source>Copy</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="101"/>
+        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="107"/>
         <source>Paste</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="104"/>
+        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="110"/>
         <source>Added Effect</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="267"/>
+        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="275"/>
         <source>All Materia</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="268"/>
+        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="276"/>
         <source>Magic</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="269"/>
+        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="277"/>
         <source>Summon</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="270"/>
+        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="278"/>
         <source>Independent</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="271"/>
+        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="279"/>
         <source>Support</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="272"/>
+        <location filename="../ff7tk/widgets/MateriaEditor.cpp" line="280"/>
         <source>Command</source>
         <translation></translation>
     </message>
@@ -9268,7 +9281,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="126"/>
         <source>Added Cut</source>
-        <translation></translation>
+        <translation type="unfinished">Added Attack</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="127"/>
@@ -9303,7 +9316,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="134"/>
         <source>Deathblow</source>
-        <translation></translation>
+        <translation type="unfinished">Death Blow</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="135"/>
@@ -9328,12 +9341,12 @@
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="142"/>
         <source>Fire</source>
-        <translation>Flame</translation>
+        <translation type="unfinished">Flame</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="143"/>
         <source>Ice</source>
-        <translation>Cold</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="144"/>
@@ -9398,7 +9411,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="157"/>
         <source>Comet</source>
-        <translation></translation>
+        <translation type="unfinished">Meteorite</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="158"/>
@@ -9438,7 +9451,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="167"/>
         <source>Choco/Mog</source>
-        <translation>Chocobo &amp; Moguri</translation>
+        <translation type="unfinished">Chocoboi</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="168"/>
@@ -9721,7 +9734,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="103"/>
         <source>Pre-emptive +12%</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="103"/>
@@ -9796,7 +9809,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="107"/>
         <source>Slash-All</source>
-        <translation></translation>
+        <translation type="unfinished">Strike All</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="107"/>
@@ -9806,12 +9819,12 @@
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="108"/>
         <source>2x-Cut</source>
-        <translation>2x Cut</translation>
+        <translation>2x Atk</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="108"/>
         <source>4x-Cut</source>
-        <translation>4x Cut</translation>
+        <translation>4x Atk</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="109"/>
@@ -9976,17 +9989,17 @@
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="122"/>
         <source>Elemental 50%</source>
-        <translation></translation>
+        <translation type="unfinished">Property 50%</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="122"/>
         <source>Elemental 100%</source>
-        <translation></translation>
+        <translation type="unfinished">Property 100%</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="122"/>
         <source>Elemental 200%</source>
-        <translation></translation>
+        <translation type="unfinished">Property 200%</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="123"/>
@@ -10046,7 +10059,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="126"/>
         <source>Added Cut</source>
-        <translation></translation>
+        <translation>Added Attack</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="127"/>
@@ -10101,7 +10114,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="132"/>
         <source>Coin</source>
-        <translation>Coins</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="133"/>
@@ -10206,7 +10219,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="146"/>
         <source>Regen (30mp)</source>
-        <translation>Re-gen (30mp)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="146"/>
@@ -10331,7 +10344,7 @@
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="157"/>
         <source>Comet (70mp)</source>
-        <translation>Meteorite (70mp)</translation>
+        <translation>Comet (70mp)</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="157"/>
@@ -10411,27 +10424,27 @@
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="167"/>
         <source>Choco/Mog x1 (14mp)</source>
-        <translation>Chocobo &amp; Moguri x1 (14mp)</translation>
+        <translation>Chocobo x1 (14mp)</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="167"/>
         <source>Choco/Mog x2 (14mp)</source>
-        <translation>Chocobo &amp; Moguri x2 (14mp)</translation>
+        <translation>Chocobo x2 (14mp)</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="167"/>
         <source>Choco/Mog x3 (14mp)</source>
-        <translation>Chocobo &amp; Moguri x3 (14mp)</translation>
+        <translation>Chocobo x3 (14mp)</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="167"/>
         <source>Choco/Mog x4 (14mp)</source>
-        <translation>Chocobo &amp; Moguri x4 (14mp)</translation>
+        <translation>Chocobo x4 (14mp)</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="167"/>
         <source>Choco/Mog x5 (14mp)</source>
-        <translation>Chocobo &amp; Moguri x5 (14mp)</translation>
+        <translation>Chocobo x5 (14mp)</translation>
     </message>
     <message>
         <location filename="../ff7tk/data/FF7Materia.h" line="168"/>
@@ -11200,37 +11213,37 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="80"/>
+        <location filename="../options.ui" line="95"/>
         <source>Path For Emulator Memory Cards  </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="111"/>
+        <location filename="../options.ui" line="126"/>
         <source>Path For PC (.ff7) Saves</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="138"/>
+        <location filename="../options.ui" line="153"/>
         <source>Path For Character Stat Files</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="258"/>
+        <location filename="../options.ui" line="270"/>
         <source>Override Builtin New Game Data</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="265"/>
+        <location filename="../options.ui" line="277"/>
         <source>Use Only Raw Psx Files</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="291"/>
+        <location filename="../options.ui" line="303"/>
         <source>Reset to Default</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="166"/>
+        <location filename="../options.ui" line="181"/>
         <source>Editor Options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11240,57 +11253,57 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="187"/>
+        <location filename="../options.ui" line="205"/>
         <source>Editable Combo for Materia and Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="194"/>
+        <location filename="../options.ui" line="212"/>
         <source>CharEditor - Advanced Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="201"/>
+        <location filename="../options.ui" line="219"/>
         <source>Chocobo Manager - Show Pcount / Personality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="208"/>
+        <location filename="../options.ui" line="226"/>
         <source>Field Location - Show Map/X/Y/T/D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="215"/>
+        <location filename="../options.ui" line="233"/>
         <source>World Map Viewer- Show int SpinBoxes for Leader ID and buggy ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="222"/>
+        <location filename="../options.ui" line="240"/>
         <source>Game Progress - Show Untested</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="229"/>
+        <location filename="../options.ui" line="247"/>
         <source>Options - Always Show Controller Mapping </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="236"/>
+        <location filename="../options.ui" line="254"/>
         <source>Enable Experimental TestData </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="306"/>
+        <location filename="../options.ui" line="318"/>
         <source>Scale Widgets by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="334"/>
+        <location filename="../options.ui" line="346"/>
         <source>Signing Keys:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="342"/>
+        <location filename="../options.ui" line="354"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -11299,7 +11312,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="370"/>
+        <location filename="../options.ui" line="382"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -11308,47 +11321,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="359"/>
+        <location filename="../options.ui" line="371"/>
         <source>Input Key in HEX ex( 00010203AABF )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="384"/>
+        <location filename="../options.ui" line="396"/>
         <source>Input Seed in Hex ex( 00010203AABF )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.ui" line="409"/>
+        <location filename="../options.ui" line="421"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.cpp" line="32"/>
+        <location filename="../options.cpp" line="34"/>
         <source>Signing is disabled! Build with OpenSSL support to enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options.cpp" line="85"/>
+        <location filename="../options.cpp" line="87"/>
         <source>Select A Directory To Save FF7 PC Saves</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../options.cpp" line="95"/>
+        <location filename="../options.cpp" line="97"/>
         <source>Select A Directory To Save mcd/mcr saves</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../options.cpp" line="105"/>
+        <location filename="../options.cpp" line="107"/>
         <source>Select A Directory To Load FF7 PC Saves From</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../options.cpp" line="115"/>
+        <location filename="../options.cpp" line="117"/>
         <source>Select A Default Save Game (Must Be Raw PSX)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../options.cpp" line="126"/>
+        <location filename="../options.cpp" line="128"/>
         <source>Select A Location To Save Character Stat Files</source>
         <translation></translation>
     </message>
diff -Nru blackchocobo-1.9.900/main.cpp blackchocobo-1.9.910/main.cpp
--- blackchocobo-1.9.900/main.cpp	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/main.cpp	2018-12-29 20:35:46.000000000 +0000
@@ -14,19 +14,8 @@
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
 #include "qglobal.h"
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-    #include <QtWidgets/QApplication>
-    #ifdef Q_OS_MAC
-        #include <QStyleFactory>
-    #endif
-#else
-    #include <QtGui/QApplication>
-    #ifdef Q_OS_MAC
-        #include <QMacStyle>
-        #include <QPlastiqueStyle>
-    #endif
-#endif
 
+#include <QtWidgets/QApplication>
 #include <QLocale>
 #include <QTranslator>
 #include <QTime>
@@ -62,10 +51,7 @@
     QApplication a(argc, argv);
     a.setApplicationName("Black Chocobo");
     QSettings * settings;
-    #ifdef Q_OS_MAC
-        if(QT_VERSION < 0x50000){a.setStyle("Plastique");}
-        else{a.setStyle(QStyleFactory::create("fusion"));}
-    #endif
+
     a.setApplicationVersion(Version);
 
     #ifdef STATIC
@@ -74,6 +60,7 @@
 
     if(QFile(QString(QCoreApplication::applicationDirPath() + QDir::separator() + "settings.ini")).exists())
     {
+
         settings= new QSettings(QCoreApplication::applicationDirPath() +"/" + "settings.ini",QSettings::IniFormat);
     }
     else
@@ -106,7 +93,6 @@
         }
     }
     a.installTranslator(&translator);
-    //FF7Save* ff7=new FF7Save; //main ff7 data
     qsrand(QTime::currentTime().msec());
     MainWindow w(0,settings);
     if(argc ==2){w.loadFileFull(QString(argv[1]),0);}// if command is run w/ a filename after it , load that file.
diff -Nru blackchocobo-1.9.900/mainwindow.cpp blackchocobo-1.9.910/mainwindow.cpp
--- blackchocobo-1.9.900/mainwindow.cpp	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/mainwindow.cpp	2018-12-29 20:35:46.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-//    copyright 2010-2016 Chris Rizzitello <sithlord48@gmail.com>           //
+//    copyright 2010-2018 Chris Rizzitello <sithlord48@gmail.com>           //
 //                                                                          //
 //    This file is part of Black Chocobo.                                   //
 //                                                                          //
@@ -22,23 +22,30 @@
 MainWindow::MainWindow(QWidget *parent,QSettings *configdata)
 	:QMainWindow(parent),ui(new Ui::MainWindow)
 {
-// qDebug() <<QString("p.DpiX: %1x%2").arg(QString::number(qApp->desktop()->physicalDpiX()),QString::number(qApp->desktop()->physicalDpiY()));
-// qDebug() <<QString("l.DpiX: %1x%2").arg(QString::number(qApp->desktop()->logicalDpiX()),QString::number(qApp->desktop()->logicalDpiY()));
 
+    if (configdata->value("scale").isNull()) {
+        double scale  = qApp->desktop()->logicalDpiX()/72.0f;
+        if (scale < 1) {
+            scale = 1;
+        }
+        configdata->setValue("scale",scale);
+    }
 
-	if(configdata->value("scale").isNull()){configdata->setValue("scale",qApp->desktop()->logicalDpiX()/96);}
-	scale = configdata->value("scale").toReal();
+    scale = configdata->value("scale").toReal();
 	this->setAcceptDrops(true);
 	//Get Font Info Before Setting up the GUI!
 	settings =configdata;
 	ui->setupUi(this);
+    setStyleSheet(QString("QCheckBox::indicator{width: %1px; height: %1px; padding: -%2px;}\nQListWidget::indicator{width: %1px; height: %1px; padding: -%2px}").arg(fontMetrics().height()).arg(2 *scale));
 	ui->frame_status->setFixedHeight(fontMetrics().height()+2);
+    ui->tbl_materia->setIconSize(QSize(fontMetrics().height(),fontMetrics().height()));
 	_init=true;
 	ff7 = new FF7Save;
 	load=true;
 	curchar =0;
 	mslotsel=-1;
 	s=0;
+	hexCursorPos=0;
 	buffer_materia.id=FF7Materia::EmptyId;
 	for(int i=0;i<4;i++){buffer_materia.ap[i]=0xFF;} //empty buffer incase
 	init_display();
@@ -46,6 +53,7 @@
 	init_settings();
 	init_connections();
 	on_actionNew_Game_triggered();
+    ui->btn_cloud->clicked();
 	ff7->setFileModified(false,0);
 }
 void MainWindow::init_display()
@@ -153,6 +161,7 @@
 
 	materia_editor = new MateriaEditor(scale,this);
 	materia_editor->setStarsSize(48*scale);
+	//ui->tbl_materia->setFixedWidth(this->fontMetrics().width(QChar('W'))*20);
 	QVBoxLayout *materia_editor_layout = new QVBoxLayout();
 	mat_spacer = new QSpacerItem(0,0,QSizePolicy::Preferred,QSizePolicy::MinimumExpanding);
 	materia_editor_layout->addWidget(materia_editor);
@@ -179,12 +188,10 @@
 		hexEditor->setFont(this->font());
 	#endif
 	hexEditor->setReadOnly(false);
-	//hexEditor->setFont(this->font());
 	QVBoxLayout *hexLayout = new QVBoxLayout;
 	hexLayout->setContentsMargins(0,0,0,0);
 	hexLayout->addWidget(hexEditor);
 	ui->group_hexedit->setLayout(hexLayout);
-	//ui->psxExtras->setVisible(false);
 
 	locationViewer = new LocationViewer(scale);
 	locationViewer->setTranslationBaseFile(settings->value("langPath").toString() +"/"+ "lang/bchoco_");
@@ -229,7 +236,7 @@
 
 	QString tabStyle = QString("::tab:hover{background-color:rgba(%1, %2, %3, 128);}").arg(QString::number(this->palette().highlight().color().red()),QString::number(this->palette().highlight().color().green()),QString::number(this->palette().highlight().color().blue()));
 
-	char_editor->setToolBoxStyle(tabStyle);
+    char_editor->setToolBoxStyle(tabStyle);
 	ui->locationToolBox->setStyleSheet(tabStyle);
 	ui->slide_world_y->setStyleSheet(QString("::handle{image: url(:/icon/prev);}"));
 	ui->slide_world_x->setStyleSheet(QString("::handle{image: url(:/icon/slider_up);}"));
@@ -358,8 +365,6 @@
 		connect(phsList,SIGNAL(visibleToggled(int,bool)),this,SLOT(phsList_box_visible_toggled(int,bool)));
 		connect(menuList,SIGNAL(visibleToggled(int,bool)),this,SLOT(menuList_box_visible_toggled(int,bool)));
 		connect(menuList,SIGNAL(lockedToggled(int,bool)),this,SLOT(menuList_box_locked_toggled(int,bool)));
-		//HexEditor.
-//		connect(hexEditor,SIGNAL(dataChanged()),this,SLOT(hexEditorChanged()));
 }
 void MainWindow::init_settings()
 {
@@ -497,6 +502,8 @@
 	}
 
 	else{/*UNKNOWN FILETYPE*/}
+	hexEditor->setCursorPosition(0);
+	hexCursorPos=0;
 }
 /*~~~~~~~~~~~~~~~~~IMPORT PSX~~~~~~~~~~~~~~~~~~*/
 void MainWindow::on_actionImport_Slot_From_File_triggered()
@@ -674,7 +681,7 @@
 void MainWindow::on_actionClear_Slot_triggered(){ff7->clearSlot(s); guirefresh(0);}
 void MainWindow::on_actionPrevious_Slot_triggered(){if(ff7->type()==""){return;}else{if (s > 0) {s--; guirefresh(0);}}}
 void MainWindow::on_actionNext_Slot_triggered(){if(ff7->type()==""){return;}else{if (s<14){s++; guirefresh(0);}}}
-void MainWindow::on_actionAbout_triggered(){About adialog(0,settings); adialog.exec();}
+void MainWindow::on_actionAbout_triggered(){About adialog(this,settings); adialog.exec();}
 void MainWindow::on_actionCopy_Slot_triggered(){ff7->copySlot(s);}
 void MainWindow::on_actionPaste_Slot_triggered(){ff7->pasteSlot(s); guirefresh(0);}
 void MainWindow::on_actionShow_Options_triggered()
@@ -1057,7 +1064,7 @@
 {
 	load=true;
 	QTableWidgetItem *newItem;
-	int j= ui->tbl_materia->currentRow();
+    int j= std::max(0, ui->tbl_materia->currentRow());
 	ui->tbl_materia->reset();
 	ui->tbl_materia->clearContents();
 	ui->tbl_materia->setColumnWidth(0,(ui->tbl_materia->width()*.65));
@@ -1067,30 +1074,27 @@
 	for(int mat=0;mat<200;mat++)// partys materias
 	{
 		ui->tbl_materia->setRowHeight(mat,fontMetrics().height()+9);
-		//ui->tbl_materia->setIconSize(QSize(24*scale,24*scale));
 		qint32 current_ap= ff7->partyMateriaAp(s,mat);
 		quint8 current_id= ff7->partyMateriaId(s,mat);
 		QString ap;
 
-		if(current_id == FF7Materia::EnemySkill)
+        newItem = new QTableWidgetItem(QIcon(QPixmap::fromImage(Materias.image(current_id).scaledToHeight(fontMetrics().height(), Qt::SmoothTransformation))), Materias.name(current_id), 0);
+        ui->tbl_materia->setItem(mat,0,newItem);
+
+        if(current_id == FF7Materia::EnemySkill)
 		{
-			newItem = new QTableWidgetItem(Materias.icon(current_id),Materias.name(current_id),0);
-			ui->tbl_materia->setItem(mat,0,newItem);
 			if (current_ap == FF7Materia::MaxMateriaAp){newItem =new QTableWidgetItem(tr("Master"));ui->tbl_materia->setItem(mat,1,newItem);}
 			else{newItem =new QTableWidgetItem(QString(""),0);ui->tbl_materia->setItem(mat,1,newItem);}
 		}
 
 		else if(current_id==FF7Materia::MasterCommand || current_id==FF7Materia::MasterMagic || current_id==FF7Materia::MasterSummon || current_id==FF7Materia::Underwater)
 		{
-			newItem = new QTableWidgetItem(Materias.icon(current_id),Materias.name(current_id),0);
-			ui->tbl_materia->setItem(mat,0,newItem);
-			newItem =new QTableWidgetItem(QString(""),0);ui->tbl_materia->setItem(mat,1,newItem);
+            newItem =new QTableWidgetItem(QString(""),0);
+            ui->tbl_materia->setItem(mat,1,newItem);
 		}
 		else if (current_id !=FF7Materia::EmptyId)
 		{
-			newItem = new QTableWidgetItem(Materias.icon(current_id),Materias.name(current_id),0);
-			ui->tbl_materia->setItem(mat,0,newItem);
-			if (current_ap == FF7Materia::MaxMateriaAp){newItem =new QTableWidgetItem(tr("Master"));ui->tbl_materia->setItem(mat,1,newItem);}
+            if (current_ap == FF7Materia::MaxMateriaAp){newItem =new QTableWidgetItem(tr("Master"));ui->tbl_materia->setItem(mat,1,newItem);}
 			else{newItem =new QTableWidgetItem(ap.setNum(current_ap));ui->tbl_materia->setItem(mat,1,newItem);}
 		}
 		else
@@ -1154,7 +1158,9 @@
 			else{on_actionOpen_Save_File_triggered();}
 		break;
 		}
-	}
+    } else {
+        guirefresh(0);
+    }
 }
 void MainWindow::othersUpdate()
 {
@@ -1255,6 +1261,7 @@
 
 	ui->sb_BikeHighScore->setValue(ff7->bikeHighScore(s));
 	ui->sb_BattlePoints->setValue(ff7->battlePoints(s));
+	ui->cb_FlashbackPiano->setChecked(ff7->playedPianoOnFlashback(s));
 	load=false;
 }
 void MainWindow::update_hexEditor_PSXInfo(void)
@@ -1285,6 +1292,7 @@
 void MainWindow::on_tabWidget_currentChanged(int index)
 {//Update the shown tab.
 	load =true;
+	hexCursorPos=hexEditor->cursorPosition();
 	switch (index)
 	{
 		case 0://Party Tab
@@ -1376,26 +1384,29 @@
 void MainWindow::hexTabUpdate(int viewMode)
 {
 	ui->psxExtras->setVisible(false);
+    ui->boxHexData->setVisible(false);
 	disconnect(hexEditor,SIGNAL(dataChanged()),this,SLOT(hexEditorChanged()));
-	if(ff7->type()=="PC" || ff7->type() =="")
-	{
+    if(ff7->type()=="PC" || ff7->type() =="") {
 		hexEditor->setData(ff7->slotFF7Data(s));
-		ui->psxExtras->setVisible(false);
-	}
-	else
-	{
+    } else {
 		ui->psxExtras->setVisible(true);
 		update_hexEditor_PSXInfo();
-		switch(viewMode)
-		{
-			case 0:
-				hexEditor->setData(ff7->slotPsxRawData(s));
-			break;
-			case 1:
-				hexEditor->setData(ff7->slotFF7Data(s));
-			break;
-		}
+        if(!ff7->isFF7(s)) {
+            ui->boxHexData->setVisible(true);
+            switch(viewMode)
+            {
+                case 0:
+                    hexEditor->setData(ff7->slotPsxRawData(s));
+                break;
+                case 1:
+                    hexEditor->setData(ff7->slotFF7Data(s));
+                break;
+            }
+        } else {
+            hexEditor->setData(ff7->slotPsxRawData(s));
+        }
 	}
+	hexEditor->setCursorPosition(hexCursorPos);
 	connect(hexEditor,SIGNAL(dataChanged()),this,SLOT(hexEditorChanged()));
 }
 void MainWindow::setControllerMappingVisible(bool Visible)
@@ -1523,13 +1534,6 @@
 	ui->cb_s7ts_7->setChecked((ff7->unknown(s,26).at(8) & (1<<6)));
 	ui->cb_s7ts_8->setChecked((ff7->unknown(s,26).at(8) & (1<<7)));
 
-	ui->cb_s5_1->setChecked((ff7->unknown(s,23).at(26) & (1<<0)));
-	ui->cb_s5_2->setChecked((ff7->unknown(s,23).at(26) & (1<<1)));
-	ui->cb_s5_3->setChecked((ff7->unknown(s,23).at(26) & (1<<2)));
-	ui->cb_s5_4->setChecked((ff7->unknown(s,23).at(26) & (1<<3)));
-	ui->cb_s5_5->setChecked((ff7->unknown(s,23).at(26) & (1<<4)));
-	ui->cb_s5_8->setChecked((ff7->unknown(s,23).at(26) & (1<<7)));
-
 	//When using A char for comparison to an int value such as below be sure to static_cast<unsigned char> the value
 	//to avoid possible build warning and failed run time check  due to possible return of signed char  and int >127
 
@@ -1675,7 +1679,7 @@
 void MainWindow::on_sb_steps_valueChanged(int value){if(!load){ff7->setSteps(s,value);}}
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Item Tab~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-void MainWindow::on_sb_gil_valueChanged(int value){if(!load){ff7->setGil(s,value);}}
+void MainWindow::on_sb_gil_valueChanged(double value){if(!load){ff7->setGil(s,value);}}
 void MainWindow::on_sb_gp_valueChanged(int value){if(!load){ ff7->setGp(s,value);}}
 void MainWindow::on_sb_battles_valueChanged(int value){if(!load){ ff7->setBattles(s,value);}}
 void MainWindow::on_sb_runs_valueChanged(int value){if(!load){ ff7->setRuns(s,value);}}
@@ -1944,60 +1948,6 @@
 		ff7->setUnknown(s,26,temp);
 }}
 
-void MainWindow::on_cb_s5_1_toggled(bool checked)
-{if(!load){
-		QByteArray temp = ff7->unknown(s,23); char t=temp.at(26);
-		if(checked){t |= (1<<0);}
-		else{t &= ~(1<<0);}
-		temp[26]=t;
-		ff7->setUnknown(s,23,temp);
-}}
-
-void MainWindow::on_cb_s5_2_toggled(bool checked)
-{if(!load){
-		QByteArray temp = ff7->unknown(s,23); char t=temp.at(26);
-		if(checked){t |= (1<<1);}
-		else{t &= ~(1<<1);}
-		temp[26]=t;
-		ff7->setUnknown(s,23,temp);
-}}
-
-void MainWindow::on_cb_s5_3_toggled(bool checked)
-{if(!load){
-		QByteArray temp = ff7->unknown(s,23); char t=temp.at(26);
-		if(checked){t |= (1<<2);}
-		else{t &= ~(1<<2);}
-		temp[26]=t;
-		ff7->setUnknown(s,23,temp);
-}}
-
-void MainWindow::on_cb_s5_4_toggled(bool checked)
-{if(!load){
-		QByteArray temp = ff7->unknown(s,23); char t=temp.at(26);
-		if(checked){t |= (1<<3);}
-		else{t &= ~(1<<3);}
-		temp[26]=t;
-		ff7->setUnknown(s,23,temp);
-}}
-
-void MainWindow::on_cb_s5_5_toggled(bool checked)
-{if(!load){
-		QByteArray temp = ff7->unknown(s,23); char t=temp.at(26);
-		if(checked){t |= (1<<4);}
-		else{t &= ~(1<<4);}
-		temp[26]=t;
-		ff7->setUnknown(s,23,temp);
-}}
-
-void MainWindow::on_cb_s5_8_toggled(bool checked)
-{if(!load){
-		QByteArray temp = ff7->unknown(s,23); char t=temp.at(26);
-		if(checked){t |= (1<<7);}
-		else{t &= ~(1<<7);}
-		temp[26]=t;
-		ff7->setUnknown(s,23,temp);
-}}
-
 void MainWindow::on_cb_bombing_int_stateChanged(int checked){if(!load){ff7->setStartBombingMission(s,checked);}}
 
 void MainWindow::on_cb_replay_currentIndexChanged(int index)
@@ -2046,8 +1996,6 @@
 		ff7->setMidgarTrainFlags(s,0);
 		ui->cb_bombing_int->setChecked(Qt::Checked);
 		ui->combo_s7_slums->setCurrentIndex(1);
-		ui->cb_s5_5->setChecked(Qt::Unchecked);//show aeris on roof of church durring script
-		ui->cb_s5_8->setChecked(Qt::Unchecked);//not after church scene.
 		ui->sb_turkschurch->setValue(0); // reset turks.
 		locationViewer->setMapId(1);
 		locationViewer->setLocationId(116);
@@ -2067,8 +2015,6 @@
 		ff7->setBmProgress2(s,198);
 		ff7->setBmProgress3(s,3);
 		ui->cb_bombing_int->setChecked(Qt::Unchecked);
-		ui->cb_s5_5->setChecked(Qt::Unchecked);//show aeris on roof of church durring script
-		ui->cb_s5_8->setChecked(Qt::Unchecked);//not after church scene.
 		locationViewer->setMapId(1);
 		locationViewer->setLocationId(183);
 		if(!locationViewer->locationChangesSaved())
@@ -3170,3 +3116,4 @@
 }
 
 void MainWindow::on_linePsxDesc_textChanged(const QString &arg1){if(!load){ff7->setPsxDesc(arg1,s); update_hexEditor_PSXInfo();}}
+void MainWindow::on_cb_FlashbackPiano_toggled(bool checked){if(!load){ff7->setPlayedPianoOnFlashback(s,checked);}}
diff -Nru blackchocobo-1.9.900/mainwindow.h blackchocobo-1.9.910/mainwindow.h
--- blackchocobo-1.9.900/mainwindow.h	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/mainwindow.h	2018-12-29 20:35:46.000000000 +0000
@@ -75,6 +75,7 @@
 private:
 	Ui::MainWindow *ui;
 	qreal scale;
+	qint64 hexCursorPos;
 	bool skip_slot_mask;
 	bool _init; //set true then false after a file load.
 	bool load; // are we loading data? if so don't save it to the file.
@@ -86,7 +87,7 @@
 	FF7Item Items; //FF7Item Static Data
 	FF7Materia Materias;//FF7Materia Static Data.
 	FF7Location Locations; // FF7 Location Data
-	MATERIA buffer_materia; // buffer for a materia
+	materia buffer_materia; // buffer for a materia
 	//ITEM buffer_item; // for use later
 	int curchar; //keeps track of current character displayed
 	int mslotsel; //keeps track of materia slot on char selected
@@ -182,7 +183,7 @@
 	void on_btn_vincent_clicked();
 	void on_btn_cid_clicked();
 	/*PARTY TAB*/
-	void on_sb_gil_valueChanged(int);
+    void on_sb_gil_valueChanged(double);
 	void on_sb_gp_valueChanged(int);
 	void on_sb_battles_valueChanged(int);
 	void on_sb_runs_valueChanged(int);
@@ -348,13 +349,6 @@
 	void on_cb_s7ts_7_toggled(bool checked);
 	void on_cb_s7ts_8_toggled(bool checked);
 
-	void on_cb_s5_1_toggled(bool checked);
-	void on_cb_s5_2_toggled(bool checked);
-	void on_cb_s5_3_toggled(bool checked);
-	void on_cb_s5_4_toggled(bool checked);
-	void on_cb_s5_5_toggled(bool checked);
-	void on_cb_s5_8_toggled(bool checked);
-
 	// game options tab
 
 	void setDialogColorUL(QColor color);
@@ -524,5 +518,6 @@
 	void on_btnReplay_clicked();
 	void on_linePsxDesc_textChanged(const QString &arg1);
 
+	void on_cb_FlashbackPiano_toggled(bool checked);
 };
 #endif // MAINWINDOW_H
diff -Nru blackchocobo-1.9.900/mainwindow.ui blackchocobo-1.9.910/mainwindow.ui
--- blackchocobo-1.9.900/mainwindow.ui	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/mainwindow.ui	2018-12-29 20:35:46.000000000 +0000
@@ -18,22 +18,7 @@
     <normaloff>:/icon/bchoco</normaloff>:/icon/bchoco</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
-   <layout class="QVBoxLayout" name="verticalLayout_20">
-    <property name="spacing">
-     <number>3</number>
-    </property>
-    <property name="leftMargin">
-     <number>3</number>
-    </property>
-    <property name="topMargin">
-     <number>3</number>
-    </property>
-    <property name="rightMargin">
-     <number>3</number>
-    </property>
-    <property name="bottomMargin">
-     <number>3</number>
-    </property>
+   <layout class="QVBoxLayout" name="verticalLayout_24">
     <item>
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
@@ -640,7 +625,7 @@
                     </widget>
                    </item>
                    <item>
-                    <widget class="QSpinBox" name="sb_gil">
+                    <widget class="QDoubleSpinBox" name="sb_gil">
                      <property name="layoutDirection">
                       <enum>Qt::LeftToRight</enum>
                      </property>
@@ -656,8 +641,11 @@
                      <property name="correctionMode">
                       <enum>QAbstractSpinBox::CorrectToNearestValue</enum>
                      </property>
+                     <property name="decimals">
+                      <number>0</number>
+                     </property>
                      <property name="maximum">
-                      <number>2147483647</number>
+                      <double>4294967295.000000000000000</double>
                      </property>
                     </widget>
                    </item>
@@ -785,7 +773,7 @@
                    <item>
                     <widget class="QLabel" name="label_37">
                      <property name="text">
-                      <string>Runs</string>
+                      <string>Escapes</string>
                      </property>
                     </widget>
                    </item>
@@ -1091,8 +1079,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>763</width>
-             <height>470</height>
+             <width>0</width>
+             <height>0</height>
             </rect>
            </property>
            <attribute name="icon">
@@ -1135,8 +1123,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>791</width>
-             <height>476</height>
+             <width>938</width>
+             <height>521</height>
             </rect>
            </property>
            <attribute name="icon">
@@ -1165,17 +1153,11 @@
             <item>
              <widget class="QScrollArea" name="scrollArea">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
-              <property name="minimumSize">
-               <size>
-                <width>310</width>
-                <height>0</height>
-               </size>
-              </property>
               <property name="contextMenuPolicy">
                <enum>Qt::NoContextMenu</enum>
               </property>
@@ -1185,6 +1167,9 @@
               <property name="horizontalScrollBarPolicy">
                <enum>Qt::ScrollBarAlwaysOff</enum>
               </property>
+              <property name="widgetResizable">
+               <bool>true</bool>
+              </property>
               <widget class="QWidget" name="scrollAreaWidgetContents">
                <property name="geometry">
                 <rect>
@@ -1194,18 +1179,6 @@
                  <height>615</height>
                 </rect>
                </property>
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>300</width>
-                 <height>0</height>
-                </size>
-               </property>
                <layout class="QVBoxLayout" name="verticalLayout_91">
                 <property name="spacing">
                  <number>3</number>
@@ -1224,12 +1197,6 @@
                 </property>
                 <item>
                  <widget class="QGroupBox" name="groupBox_42">
-                  <property name="maximumSize">
-                   <size>
-                    <width>300</width>
-                    <height>16777215</height>
-                   </size>
-                  </property>
                   <property name="title">
                    <string>Visible On World Map</string>
                   </property>
@@ -1441,12 +1408,6 @@
                 </item>
                 <item>
                  <widget class="QGroupBox" name="leaderonworld_box">
-                  <property name="maximumSize">
-                   <size>
-                    <width>300</width>
-                    <height>16777215</height>
-                   </size>
-                  </property>
                   <property name="title">
                    <string>Party leader</string>
                   </property>
@@ -1632,12 +1593,6 @@
                 </item>
                 <item>
                  <widget class="QGroupBox" name="leaderonworld_box_4">
-                  <property name="maximumSize">
-                   <size>
-                    <width>300</width>
-                    <height>16777215</height>
-                   </size>
-                  </property>
                   <property name="title">
                    <string>Tiny Bronco / Chocobo</string>
                   </property>
@@ -1839,12 +1794,6 @@
                 </item>
                 <item>
                  <widget class="QGroupBox" name="leaderonworld_box_3">
-                  <property name="maximumSize">
-                   <size>
-                    <width>300</width>
-                    <height>16777215</height>
-                   </size>
-                  </property>
                   <property name="title">
                    <string>Buggy / Highwind</string>
                   </property>
@@ -2063,12 +2012,6 @@
                 </item>
                 <item>
                  <widget class="QGroupBox" name="leaderonworld_box_5">
-                  <property name="maximumSize">
-                   <size>
-                    <width>300</width>
-                    <height>16777215</height>
-                   </size>
-                  </property>
                   <property name="title">
                    <string>Sub</string>
                   </property>
@@ -2270,12 +2213,6 @@
                 </item>
                 <item>
                  <widget class="QGroupBox" name="leaderonworld_box_7">
-                  <property name="maximumSize">
-                   <size>
-                    <width>300</width>
-                    <height>16777215</height>
-                   </size>
-                  </property>
                   <property name="title">
                    <string>Wild Chocobo</string>
                   </property>
@@ -2477,12 +2414,6 @@
                 </item>
                 <item>
                  <widget class="QGroupBox" name="leaderonworld_box_2">
-                  <property name="maximumSize">
-                   <size>
-                    <width>300</width>
-                    <height>16777215</height>
-                   </size>
-                  </property>
                   <property name="title">
                    <string>Diamond / Ultimate / Ruby  Weapon</string>
                   </property>
@@ -3054,8 +2985,8 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>388</width>
-                  <height>1974</height>
+                  <width>594</width>
+                  <height>3028</height>
                  </rect>
                 </property>
                 <layout class="QVBoxLayout" name="verticalLayout_62">
@@ -3141,14 +3072,14 @@
                     <item>
                      <widget class="QCheckBox" name="cb_bm1_6">
                       <property name="text">
-                       <string>Jesse Has Been Unstuck</string>
+                       <string>Jessie Has Been Unstuck</string>
                       </property>
                      </widget>
                     </item>
                     <item>
                      <widget class="QCheckBox" name="cb_bm1_8">
                       <property name="text">
-                       <string>Trigger Game Over (countdown timer out)</string>
+                       <string>Trigger Game Over (countdown reached 0)</string>
                       </property>
                      </widget>
                     </item>
@@ -3213,7 +3144,7 @@
                     <item>
                      <widget class="QCheckBox" name="cb_midgartrain_3">
                       <property name="text">
-                       <string>Talked to Jesse Before Looking At Map</string>
+                       <string>Talked to Jessie Before Looking At Map</string>
                       </property>
                      </widget>
                     </item>
@@ -3242,7 +3173,7 @@
                     <item>
                      <widget class="QCheckBox" name="cb_s7ts_1">
                       <property name="text">
-                       <string>Team Avalanche had meeting after Bombing Mission</string>
+                       <string>Avalanche had meeting after Bombing Mission</string>
                       </property>
                      </widget>
                     </item>
@@ -3285,7 +3216,7 @@
                     <item>
                      <widget class="QCheckBox" name="cb_s7pl_1">
                       <property name="text">
-                       <string>Team Avalanche Has Run To Hideout</string>
+                       <string>Avalanche Has Run To Hideout</string>
                       </property>
                      </widget>
                     </item>
@@ -3360,42 +3291,6 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QGroupBox" name="groupBox_24">
-                   <property name="title">
-                    <string>Sector 5</string>
-                   </property>
-                   <layout class="QVBoxLayout" name="verticalLayout_17">
-                    <property name="leftMargin">
-                     <number>3</number>
-                    </property>
-                    <property name="rightMargin">
-                     <number>3</number>
-                    </property>
-                    <item>
-                     <widget class="QCheckBox" name="cb_s5_3">
-                      <property name="text">
-                       <string>Talked with Sick Man</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QCheckBox" name="cb_s5_4">
-                      <property name="text">
-                       <string>Aeris Talked About Sick Man</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QCheckBox" name="cb_s5_8">
-                      <property name="text">
-                       <string>After Aeris Church Scene</string>
-                      </property>
-                     </widget>
-                    </item>
-                   </layout>
-                  </widget>
-                 </item>
-                 <item>
                   <widget class="QGroupBox" name="bm_unknown">
                    <property name="title">
                     <string>Unknowns / Unused</string>
@@ -3614,27 +3509,6 @@
                       </property>
                      </widget>
                     </item>
-                    <item>
-                     <widget class="QCheckBox" name="cb_s5_1">
-                      <property name="text">
-                       <string>cb_s5_1</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QCheckBox" name="cb_s5_2">
-                      <property name="text">
-                       <string>cb_s5_2</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QCheckBox" name="cb_s5_5">
-                      <property name="text">
-                       <string>cb_s5_5</string>
-                      </property>
-                     </widget>
-                    </item>
                    </layout>
                   </widget>
                  </item>
@@ -4336,7 +4210,7 @@
                 </sizepolicy>
                </property>
                <property name="text">
-                <string>Number Steps</string>
+                <string>Number of Steps</string>
                </property>
               </widget>
              </item>
@@ -4739,7 +4613,7 @@
              </size>
             </property>
             <property name="title">
-             <string>SnowBoard Mini Game </string>
+             <string>Snowboard Mini Game </string>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_8">
              <property name="spacing">
@@ -5720,6 +5594,171 @@
        </attribute>
        <layout class="QVBoxLayout" name="verticalLayout_3">
         <item>
+         <widget class="QFrame" name="vgroup">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="frameShape">
+           <enum>QFrame::NoFrame</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Plain</enum>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_19">
+           <item>
+            <widget class="QGroupBox" name="psxExtras">
+             <property name="title">
+              <string>Playstation Save Info</string>
+             </property>
+             <property name="flat">
+              <bool>false</bool>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_21">
+              <property name="spacing">
+               <number>0</number>
+              </property>
+              <property name="leftMargin">
+               <number>0</number>
+              </property>
+              <property name="topMargin">
+               <number>3</number>
+              </property>
+              <property name="rightMargin">
+               <number>0</number>
+              </property>
+              <property name="bottomMargin">
+               <number>3</number>
+              </property>
+              <item>
+               <widget class="QLabel" name="lblRegionString">
+                <property name="text">
+                 <string>PsxName:</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_12">
+                <property name="spacing">
+                 <number>3</number>
+                </property>
+                <item>
+                 <widget class="QLabel" name="lblPsxIcon">
+                  <property name="minimumSize">
+                   <size>
+                    <width>64</width>
+                    <height>64</height>
+                   </size>
+                  </property>
+                  <property name="maximumSize">
+                   <size>
+                    <width>64</width>
+                    <height>64</height>
+                   </size>
+                  </property>
+                  <property name="text">
+                   <string>TextLabel</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLabel" name="lblSlotSize">
+                  <property name="text">
+                   <string>TextLabel</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <widget class="QLineEdit" name="linePsxDesc">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="maxLength">
+                 <number>60</number>
+                </property>
+                <property name="readOnly">
+                 <bool>false</bool>
+                </property>
+                <property name="placeholderText">
+                 <string>No Description Text</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QWidget" name="boxHexData" native="true">
+                <layout class="QVBoxLayout" name="verticalLayout_15">
+                 <item>
+                  <layout class="QHBoxLayout" name="Hgroup">
+                   <item>
+                    <widget class="QLabel" name="label_232">
+                     <property name="maximumSize">
+                      <size>
+                       <width>75</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string>Show:</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QComboBox" name="combo_hexEditor">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="minimumSize">
+                      <size>
+                       <width>150</width>
+                       <height>0</height>
+                      </size>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>16777215</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="frame">
+                      <bool>true</bool>
+                     </property>
+                     <item>
+                      <property name="text">
+                       <string>PSX Save Data</string>
+                      </property>
+                     </item>
+                     <item>
+                      <property name="text">
+                       <string notr="true">FF7 Save Data</string>
+                      </property>
+                     </item>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
          <widget class="QFrame" name="frame_2">
           <property name="frameShape">
            <enum>QFrame::NoFrame</enum>
@@ -5762,187 +5801,6 @@
              </property>
             </widget>
            </item>
-           <item>
-            <widget class="QFrame" name="vgroup">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::NoFrame</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Plain</enum>
-             </property>
-             <layout class="QVBoxLayout" name="verticalLayout_19">
-              <item>
-               <spacer name="spacer_23">
-                <property name="orientation">
-                 <enum>Qt::Vertical</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>20</width>
-                  <height>40</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <widget class="QGroupBox" name="psxExtras">
-                <property name="title">
-                 <string>Playstation Save Info</string>
-                </property>
-                <property name="flat">
-                 <bool>false</bool>
-                </property>
-                <layout class="QVBoxLayout" name="verticalLayout_21">
-                 <property name="spacing">
-                  <number>0</number>
-                 </property>
-                 <property name="leftMargin">
-                  <number>0</number>
-                 </property>
-                 <property name="topMargin">
-                  <number>3</number>
-                 </property>
-                 <property name="rightMargin">
-                  <number>0</number>
-                 </property>
-                 <property name="bottomMargin">
-                  <number>3</number>
-                 </property>
-                 <item>
-                  <widget class="QLabel" name="lblRegionString">
-                   <property name="text">
-                    <string>PsxName:</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <layout class="QHBoxLayout" name="horizontalLayout_12">
-                   <property name="spacing">
-                    <number>3</number>
-                   </property>
-                   <item>
-                    <widget class="QLabel" name="lblPsxIcon">
-                     <property name="minimumSize">
-                      <size>
-                       <width>64</width>
-                       <height>64</height>
-                      </size>
-                     </property>
-                     <property name="maximumSize">
-                      <size>
-                       <width>64</width>
-                       <height>64</height>
-                      </size>
-                     </property>
-                     <property name="text">
-                      <string>TextLabel</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QLabel" name="lblSlotSize">
-                     <property name="text">
-                      <string>TextLabel</string>
-                     </property>
-                    </widget>
-                   </item>
-                  </layout>
-                 </item>
-                 <item>
-                  <widget class="QLineEdit" name="linePsxDesc">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="maxLength">
-                    <number>60</number>
-                   </property>
-                   <property name="readOnly">
-                    <bool>false</bool>
-                   </property>
-                   <property name="placeholderText">
-                    <string>No Description Text</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QGroupBox" name="groupBox12">
-                   <property name="title">
-                    <string/>
-                   </property>
-                   <layout class="QVBoxLayout" name="verticalLayout_15">
-                    <item>
-                     <layout class="QHBoxLayout" name="Hgroup">
-                      <item>
-                       <widget class="QLabel" name="label_232">
-                        <property name="maximumSize">
-                         <size>
-                          <width>75</width>
-                          <height>16777215</height>
-                         </size>
-                        </property>
-                        <property name="text">
-                         <string>Show:</string>
-                        </property>
-                       </widget>
-                      </item>
-                      <item>
-                       <widget class="QComboBox" name="combo_hexEditor">
-                        <property name="sizePolicy">
-                         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                          <horstretch>0</horstretch>
-                          <verstretch>0</verstretch>
-                         </sizepolicy>
-                        </property>
-                        <property name="minimumSize">
-                         <size>
-                          <width>150</width>
-                          <height>0</height>
-                         </size>
-                        </property>
-                        <property name="maximumSize">
-                         <size>
-                          <width>16777215</width>
-                          <height>16777215</height>
-                         </size>
-                        </property>
-                        <property name="frame">
-                         <bool>true</bool>
-                        </property>
-                        <item>
-                         <property name="text">
-                          <string>PSX Save Data</string>
-                         </property>
-                        </item>
-                        <item>
-                         <property name="text">
-                          <string notr="true">FF7 Save Data</string>
-                         </property>
-                        </item>
-                       </widget>
-                      </item>
-                     </layout>
-                    </item>
-                   </layout>
-                  </widget>
-                 </item>
-                </layout>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
           </layout>
          </widget>
         </item>
@@ -5992,19 +5850,7 @@
            <attribute name="title">
             <string>Misc</string>
            </attribute>
-           <layout class="QVBoxLayout" name="verticalLayout_125">
-            <property name="leftMargin">
-             <number>3</number>
-            </property>
-            <property name="topMargin">
-             <number>3</number>
-            </property>
-            <property name="rightMargin">
-             <number>3</number>
-            </property>
-            <property name="bottomMargin">
-             <number>3</number>
-            </property>
+           <layout class="QVBoxLayout" name="verticalLayout_20">
             <item>
              <layout class="QHBoxLayout" name="horizontalLayout_157">
               <item>
@@ -6160,6 +6006,13 @@
              </layout>
             </item>
             <item>
+             <widget class="QCheckBox" name="cb_FlashbackPiano">
+              <property name="text">
+               <string>Played piano durring flashback</string>
+              </property>
+             </widget>
+            </item>
+            <item>
              <widget class="QLabel" name="label_187">
               <property name="text">
                <string>When Box is Partally Checked (&quot;-&quot;) it will
@@ -7188,8 +7041,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>773</width>
-     <height>26</height>
+     <width>1306</width>
+     <height>42</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuAbout">
@@ -7726,8 +7579,8 @@
   <tabstop>sb_timer_time_sec</tabstop>
  </tabstops>
  <resources>
-  <include location="ff7tk/icons/common.qrc"/>
   <include location="images.qrc"/>
+  <include location="ff7tk/icons/common.qrc"/>
  </resources>
  <connections>
   <connection>
diff -Nru blackchocobo-1.9.900/options.cpp blackchocobo-1.9.910/options.cpp
--- blackchocobo-1.9.900/options.cpp	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/options.cpp	2018-12-29 20:35:46.000000000 +0000
@@ -1,5 +1,5 @@
 /****************************************************************************/
-//    copyright 2010-2016 Chris Rizzitello <sithlord48@gmail.com>           //
+//    copyright 2010-2018 Chris Rizzitello <sithlord48@gmail.com>           //
 //                                                                          //
 //    This file is part of Black Chocobo.                                   //
 //                                                                          //
@@ -14,6 +14,7 @@
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
 
+#include <QStyle>
 #include "options.h"
 #include "ui_options.h"
 
@@ -22,13 +23,14 @@
 	ui(new Ui::Options)
 {
 	ui->setupUi(this);
+    ui->pushButton->setIcon(QIcon::fromTheme("window-close", style()->standardIcon(QStyle::SP_DialogCloseButton)));
 	load=false;
 	//Disable the defaut_save line and selector button unless override is checked
 	ui->line_default_save->setVisible(false);
 	ui->btn_set_default_save->setVisible(false);
 	ui->reset_default_save_location->setVisible(false);
 	//Hide the ps3 signing area if not built with openssl support.
-	#if(OPENSSL==0)
+    #if(!OPENSSL)
 	ui->groupBox_3->setTitle(tr("Signing is disabled! Build with OpenSSL support to enable"));
 	#endif
 	settings = config_data;
diff -Nru blackchocobo-1.9.900/options.ui blackchocobo-1.9.910/options.ui
--- blackchocobo-1.9.900/options.ui	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/options.ui	2018-12-29 20:35:46.000000000 +0000
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>485</width>
-    <height>605</height>
+    <width>771</width>
+    <height>982</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -59,15 +59,30 @@
         </item>
         <item>
          <widget class="QPushButton" name="btn_set_load_path">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="maximumSize">
            <size>
-            <width>24</width>
-            <height>24</height>
+            <width>32</width>
+            <height>48</height>
+           </size>
+          </property>
+          <property name="baseSize">
+           <size>
+            <width>32</width>
+            <height>33</height>
            </size>
           </property>
           <property name="text">
            <string notr="true">...</string>
           </property>
+          <property name="flat">
+           <bool>false</bool>
+          </property>
          </widget>
         </item>
        </layout>
@@ -92,8 +107,8 @@
          <widget class="QPushButton" name="btn_set_save_emu">
           <property name="maximumSize">
            <size>
-            <width>24</width>
-            <height>24</height>
+            <width>32</width>
+            <height>48</height>
            </size>
           </property>
           <property name="text">
@@ -119,8 +134,8 @@
          <widget class="QPushButton" name="btn_set_save_pc">
           <property name="maximumSize">
            <size>
-            <width>24</width>
-            <height>24</height>
+            <width>32</width>
+            <height>48</height>
            </size>
           </property>
           <property name="text">
@@ -146,8 +161,8 @@
          <widget class="QPushButton" name="btn_set_char_stat_folder">
           <property name="maximumSize">
            <size>
-            <width>24</width>
-            <height>24</height>
+            <width>32</width>
+            <height>48</height>
            </size>
           </property>
           <property name="text">
@@ -183,6 +198,9 @@
       </property>
       <item>
        <widget class="QCheckBox" name="cbEditableCombos">
+        <property name="styleSheet">
+         <string notr="true"/>
+        </property>
         <property name="text">
          <string>Editable Combo for Materia and Items</string>
         </property>
@@ -248,12 +266,6 @@
        <layout class="QHBoxLayout" name="_4">
         <item>
          <widget class="QCheckBox" name="cb_override_def_save">
-          <property name="maximumSize">
-           <size>
-            <width>16777215</width>
-            <height>24</height>
-           </size>
-          </property>
           <property name="text">
            <string>Override Builtin New Game Data</string>
           </property>
@@ -270,8 +282,8 @@
          <widget class="QPushButton" name="btn_set_default_save">
           <property name="maximumSize">
            <size>
-            <width>24</width>
-            <height>24</height>
+            <width>32</width>
+            <height>48</height>
            </size>
           </property>
           <property name="text">
@@ -283,8 +295,8 @@
          <widget class="QPushButton" name="reset_default_save_location">
           <property name="maximumSize">
            <size>
-            <width>24</width>
-            <height>24</height>
+            <width>32</width>
+            <height>48</height>
            </size>
           </property>
           <property name="toolTip">
diff -Nru blackchocobo-1.9.900/.travis.yml blackchocobo-1.9.910/.travis.yml
--- blackchocobo-1.9.900/.travis.yml	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/.travis.yml	2018-12-29 20:35:46.000000000 +0000
@@ -1,3 +1,4 @@
+language: cpp
 sudo: required
 dist: trusty
 
@@ -19,25 +20,51 @@
     compiler: gcc
 
 before_script: 
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi
-- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then sudo apt-get -y install qt5-default qttools5-dev-tools libssl-dev; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update > /dev/null; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install qt5; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then chmod -R 755 /usr/local/opt/qt5/*; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then export QTDIR="/usr/local/opt/qt5"; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PATH="$QTDIR/bin:$PATH"; fi
-- $CXX --version
-
-
-script: 
-- mkdir build_blackchocobo
-- cd build_blackchocobo
-- qmake ../Black_Chocobo.pro
-- make -j2
-
-language: cpp
+- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
+    sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y;
+    sudo add-apt-repository ppa:beineri/opt-qt-5.10.1-trusty -y;
+    sudo apt-get update -qq;
+    sudo apt-get -y install build-essential qt5-default qt510tools qt510base g++-4.8 libssl-dev zsync;
+    fi
+
+#MAC OS
+- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
+    brew update > /dev/null;
+    brew install qt5;
+    chmod -R 755 /usr/local/opt/qt5/*;
+    export QTDIR="/usr/local/opt/qt5";
+    export PATH="/usr/local/opt/openssl/bin:$PATH";
+    export PATH="$QTDIR/bin:$PATH";
+    fi
+script:
+- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+    source /opt/qt*/bin/qt*-env.sh;
+    qmake "DEFINES+=OPENSSL=1" "LIBS+=-lcrypto" Black_Chocobo.pro;
+    make -j2;
+    make INSTALL_ROOT=appdir install; find appdir/;
+    mv appdir/usr/share/blackchocobo/lang appdir/usr/bin/lang;
+    rm -rf appdir/usr/share/blackchocobo appdir/usr/share/menu;
+    wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage";
+    chmod a+x linuxdeployqt*.AppImage;
+    unset QTDIR; unset QT_PLUGIN_PATH; unset LD_LIBRARY_PATH;
+    ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs;
+    ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage;
+    fi
+- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
+    export LIBRARY_PATH=/usr/local/opt/openssl/lib;
+    qmake "DEFINES+=OPENSSL=1" "LIBS+=-lcrypto" "INCLUDEPATH+=/usr/local/opt/openssl/include" qmake Black_Chocobo.pro;
+    make -j2;
+    mkdir -p Black_Chocobo.app/Contents/MacOS/lang;
+    mv lang/*.qm Black_Chocobo.app/Contents/MacOS/lang/;
+    macdeployqt Black_Chocobo.app/ -dmg;
+    fi
+after_success:
+- wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
+    find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq ;
+    bash ./upload.sh Black_Chocobo*.AppImage*;
+    fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then bash ./upload.sh Black_Chocobo*.dmg*; fi
 
 env:
   global:
@@ -50,7 +77,7 @@
     project:
       name: "sithlord48/blackchocobo"
       description: "Final Fantasy VII Save Editor"
-    notification_email: sithlord48@gmail.com
+    notication_email: sithlord48@gmail.com
     build_command_prepend: "qmake Black_Chocobo.pro"
     build_command:   "make -j 4"
     branch_pattern: coverity_scan
diff -Nru blackchocobo-1.9.900/version.h blackchocobo-1.9.910/version.h
--- blackchocobo-1.9.900/version.h	2016-06-05 13:17:57.000000000 +0000
+++ blackchocobo-1.9.910/version.h	2018-12-29 20:35:46.000000000 +0000
@@ -20,7 +20,7 @@
 
 #define VER_MAJOR 1
 #define VER_MINOR 9
-#define VER_SP 90
+#define VER_SP 91
 #ifdef SVNVERSION
 #define VER_BUILDNR SVNVERSION
 #else