diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index a7d645e0..c91e693d 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -95,7 +95,7 @@ SET(cockatrice_SOURCES
     src/soundengine.cpp
     src/pending_command.cpp
     src/shortcutssettings.cpp
-    src/sequenceEdit/secuenceedit.cpp
+    src/sequenceEdit/sequenceedit.cpp
     src/sequenceEdit/shortcutstab.cpp
     ${VERSION_STRING_CPP}
 )
diff --git a/cockatrice/src/abstractcounter.cpp b/cockatrice/src/abstractcounter.cpp
index a1dabeb0..0b07d980 100644
--- a/cockatrice/src/abstractcounter.cpp
+++ b/cockatrice/src/abstractcounter.cpp
@@ -18,6 +18,8 @@ AbstractCounter::AbstractCounter(Player *_player, int _id, const QString &_name,
     setAcceptHoverEvents(true);
 #endif
 
+    shortcutActive = false;
+
     if (player->getLocal()) {
         menu = new QMenu(name);
         aSet = new QAction(this);
@@ -40,6 +42,8 @@ AbstractCounter::AbstractCounter(Player *_player, int _id, const QString &_name,
     } else
         menu = 0;
     
+    connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()),this,SLOT(refreshShortcuts()));
+    refreshShortcuts();
     retranslateUi();
 }
 
@@ -66,6 +70,7 @@ void AbstractCounter::retranslateUi()
 void AbstractCounter::setShortcutsActive()
 {
     if (name == "life") {
+        shortcutActive = true;
         aSet->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aSet"));
         aDec->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aDec"));
         aInc->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aInc"));
@@ -74,6 +79,7 @@ void AbstractCounter::setShortcutsActive()
 
 void AbstractCounter::setShortcutsInactive()
 {
+    shortcutActive = false;
     if (name == "life") {
         aSet->setShortcut(QKeySequence());
         aDec->setShortcut(QKeySequence());
@@ -81,6 +87,12 @@ void AbstractCounter::setShortcutsInactive()
     }
 }
 
+void AbstractCounter::refreshShortcuts()
+{
+    if(shortcutActive)
+        setShortcutsActive();
+}
+
 void AbstractCounter::setValue(int _value)
 {
     value = _value;
diff --git a/cockatrice/src/abstractcounter.h b/cockatrice/src/abstractcounter.h
index 174cbf84..f5a04e9d 100644
--- a/cockatrice/src/abstractcounter.h
+++ b/cockatrice/src/abstractcounter.h
@@ -26,6 +26,7 @@ private:
     bool dialogSemaphore, deleteAfterDialog;
     bool shownInCounterArea;
 private slots:
+    void refreshShortcuts();
     void incrementCounter();
     void setCounter();
 public:
@@ -44,6 +45,7 @@ public:
     
     void setShortcutsActive();
     void setShortcutsInactive();
+    bool shortcutActive;
 };
 
 #endif
diff --git a/cockatrice/src/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/dlg_load_deck_from_clipboard.cpp
index 20b746f5..1c41cc1a 100644
--- a/cockatrice/src/dlg_load_deck_from_clipboard.cpp
+++ b/cockatrice/src/dlg_load_deck_from_clipboard.cpp
@@ -18,8 +18,6 @@ DlgLoadDeckFromClipboard::DlgLoadDeckFromClipboard(QWidget *parent)
     contentsEdit = new QPlainTextEdit;
     
     refreshButton = new QPushButton(tr("&Refresh"));
-    refreshButton->setShortcut(settingsCache->shortcuts().getSingleShortcut(
-                                   "DlgLoadDeckFromClipboard/refreshButton"));
     connect(refreshButton, SIGNAL(clicked()), this, SLOT(actRefresh()));
     
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
@@ -37,6 +35,8 @@ DlgLoadDeckFromClipboard::DlgLoadDeckFromClipboard(QWidget *parent)
     resize(500, 500);
     
     actRefresh();
+    connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()),this,SLOT(refreshShortcuts()));
+    refreshShortcuts();
 }
 
 void DlgLoadDeckFromClipboard::actRefresh()
@@ -44,6 +44,11 @@ void DlgLoadDeckFromClipboard::actRefresh()
     contentsEdit->setPlainText(QApplication::clipboard()->text());
 }
 
+void DlgLoadDeckFromClipboard::refreshShortcuts()
+{
+    refreshButton->setShortcut(settingsCache->shortcuts().getSingleShortcut("DlgLoadDeckFromClipboard/refreshButton"));
+}
+
 void DlgLoadDeckFromClipboard::actOK()
 {
     QString buffer = contentsEdit->toPlainText();
diff --git a/cockatrice/src/dlg_load_deck_from_clipboard.h b/cockatrice/src/dlg_load_deck_from_clipboard.h
index 375c713d..ec133a1b 100644
--- a/cockatrice/src/dlg_load_deck_from_clipboard.h
+++ b/cockatrice/src/dlg_load_deck_from_clipboard.h
@@ -12,6 +12,7 @@ class DlgLoadDeckFromClipboard : public QDialog {
 private slots:
     void actOK();
     void actRefresh();
+    void refreshShortcuts();
 private:
     DeckLoader *deckList;
 public:
diff --git a/cockatrice/src/gameview.cpp b/cockatrice/src/gameview.cpp
index d25bdddd..2c5c6163 100644
--- a/cockatrice/src/gameview.cpp
+++ b/cockatrice/src/gameview.cpp
@@ -20,11 +20,11 @@ GameView::GameView(QGraphicsScene *scene, QWidget *parent)
     connect(scene, SIGNAL(sigStopRubberBand()), this, SLOT(stopRubberBand()));
 
     aCloseMostRecentZoneView = new QAction(this);
-    aCloseMostRecentZoneView->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                               "Player/aCloseMostRecentZoneView"));
+
     connect(aCloseMostRecentZoneView, SIGNAL(triggered()), scene, SLOT(closeMostRecentZoneView()));
     addAction(aCloseMostRecentZoneView);
-
+    connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()),this,SLOT(refreshShortcuts()));
+    refreshShortcuts();
     rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
 }
 
@@ -61,3 +61,8 @@ void GameView::stopRubberBand()
 {
     rubberBand->hide();
 }
+
+void GameView::refreshShortcuts()
+{
+    aCloseMostRecentZoneView->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aCloseMostRecentZoneView"));
+}
diff --git a/cockatrice/src/gameview.h b/cockatrice/src/gameview.h
index e678f293..c5fdfe30 100644
--- a/cockatrice/src/gameview.h
+++ b/cockatrice/src/gameview.h
@@ -17,6 +17,7 @@ private slots:
     void startRubberBand(const QPointF &selectionOrigin);
     void resizeRubberBand(const QPointF &cursorPoint);
     void stopRubberBand();
+    void refreshShortcuts();
 public slots:
     void updateSceneRect(const QRectF &rect);
 public:
diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp
index 04d32bc5..1caeba45 100644
--- a/cockatrice/src/player.cpp
+++ b/cockatrice/src/player.cpp
@@ -454,6 +454,8 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, TabGame *_pare
     
     rearrangeZones();
     retranslateUi();
+    connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()),this,SLOT(refreshShortcuts()));
+    refreshShortcuts();
 }
 
 Player::~Player()
@@ -683,123 +685,46 @@ void Player::retranslateUi()
     }
 
     aPlay->setText(tr("&Play"));
-    aPlay->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aPlay"));
-
     aHide->setText(tr("&Hide"));
     aPlayFacedown->setText(tr("Play &Face Down"));
-
     aTap->setText(tr("&Tap"));
-    aTap->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aTap"));
-
     aUntap->setText(tr("&Untap"));
-    aUntap->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aUntap"));
-
     aDoesntUntap->setText(tr("Toggle &normal untapping"));
-    aDoesntUntap->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aDoesntUntap"));
-
     aFlip->setText(tr("&Flip"));
-    aFlip->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aFlip"));
-
     aPeek->setText(tr("&Peek at card face"));
-    aPeek->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aPeek"));
-
     aClone->setText(tr("&Clone"));
-    aClone->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aClone"));
-
     aAttach->setText(tr("Attac&h to card..."));
-    aAttach->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aAttach"));
-
     aUnattach->setText(tr("Unattac&h"));
-    aUnattach->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aUnattach"));
-
     aDrawArrow->setText(tr("&Draw arrow..."));
-    aDrawArrow->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aDrawArrow"));
-
     aIncP->setText(tr("&Increase power"));
-    aIncP->setShortcuts(settingsCache->shortcuts().getShortcut("Player/IncP"));
-
     aDecP->setText(tr("&Decrease power"));
-    aDecP->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aDecP"));
-
     aIncT->setText(tr("I&ncrease toughness"));
-    aIncT->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aIncT"));
-
     aDecT->setText(tr("D&ecrease toughness"));
-    aDecT->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aDecT"));
-
     aIncPT->setText(tr("In&crease power and toughness"));
-    aIncPT->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aIncPT"));
-
     aDecPT->setText(tr("Dec&rease power and toughness"));
-    aDecPT->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aDecPT"));
-
     aSetPT->setText(tr("Set &power and toughness..."));
-    aSetPT->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aSetPT"));
-
     aSetAnnotation->setText(tr("&Set annotation..."));
-    aSetAnnotation->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aSetAnnotation"));
 
     QStringList counterColors;
     counterColors.append(tr("Red"));
     counterColors.append(tr("Yellow"));
     counterColors.append(tr("Green"));
 
-    QList<QKeySequence> addCCShortCuts;
-    addCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut(
-                                     "Player/aCCRed"));
-    addCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut(
-                                     "Player/aCCYellow"));
-    addCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut(
-                                     "Player/aCCGreen"));
-
-    QList<QKeySequence> removeCCShortCuts;
-    removeCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut(
-                                     "Player/aRCRed"));
-    removeCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut(
-                                     "Player/aRCYellow"));
-    removeCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut(
-                                     "Player/aRCGreen"));
-
-    QList<QKeySequence> setCCShortCuts;
-    setCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut(
-                                     "Player/aSCRed"));
-    setCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut(
-                                     "Player/aSCYellow"));
-    setCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut(
-                                     "Player/aSCGreen"));
-
     for (int i = 0; i < aAddCounter.size(); ++i){
         aAddCounter[i]->setText(tr("&Add counter (%1)").arg(counterColors[i]));
-        aAddCounter[i]->setShortcut(addCCShortCuts[i]);
     }
     for (int i = 0; i < aRemoveCounter.size(); ++i){
         aRemoveCounter[i]->setText(tr("&Remove counter (%1)").arg(counterColors[i]));
-        aRemoveCounter[i]->setShortcut(removeCCShortCuts[i]);
     }
     for (int i = 0; i < aSetCounter.size(); ++i){
         aSetCounter[i]->setText(tr("&Set counters (%1)...").arg(counterColors[i]));
-        aSetCounter[i]->setShortcut(setCCShortCuts[i]);
     }
 
     aMoveToTopLibrary->setText(tr("&Top of library"));
-    aMoveToTopLibrary->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                        "Player/aMoveToTopLibrary"));
-
     aMoveToBottomLibrary->setText(tr("&Bottom of library"));
-    aMoveToBottomLibrary->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                            "Player/aMoveToBottomLibrary"));
-
     aMoveToHand->setText(tr("&Hand"));
-    aMoveToHand->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                                "Player/aMoveToHand"));
-
     aMoveToGraveyard->setText(tr("&Graveyard"));
-    aMoveToGraveyard->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                      "Player/aMoveToGraveyard"));
-
     aMoveToExile->setText(tr("&Exile"));
-    aMoveToExile->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                                    "Player/aMoveToExile"));
 
     QMapIterator<QString, CardZone *> zoneIterator(zones);
     while (zoneIterator.hasNext())
@@ -810,54 +735,73 @@ void Player::setShortcutsActive()
 {
     shortcutsActive = true;
     
-    aViewSideboard->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                     "Player/aViewSideboard"));
+    aPlay->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aPlay"));
+    aTap->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aTap"));
+    aUntap->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aUntap"));
+    aDoesntUntap->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aDoesntUntap"));
+    aFlip->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aFlip"));
+    aPeek->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aPeek"));
+    aClone->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aClone"));
+    aAttach->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aAttach"));
+    aUnattach->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aUnattach"));
+    aDrawArrow->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aDrawArrow"));
+    aIncP->setShortcuts(settingsCache->shortcuts().getShortcut("Player/IncP"));
+    aDecP->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aDecP"));
+    aIncT->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aIncT"));
+    aDecT->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aDecT"));
+    aIncPT->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aIncPT"));
+    aDecPT->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aDecPT"));
+    aSetPT->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aSetPT"));
+    aSetAnnotation->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aSetAnnotation"));
+    aMoveToTopLibrary->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aMoveToTopLibrary"));
+    aMoveToBottomLibrary->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aMoveToBottomLibrary"));
+    aMoveToHand->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aMoveToHand"));
+    aMoveToGraveyard->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aMoveToGraveyard"));
+    aMoveToExile->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aMoveToExile"));
 
-    aViewLibrary->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                   "Player/aViewLibrary"));
+    QList<QKeySequence> addCCShortCuts;
+    addCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut("Player/aCCRed"));
+    addCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut("Player/aCCYellow"));
+    addCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut("Player/aCCGreen"));
 
-    aViewTopCards->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                    "Player/aViewTopCards"));
+    QList<QKeySequence> removeCCShortCuts;
+    removeCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut("Player/aRCRed"));
+    removeCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut("Player/aRCYellow"));
+    removeCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut("Player/aRCGreen"));
 
-    aViewGraveyard->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                     "Player/aViewGraveyard"));
+    QList<QKeySequence> setCCShortCuts;
+    setCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut("Player/aSCRed"));
+    setCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut("Player/aSCYellow"));
+    setCCShortCuts.append(settingsCache->shortcuts().getSingleShortcut("Player/aSCGreen"));
 
-    aViewRfg->setShortcuts(settingsCache->shortcuts().getShortcut(
-                               "Player/aViewRfg"));
-
-    aDrawCard->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                "Player/aDrawCard"));
-
-    aDrawCards->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                 "Player/aDrawCards"));
-
-    aUndoDraw->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                "Player/aUndoDraw"));
-
-    aMulligan->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                "Player/aMulligan"));
-
-    aShuffle->setShortcuts(settingsCache->shortcuts().getShortcut(
-                               "Player/aShuffle"));
-
-    aUntapAll->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                "Player/aUntapAll"));
-
-    aRollDie->setShortcuts(settingsCache->shortcuts().getShortcut(
-                               "Player/aRollDie"));
-
-    aCreateToken->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                   "Player/aCreateToken"));
-
-    aCreateAnotherToken->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                          "Player/aCreateAnotherToken"));
-
-    aAlwaysRevealTopCard->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                           "Player/aAlwaysRevealTopCard"));
+    for (int i = 0; i < aAddCounter.size(); ++i){
+        aAddCounter[i]->setShortcut(addCCShortCuts.at(i));
+    }
+    for (int i = 0; i < aRemoveCounter.size(); ++i){
+        aRemoveCounter[i]->setShortcut(removeCCShortCuts.at(i));
+    }
+    for (int i = 0; i < aSetCounter.size(); ++i){
+        aSetCounter[i]->setShortcut(setCCShortCuts.at(i));
+    }
 
     QMapIterator<int, AbstractCounter *> counterIterator(counters);
     while (counterIterator.hasNext())
         counterIterator.next().value()->setShortcutsActive();
+
+    aViewSideboard->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aViewSideboard"));
+    aViewLibrary->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aViewLibrary"));
+    aViewTopCards->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aViewTopCards"));
+    aViewGraveyard->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aViewGraveyard"));
+    aDrawCard->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aDrawCard"));
+    aDrawCards->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aDrawCards"));
+    aUndoDraw->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aUndoDraw"));
+    aMulligan->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aMulligan"));
+    aShuffle->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aShuffle"));
+    aUntapAll->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aUntapAll"));
+    aRollDie->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aRollDie"));
+    aCreateToken->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aCreateToken"));
+    aCreateAnotherToken->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aCreateAnotherToken"));
+    aAlwaysRevealTopCard->setShortcut(settingsCache->shortcuts().getSingleShortcut("Player/aAlwaysRevealTopCard"));
 }
 
 void Player::setShortcutsInactive()
@@ -2346,6 +2290,12 @@ void Player::actPlayFacedown()
     playCard(game->getActiveCard(), true, false);
 }
 
+void Player::refreshShortcuts()
+{
+    if(shortcutsActive)
+        setShortcutsActive();
+}
+
 void Player::updateCardMenu(CardItem *card)
 {
     QMenu *cardMenu = card->getCardMenu();
diff --git a/cockatrice/src/player.h b/cockatrice/src/player.h
index 45baa7ae..5eb1a57f 100644
--- a/cockatrice/src/player.h
+++ b/cockatrice/src/player.h
@@ -159,6 +159,7 @@ private slots:
     void actPlay();
     void actHide();
     void actPlayFacedown();
+    void refreshShortcuts();
 
 private:
     TabGame *game;
diff --git a/cockatrice/src/sequenceEdit/secuenceedit.cpp b/cockatrice/src/sequenceEdit/sequenceedit.cpp
similarity index 83%
rename from cockatrice/src/sequenceEdit/secuenceedit.cpp
rename to cockatrice/src/sequenceEdit/sequenceedit.cpp
index b7078a2d..1056b576 100644
--- a/cockatrice/src/sequenceEdit/secuenceedit.cpp
+++ b/cockatrice/src/sequenceEdit/sequenceedit.cpp
@@ -1,4 +1,4 @@
-#include "secuenceedit.h"
+#include "sequenceedit.h"
 #include "../settingscache.h"
 #include <QLineEdit>
 #include <QPushButton>
@@ -7,7 +7,7 @@
 #include <QKeyEvent>
 #include <QToolTip>
 
-SecuenceEdit::SecuenceEdit(QString _shorcutName, QWidget *parent) : QWidget(parent)
+SequenceEdit::SequenceEdit(QString _shorcutName, QWidget *parent) : QWidget(parent)
 {
     shorcutName = _shorcutName;
     currentKey = 0;
@@ -19,16 +19,21 @@ SecuenceEdit::SecuenceEdit(QString _shorcutName, QWidget *parent) : QWidget(pare
     clearButton = new QPushButton("", this);
     defaultButton = new QPushButton("", this);
 
-    lineEdit->setMinimumWidth(100);
+    lineEdit->setMinimumWidth(70);
     clearButton->setMaximumWidth(lineEdit->height());
     defaultButton->setMaximumWidth(lineEdit->height());
+    clearButton->setMaximumHeight(lineEdit->height());
+    defaultButton->setMaximumHeight(lineEdit->height());
 
     clearButton->setIcon(QIcon(":/resources/icon_clearsearch.svg"));
     defaultButton->setIcon(QIcon(":/resources/icon_update.png"));
 
+    clearButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
+    defaultButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
+
     QHBoxLayout *layout = new QHBoxLayout(this);
     layout->setContentsMargins(0,0,0,0);
-    layout->setSpacing(0);
+    layout->setSpacing(1);
     layout->addWidget(lineEdit);
     layout->addWidget(clearButton);
     layout->addWidget(defaultButton);
@@ -40,12 +45,12 @@ SecuenceEdit::SecuenceEdit(QString _shorcutName, QWidget *parent) : QWidget(pare
     lineEdit->setText(settingsCache->shortcuts().getShortcutString(shorcutName));
 }
 
-QString SecuenceEdit::getSecuence()
+QString SequenceEdit::getSecuence()
 {
     return lineEdit->text();
 }
 
-void SecuenceEdit::removeLastShortcut()
+void SequenceEdit::removeLastShortcut()
 {
     QString secuences = lineEdit->text();
     if(!secuences.isEmpty())
@@ -60,13 +65,13 @@ void SecuenceEdit::removeLastShortcut()
     }
 }
 
-void SecuenceEdit::restoreDefault()
+void SequenceEdit::restoreDefault()
 {
     lineEdit->setText(settingsCache->shortcuts().getDefaultShortcutString(shorcutName));
     updateSettings();
 }
 
-bool SecuenceEdit::eventFilter(QObject *, QEvent * event)
+bool SequenceEdit::eventFilter(QObject *, QEvent * event)
 {
     if(event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease)
     {
@@ -81,7 +86,7 @@ bool SecuenceEdit::eventFilter(QObject *, QEvent * event)
     return false;
 }
 
-void SecuenceEdit::processKey(QKeyEvent* e)
+void SequenceEdit::processKey(QKeyEvent* e)
 {
     int key = e->key();
     if(key != Qt::Key_Control && key != Qt::Key_Shift
@@ -96,7 +101,7 @@ void SecuenceEdit::processKey(QKeyEvent* e)
         finishShortcut();
 }
 
-int SecuenceEdit::translateModifiers(Qt::KeyboardModifiers state, const QString &text)
+int SequenceEdit::translateModifiers(Qt::KeyboardModifiers state, const QString &text)
 {
     int result = 0;
     // The shift modifier only counts when it is not used to type a symbol
@@ -116,7 +121,7 @@ int SecuenceEdit::translateModifiers(Qt::KeyboardModifiers state, const QString
     return result;
 }
 
-void SecuenceEdit::finishShortcut()
+void SequenceEdit::finishShortcut()
 {
     QKeySequence secuence(keys);
     if(!secuence.isEmpty() && valid)
@@ -143,7 +148,7 @@ void SecuenceEdit::finishShortcut()
     updateSettings();
 }
 
-void SecuenceEdit::updateSettings()
+void SequenceEdit::updateSettings()
 {
     settingsCache->shortcuts().setShortcuts(shorcutName,lineEdit->text());
 }
diff --git a/cockatrice/src/sequenceEdit/secuenceedit.h b/cockatrice/src/sequenceEdit/sequenceedit.h
similarity index 88%
rename from cockatrice/src/sequenceEdit/secuenceedit.h
rename to cockatrice/src/sequenceEdit/sequenceedit.h
index b8f95874..0a016c2c 100644
--- a/cockatrice/src/sequenceEdit/secuenceedit.h
+++ b/cockatrice/src/sequenceEdit/sequenceedit.h
@@ -8,11 +8,11 @@ class QLineEdit;
 class QPushButton;
 class QEvent;
 
-class SecuenceEdit : public QWidget
+class SequenceEdit : public QWidget
 {
     Q_OBJECT
 public:
-    SecuenceEdit(QString _shorcutName, QWidget *parent = 0);
+    SequenceEdit(QString _shorcutName, QWidget *parent = 0);
     QString getSecuence();
 signals:
 
diff --git a/cockatrice/src/sequenceEdit/ui_shortcutstab.h b/cockatrice/src/sequenceEdit/ui_shortcutstab.h
index fb0812b9..da61fd7c 100644
--- a/cockatrice/src/sequenceEdit/ui_shortcutstab.h
+++ b/cockatrice/src/sequenceEdit/ui_shortcutstab.h
@@ -14,7 +14,7 @@
 #include <QTabWidget>
 #include <QVBoxLayout>
 #include <QWidget>
-#include "secuenceedit.h"
+#include "sequenceedit.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -28,97 +28,97 @@ public:
     QGroupBox *groupBox;
     QGridLayout *gridLayout_2;
     QLabel *lbl_MainWindow_aDeckEditor;
-    SecuenceEdit *MainWindow_aDeckEditor;
+    SequenceEdit *MainWindow_aDeckEditor;
     QLabel *lbl_MainWindow_aSinglePlayer;
-    SecuenceEdit *MainWindow_aSinglePlayer;
+    SequenceEdit *MainWindow_aSinglePlayer;
     QLabel *lbl_MainWindow_aWatchReplay;
     QLabel *lbl_MainWindow_aConnect;
-    SecuenceEdit *MainWindow_aConnect;
+    SequenceEdit *MainWindow_aConnect;
     QLabel *lbl_MainWindow_aRegister;
     QLabel *lbl_MainWindow_aFullScreen;
-    SecuenceEdit *MainWindow_aFullScreen;
+    SequenceEdit *MainWindow_aFullScreen;
     QLabel *lbl_MainWindow_aSettings;
-    SecuenceEdit *MainWindow_aRegister;
+    SequenceEdit *MainWindow_aRegister;
     QLabel *lbl_MainWindow_aCheckCardUpdates;
-    SecuenceEdit *MainWindow_aSettings;
-    SecuenceEdit *MainWindow_aCheckCardUpdates;
-    SecuenceEdit *MainWindow_aWatchReplay;
-    SecuenceEdit *MainWindow_aDisconnect;
+    SequenceEdit *MainWindow_aSettings;
+    SequenceEdit *MainWindow_aCheckCardUpdates;
+    SequenceEdit *MainWindow_aWatchReplay;
+    SequenceEdit *MainWindow_aDisconnect;
     QLabel *lbl_MainWindow_aDisconnect;
     QLabel *lbl_MainWindow_aExit;
-    SecuenceEdit *MainWindow_aExit;
+    SequenceEdit *MainWindow_aExit;
     QGroupBox *groupBox_2;
     QGridLayout *gridLayout;
     QLabel *lbl_TabDeckEditor_aAnalyzeDeck;
-    SecuenceEdit *TabDeckEditor_aAnalyzeDeck;
+    SequenceEdit *TabDeckEditor_aAnalyzeDeck;
     QLabel *lbl_TabDeckEditor_aLoadDeckFromClipboard;
-    SecuenceEdit *TabDeckEditor_aLoadDeckFromClipboard;
+    SequenceEdit *TabDeckEditor_aLoadDeckFromClipboard;
     QLabel *lbl_TabDeckEditor_aClearFilterAll;
-    SecuenceEdit *TabDeckEditor_aClearFilterAll;
+    SequenceEdit *TabDeckEditor_aClearFilterAll;
     QLabel *lbl_TabDeckEditor_aNewDeck;
-    SecuenceEdit *TabDeckEditor_aNewDeck;
+    SequenceEdit *TabDeckEditor_aNewDeck;
     QLabel *lbl_TabDeckEditor_aClearFilterOne;
-    SecuenceEdit *TabDeckEditor_aClearFilterOne;
+    SequenceEdit *TabDeckEditor_aClearFilterOne;
     QLabel *lbl_TabDeckEditor_aOpenCustomFolder;
-    SecuenceEdit *TabDeckEditor_aOpenCustomFolder;
+    SequenceEdit *TabDeckEditor_aOpenCustomFolder;
     QLabel *lbl_TabDeckEditor_aClose;
-    SecuenceEdit *TabDeckEditor_aClose;
+    SequenceEdit *TabDeckEditor_aClose;
     QLabel *lbl_TabDeckEditor_aPrintDeck;
-    SecuenceEdit *TabDeckEditor_aPrintDeck;
+    SequenceEdit *TabDeckEditor_aPrintDeck;
     QLabel *lbl_TabDeckEditor_aEditSets;
-    SecuenceEdit *TabDeckEditor_aEditSets;
+    SequenceEdit *TabDeckEditor_aEditSets;
     QLabel *lbl_TabDeckEditor_aRemoveCard;
-    SecuenceEdit *TabDeckEditor_aRemoveCard;
+    SequenceEdit *TabDeckEditor_aRemoveCard;
     QLabel *lbl_TabDeckEditor_aEditTokens;
-    SecuenceEdit *TabDeckEditor_aEditTokens;
+    SequenceEdit *TabDeckEditor_aEditTokens;
     QLabel *lbl_TabDeckEditor_aResetLayout;
-    SecuenceEdit *TabDeckEditor_aResetLayout;
+    SequenceEdit *TabDeckEditor_aResetLayout;
     QLabel *lbl_TabDeckEditor_aIncrement;
-    SecuenceEdit *TabDeckEditor_aIncrement;
+    SequenceEdit *TabDeckEditor_aIncrement;
     QLabel *lbl_TabDeckEditor_aSaveDeck;
-    SecuenceEdit *TabDeckEditor_aSaveDeck;
+    SequenceEdit *TabDeckEditor_aSaveDeck;
     QLabel *lbl_TabDeckEditor_aDecrement;
-    SecuenceEdit *TabDeckEditor_aDecrement;
+    SequenceEdit *TabDeckEditor_aDecrement;
     QLabel *lbl_TabDeckEditor_aSaveDeckAs;
-    SecuenceEdit *TabDeckEditor_aSaveDeckAs;
+    SequenceEdit *TabDeckEditor_aSaveDeckAs;
     QLabel *lbl_TabDeckEditor_aLoadDeck;
-    SecuenceEdit *TabDeckEditor_aLoadDeck;
+    SequenceEdit *TabDeckEditor_aLoadDeck;
     QLabel *lbl_TabDeckEditor_aSaveDeckToClipboard;
-    SecuenceEdit *TabDeckEditor_aSaveDeckToClipboard;
+    SequenceEdit *TabDeckEditor_aSaveDeckToClipboard;
     QGroupBox *groupBox_3;
     QHBoxLayout *horizontalLayout;
     QGroupBox *groupBox_4;
     QGridLayout *gridLayout_4;
     QLabel *lbl_abstractCounter_sSet;
-    SecuenceEdit *abstractCounter_aSet;
+    SequenceEdit *abstractCounter_aSet;
     QLabel *lbl_abstractCounter_aInc;
-    SecuenceEdit *abstractCounter_Inc;
+    SequenceEdit *abstractCounter_Inc;
     QLabel *lbl_abstractCounter_aDec;
-    SecuenceEdit *abstractCounter_aDec;
+    SequenceEdit *abstractCounter_aDec;
     QGroupBox *groupBox_5;
     QGridLayout *gridLayout_6;
     QLabel *lbl_Player_aSCRed;
-    SecuenceEdit *Player_aSCRed;
+    SequenceEdit *Player_aSCRed;
     QLabel *lbl_Player_aCCRed;
-    SecuenceEdit *Player_aCCRed;
+    SequenceEdit *Player_aCCRed;
     QLabel *lbl_Player_aRCRed;
-    SecuenceEdit *Player_aRCRed;
+    SequenceEdit *Player_aRCRed;
     QGroupBox *groupBox_6;
     QGridLayout *gridLayout_7;
     QLabel *lbl_Player_aSCGreen;
-    SecuenceEdit *Player_aSCGreen;
+    SequenceEdit *Player_aSCGreen;
     QLabel *lbl_Player_aCCGreen;
-    SecuenceEdit *Player_aCCGreen;
+    SequenceEdit *Player_aCCGreen;
     QLabel *lbl_Player_aRCGreen;
-    SecuenceEdit *Player_aRCGreen;
+    SequenceEdit *Player_aRCGreen;
     QGroupBox *groupBox_7;
     QGridLayout *gridLayout_8;
     QLabel *lbl_Player_aSCYellow;
-    SecuenceEdit *Player_aSCYellow;
+    SequenceEdit *Player_aSCYellow;
     QLabel *lbl_Player_aCCYellow;
-    SecuenceEdit *Player_aCCYellow;
+    SequenceEdit *Player_aCCYellow;
     QLabel *lbl_Player_aRCYellow;
-    SecuenceEdit *Player_aRCYellow;
+    SequenceEdit *Player_aRCYellow;
     QSpacerItem *verticalSpacer;
     QWidget *tab_2;
     QGridLayout *gridLayout_17;
@@ -126,145 +126,145 @@ public:
     QVBoxLayout *verticalLayout;
     QGroupBox *groupBox_12;
     QGridLayout *gridLayout_12;
-    SecuenceEdit *Player_aDecPT;
-    SecuenceEdit *Player_aIncPT;
+    SequenceEdit *Player_aDecPT;
+    SequenceEdit *Player_aIncPT;
     QLabel *lbl_Player_aIncPT;
     QLabel *lbl_Player_aDecPT;
-    SecuenceEdit *Player_aSetPT;
+    SequenceEdit *Player_aSetPT;
     QLabel *lbl_Player_aSetPT;
     QGroupBox *groupBox_11;
     QGridLayout *gridLayout_11;
     QLabel *lbl_Player_aDecT;
-    SecuenceEdit *Player_aDecT;
+    SequenceEdit *Player_aDecT;
     QLabel *lbl_Player_aIncT;
-    SecuenceEdit *Player_aIncT;
+    SequenceEdit *Player_aIncT;
     QGroupBox *groupBox_10;
     QGridLayout *gridLayout_10;
     QLabel *lbl_Player_aDecP;
-    SecuenceEdit *Player_aDecP;
-    SecuenceEdit *Player_IncP;
+    SequenceEdit *Player_aDecP;
+    SequenceEdit *Player_IncP;
     QLabel *lbl_Player_IncP;
     QGroupBox *groupBox_8;
     QGridLayout *gridLayout_5;
     QLabel *lbl_TabGame_phase0;
-    SecuenceEdit *TabGame_phase0;
+    SequenceEdit *TabGame_phase0;
     QLabel *lbl_TabGame_phase1;
-    SecuenceEdit *TabGame_phase1;
+    SequenceEdit *TabGame_phase1;
     QLabel *lbl_TabGame_phase2;
-    SecuenceEdit *TabGame_phase2;
+    SequenceEdit *TabGame_phase2;
     QLabel *lbl_TabGame_phase3;
-    SecuenceEdit *TabGame_phase3;
+    SequenceEdit *TabGame_phase3;
     QLabel *lbl_TabGame_phase4;
-    SecuenceEdit *TabGame_phase4;
+    SequenceEdit *TabGame_phase4;
     QLabel *lbl_TabGame_phase5;
-    SecuenceEdit *TabGame_phase5;
+    SequenceEdit *TabGame_phase5;
     QLabel *lbl_TabGame_phase6;
     QLabel *lbl_TabGame_phase7;
-    SecuenceEdit *TabGame_phase6;
+    SequenceEdit *TabGame_phase6;
     QLabel *lbl_TabGame_phase8;
-    SecuenceEdit *TabGame_phase7;
+    SequenceEdit *TabGame_phase7;
     QLabel *lbl_TabGame_phase9;
-    SecuenceEdit *TabGame_phase8;
+    SequenceEdit *TabGame_phase8;
     QLabel *lbl_TabGame_phase10;
-    SecuenceEdit *TabGame_phase9;
+    SequenceEdit *TabGame_phase9;
     QLabel *lbl_TabGame_aNextPhase;
-    SecuenceEdit *TabGame_phase10;
+    SequenceEdit *TabGame_phase10;
     QLabel *lbl_TabGame_aNextTurn;
-    SecuenceEdit *TabGame_aNextPhase;
-    SecuenceEdit *TabGame_aNextTurn;
+    SequenceEdit *TabGame_aNextPhase;
+    SequenceEdit *TabGame_aNextTurn;
     QGroupBox *groupBox_13;
     QGridLayout *gridLayout_13;
     QLabel *lbl_Player_aTap;
-    SecuenceEdit *Player_aTap;
+    SequenceEdit *Player_aTap;
     QLabel *lbl_Player_aUntap;
-    SecuenceEdit *Player_aUntap;
+    SequenceEdit *Player_aUntap;
     QLabel *lbl_Player_aUntapAll;
-    SecuenceEdit *Player_aUntapAll;
+    SequenceEdit *Player_aUntapAll;
     QLabel *lbl_Player_aDoesntUntap;
-    SecuenceEdit *Player_aDoesntUntap;
+    SequenceEdit *Player_aDoesntUntap;
     QLabel *lbl_Player_aFlip;
-    SecuenceEdit *Player_aFlip;
+    SequenceEdit *Player_aFlip;
     QLabel *lbl_Player_aPeek;
-    SecuenceEdit *Player_aPeek;
+    SequenceEdit *Player_aPeek;
     QLabel *lbl_Player_aPlay;
-    SecuenceEdit *Player_aPlay;
+    SequenceEdit *Player_aPlay;
     QLabel *lbl_Player_aAttach;
-    SecuenceEdit *Player_aAttach;
+    SequenceEdit *Player_aAttach;
     QLabel *lbl_Player_aUnattach;
-    SecuenceEdit *Player_aUnattach;
+    SequenceEdit *Player_aUnattach;
     QLabel *lbl_Player_aClone;
-    SecuenceEdit *Player_aClone;
+    SequenceEdit *Player_aClone;
     QLabel *lbl_Player_aCreateToken;
-    SecuenceEdit *Player_aCreateToken;
+    SequenceEdit *Player_aCreateToken;
     QLabel *lbl_Player_aCreateAnotherToken;
-    SecuenceEdit *Player_aCreateAnotherToken;
+    SequenceEdit *Player_aCreateAnotherToken;
     QLabel *lbl_Player_aSetAnnotation;
-    SecuenceEdit *Player_aSetAnnotation;
+    SequenceEdit *Player_aSetAnnotation;
     QSpacerItem *verticalSpacer_2;
     QWidget *tab_3;
     QGridLayout *gridLayout_20;
     QGroupBox *groupBox_15;
     QGridLayout *gridLayout_15;
     QLabel *lbl_Player_aMoveToBottomLibrary;
-    SecuenceEdit *Player_aMoveToBottomLibrary;
+    SequenceEdit *Player_aMoveToBottomLibrary;
     QLabel *lbl_Player_aMoveToTopLibrary;
-    SecuenceEdit *Player_aMoveToTopLibrary;
+    SequenceEdit *Player_aMoveToTopLibrary;
     QLabel *lbl_Player_aMoveToGraveyard;
-    SecuenceEdit *Player_aMoveToGraveyard;
+    SequenceEdit *Player_aMoveToGraveyard;
     QLabel *lbl_Player_aMoveToExile;
-    SecuenceEdit *Player_aMoveToExile;
+    SequenceEdit *Player_aMoveToExile;
     QLabel *lbl_Player_aMoveToHand;
-    SecuenceEdit *Player_aMoveToHand;
+    SequenceEdit *Player_aMoveToHand;
     QGroupBox *groupBox_16;
     QGridLayout *gridLayout_16;
     QLabel *lbl_Player_aViewGraveyard;
-    SecuenceEdit *Player_aViewGraveyard;
+    SequenceEdit *Player_aViewGraveyard;
     QLabel *lbl_Player_aViewLibrary;
-    SecuenceEdit *Player_aViewLibrary;
+    SequenceEdit *Player_aViewLibrary;
     QLabel *lbl_Player_aViewTopCards;
-    SecuenceEdit *Player_aViewTopCards;
+    SequenceEdit *Player_aViewTopCards;
     QLabel *lbl_Player_aViewSideboard;
-    SecuenceEdit *Player_aViewSideboard;
+    SequenceEdit *Player_aViewSideboard;
     QLabel *lbl_Player_aViewRfg;
-    SecuenceEdit *Player_aViewRfg;
+    SequenceEdit *Player_aViewRfg;
     QLabel *lbl_GameView_aCloseMostRecentZoneView;
-    SecuenceEdit *GameView_aCloseMostRecentZoneView;
+    SequenceEdit *GameView_aCloseMostRecentZoneView;
     QGroupBox *groupBox_17;
     QGridLayout *gridLayout_18;
-    SecuenceEdit *DeckViewContainer_loadRemoteButton;
-    SecuenceEdit *DeckViewContainer_loadLocalButton;
+    SequenceEdit *DeckViewContainer_loadRemoteButton;
+    SequenceEdit *DeckViewContainer_loadLocalButton;
     QLabel *lbl_DeckViewContainer_loadRemoteButton;
     QLabel *lbl_DeckViewContainer_loadLocalButton;
     QGroupBox *groupBox_18;
     QGridLayout *gridLayout_19;
     QLabel *lbl_Player_aDrawArrow;
-    SecuenceEdit *Player_aDrawArrow;
+    SequenceEdit *Player_aDrawArrow;
     QLabel *lbl_TabGame_aLeaveGame;
-    SecuenceEdit *TabGame_aLeaveGame;
+    SequenceEdit *TabGame_aLeaveGame;
     QLabel *lbl_TabGame_aRemoveLocalArrows;
-    SecuenceEdit *TabGame_aRemoveLocalArrows;
+    SequenceEdit *TabGame_aRemoveLocalArrows;
     QLabel *lbl_TabGame_aConcede;
-    SecuenceEdit *TabGame_aConcede;
+    SequenceEdit *TabGame_aConcede;
     QLabel *lbl_Player_aRollDie;
-    SecuenceEdit *Player_aRollDie;
+    SequenceEdit *Player_aRollDie;
     QLabel *lbl_TabGame_aRotateViewCW;
-    SecuenceEdit *TabGame_aRotateViewCW;
+    SequenceEdit *TabGame_aRotateViewCW;
     QLabel *lbl_Player_aShuffle;
-    SecuenceEdit *Player_aShuffle;
+    SequenceEdit *Player_aShuffle;
     QLabel *lbl_TabGame_aRotateViewCCW;
-    SecuenceEdit *TabGame_aRotateViewCCW;
+    SequenceEdit *TabGame_aRotateViewCCW;
     QGroupBox *groupBox_14;
     QGridLayout *gridLayout_14;
     QLabel *lbl_Player_aMulligan;
-    SecuenceEdit *Player_aMulligan;
+    SequenceEdit *Player_aMulligan;
     QLabel *lbl_Player_aDrawCard;
-    SecuenceEdit *Player_aDrawCard;
+    SequenceEdit *Player_aDrawCard;
     QLabel *lbl_Player_aDrawCards;
-    SecuenceEdit *Player_aDrawCards;
+    SequenceEdit *Player_aDrawCards;
     QLabel *lbl_Player_aUndoDraw;
-    SecuenceEdit *Player_aUndoDraw;
+    SequenceEdit *Player_aUndoDraw;
     QLabel *lbl_Player_aAlwaysRevealTopCard;
-    SecuenceEdit *Player_aAlwaysRevealTopCard;
+    SequenceEdit *Player_aAlwaysRevealTopCard;
     QSpacerItem *verticalSpacer_3;
     QWidget * tab_4;
 
@@ -290,7 +290,7 @@ public:
 
         gridLayout_2->addWidget(lbl_MainWindow_aDeckEditor, 1, 0, 1, 1);
 
-        MainWindow_aDeckEditor = new SecuenceEdit("MainWindow/aDeckEditor",groupBox);
+        MainWindow_aDeckEditor = new SequenceEdit("MainWindow/aDeckEditor",groupBox);
         MainWindow_aDeckEditor->setObjectName("MainWindow_aDeckEditor");
 
         gridLayout_2->addWidget(MainWindow_aDeckEditor, 1, 1, 1, 2);
@@ -300,7 +300,7 @@ public:
 
         gridLayout_2->addWidget(lbl_MainWindow_aSinglePlayer, 2, 0, 1, 1);
 
-        MainWindow_aSinglePlayer = new SecuenceEdit("MainWindow/aSinglePlayer",groupBox);
+        MainWindow_aSinglePlayer = new SequenceEdit("MainWindow/aSinglePlayer",groupBox);
         MainWindow_aSinglePlayer->setObjectName("MainWindow_aSinglePlayer");
 
         gridLayout_2->addWidget(MainWindow_aSinglePlayer, 2, 1, 1, 2);
@@ -315,7 +315,7 @@ public:
 
         gridLayout_2->addWidget(lbl_MainWindow_aConnect, 6, 0, 1, 1);
 
-        MainWindow_aConnect = new SecuenceEdit("MainWindow/aConnect",groupBox);
+        MainWindow_aConnect = new SequenceEdit("MainWindow/aConnect",groupBox);
         MainWindow_aConnect->setObjectName("MainWindow_aConnect");
 
         gridLayout_2->addWidget(MainWindow_aConnect, 6, 1, 1, 2);
@@ -330,7 +330,7 @@ public:
 
         gridLayout_2->addWidget(lbl_MainWindow_aFullScreen, 9, 0, 1, 1);
 
-        MainWindow_aFullScreen = new SecuenceEdit("MainWindow/aFullScreen",groupBox);
+        MainWindow_aFullScreen = new SequenceEdit("MainWindow/aFullScreen",groupBox);
         MainWindow_aFullScreen->setObjectName("MainWindow_aFullScreen");
 
         gridLayout_2->addWidget(MainWindow_aFullScreen, 9, 1, 1, 2);
@@ -340,7 +340,7 @@ public:
 
         gridLayout_2->addWidget(lbl_MainWindow_aSettings, 11, 0, 1, 1);
 
-        MainWindow_aRegister = new SecuenceEdit("MainWindow/aRegister",groupBox);
+        MainWindow_aRegister = new SequenceEdit("MainWindow/aRegister",groupBox);
         MainWindow_aRegister->setObjectName("MainWindow_aRegister");
 
         gridLayout_2->addWidget(MainWindow_aRegister, 10, 1, 1, 2);
@@ -350,22 +350,22 @@ public:
 
         gridLayout_2->addWidget(lbl_MainWindow_aCheckCardUpdates, 0, 0, 1, 1);
 
-        MainWindow_aSettings = new SecuenceEdit("MainWindow/aSettings",groupBox);
+        MainWindow_aSettings = new SequenceEdit("MainWindow/aSettings",groupBox);
         MainWindow_aSettings->setObjectName("MainWindow_aSettings");
 
         gridLayout_2->addWidget(MainWindow_aSettings, 11, 1, 1, 2);
 
-        MainWindow_aCheckCardUpdates = new SecuenceEdit("MainWindow/aCheckCardUpdates",groupBox);
+        MainWindow_aCheckCardUpdates = new SequenceEdit("MainWindow/aCheckCardUpdates",groupBox);
         MainWindow_aCheckCardUpdates->setObjectName("MainWindow_aCheckCardUpdates");
 
         gridLayout_2->addWidget(MainWindow_aCheckCardUpdates, 0, 1, 1, 2);
 
-        MainWindow_aWatchReplay = new SecuenceEdit("MainWindow/aWatchReplay",groupBox);
+        MainWindow_aWatchReplay = new SequenceEdit("MainWindow/aWatchReplay",groupBox);
         MainWindow_aWatchReplay->setObjectName("MainWindow_aWatchReplay");
 
         gridLayout_2->addWidget(MainWindow_aWatchReplay, 4, 1, 1, 2);
 
-        MainWindow_aDisconnect = new SecuenceEdit("MainWindow/aDisconnect",groupBox);
+        MainWindow_aDisconnect = new SequenceEdit("MainWindow/aDisconnect",groupBox);
         MainWindow_aDisconnect->setObjectName("MainWindow_aDisconnect");
 
         gridLayout_2->addWidget(MainWindow_aDisconnect, 7, 1, 1, 2);
@@ -380,12 +380,11 @@ public:
 
         gridLayout_2->addWidget(lbl_MainWindow_aExit, 8, 0, 1, 1);
 
-        MainWindow_aExit = new SecuenceEdit("MainWindow/aExit",groupBox);
+        MainWindow_aExit = new SequenceEdit("MainWindow/aExit",groupBox);
         MainWindow_aExit->setObjectName("MainWindow_aExit");
 
         gridLayout_2->addWidget(MainWindow_aExit, 8, 1, 1, 2);
 
-
         gridLayout_3->addWidget(groupBox, 0, 0, 1, 1);
 
         groupBox_2 = new QGroupBox(tab);
@@ -397,7 +396,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aAnalyzeDeck, 0, 0, 1, 1);
 
-        TabDeckEditor_aAnalyzeDeck = new SecuenceEdit("TabDeckEditor/aAnalyzeDeck",groupBox_2);
+        TabDeckEditor_aAnalyzeDeck = new SequenceEdit("TabDeckEditor/aAnalyzeDeck",groupBox_2);
         TabDeckEditor_aAnalyzeDeck->setObjectName("TabDeckEditor_aAnalyzeDeck");
 
         gridLayout->addWidget(TabDeckEditor_aAnalyzeDeck, 0, 1, 1, 1);
@@ -407,7 +406,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aLoadDeckFromClipboard, 0, 2, 1, 1);
 
-        TabDeckEditor_aLoadDeckFromClipboard = new SecuenceEdit("TabDeckEditor/aLoadDeckFromClipboard",groupBox_2);
+        TabDeckEditor_aLoadDeckFromClipboard = new SequenceEdit("TabDeckEditor/aLoadDeckFromClipboard",groupBox_2);
         TabDeckEditor_aLoadDeckFromClipboard->setObjectName("TabDeckEditor_aLoadDeckFromClipboard");
 
         gridLayout->addWidget(TabDeckEditor_aLoadDeckFromClipboard, 0, 3, 1, 1);
@@ -417,7 +416,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aClearFilterAll, 1, 0, 1, 1);
 
-        TabDeckEditor_aClearFilterAll = new SecuenceEdit("TabDeckEditor/aClearFilterAll",groupBox_2);
+        TabDeckEditor_aClearFilterAll = new SequenceEdit("TabDeckEditor/aClearFilterAll",groupBox_2);
         TabDeckEditor_aClearFilterAll->setObjectName("TabDeckEditor_aClearFilterAll");
 
         gridLayout->addWidget(TabDeckEditor_aClearFilterAll, 1, 1, 1, 1);
@@ -427,7 +426,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aNewDeck, 1, 2, 1, 1);
 
-        TabDeckEditor_aNewDeck = new SecuenceEdit("TabDeckEditor/aNewDeck",groupBox_2);
+        TabDeckEditor_aNewDeck = new SequenceEdit("TabDeckEditor/aNewDeck",groupBox_2);
         TabDeckEditor_aNewDeck->setObjectName("TabDeckEditor_aNewDeck");
 
         gridLayout->addWidget(TabDeckEditor_aNewDeck, 1, 3, 1, 1);
@@ -437,7 +436,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aClearFilterOne, 2, 0, 1, 1);
 
-        TabDeckEditor_aClearFilterOne = new SecuenceEdit("TabDeckEditor/aClearFilterOne",groupBox_2);
+        TabDeckEditor_aClearFilterOne = new SequenceEdit("TabDeckEditor/aClearFilterOne",groupBox_2);
         TabDeckEditor_aClearFilterOne->setObjectName("TabDeckEditor_aClearFilterOne");
 
         gridLayout->addWidget(TabDeckEditor_aClearFilterOne, 2, 1, 1, 1);
@@ -447,7 +446,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aOpenCustomFolder, 2, 2, 1, 1);
 
-        TabDeckEditor_aOpenCustomFolder = new SecuenceEdit("TabDeckEditor/aOpenCustomFolder",groupBox_2);
+        TabDeckEditor_aOpenCustomFolder = new SequenceEdit("TabDeckEditor/aOpenCustomFolder",groupBox_2);
         TabDeckEditor_aOpenCustomFolder->setObjectName("TabDeckEditor_aOpenCustomFolder");
 
         gridLayout->addWidget(TabDeckEditor_aOpenCustomFolder, 2, 3, 1, 1);
@@ -457,7 +456,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aClose, 3, 0, 1, 1);
 
-        TabDeckEditor_aClose = new SecuenceEdit("TabDeckEditor/aClose",groupBox_2);
+        TabDeckEditor_aClose = new SequenceEdit("TabDeckEditor/aClose",groupBox_2);
         TabDeckEditor_aClose->setObjectName("TabDeckEditor_aClose");
 
         gridLayout->addWidget(TabDeckEditor_aClose, 3, 1, 1, 1);
@@ -467,7 +466,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aPrintDeck, 3, 2, 1, 1);
 
-        TabDeckEditor_aPrintDeck = new SecuenceEdit("TabDeckEditor/aPrintDeck",groupBox_2);
+        TabDeckEditor_aPrintDeck = new SequenceEdit("TabDeckEditor/aPrintDeck",groupBox_2);
         TabDeckEditor_aPrintDeck->setObjectName("TabDeckEditor_aPrintDeck");
 
         gridLayout->addWidget(TabDeckEditor_aPrintDeck, 3, 3, 1, 1);
@@ -477,7 +476,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aEditSets, 4, 0, 1, 1);
 
-        TabDeckEditor_aEditSets = new SecuenceEdit("TabDeckEditor/aEditSets",groupBox_2);
+        TabDeckEditor_aEditSets = new SequenceEdit("TabDeckEditor/aEditSets",groupBox_2);
         TabDeckEditor_aEditSets->setObjectName("TabDeckEditor_aEditSets");
 
         gridLayout->addWidget(TabDeckEditor_aEditSets, 4, 1, 1, 1);
@@ -487,7 +486,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aRemoveCard, 4, 2, 1, 1);
 
-        TabDeckEditor_aRemoveCard = new SecuenceEdit("TabDeckEditor/aRemoveCard",groupBox_2);
+        TabDeckEditor_aRemoveCard = new SequenceEdit("TabDeckEditor/aRemoveCard",groupBox_2);
         TabDeckEditor_aRemoveCard->setObjectName("TabDeckEditor_aRemoveCard");
 
         gridLayout->addWidget(TabDeckEditor_aRemoveCard, 4, 3, 1, 1);
@@ -497,7 +496,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aEditTokens, 5, 0, 1, 1);
 
-        TabDeckEditor_aEditTokens = new SecuenceEdit("TabDeckEditor/aEditTokens",groupBox_2);
+        TabDeckEditor_aEditTokens = new SequenceEdit("TabDeckEditor/aEditTokens",groupBox_2);
         TabDeckEditor_aEditTokens->setObjectName("TabDeckEditor_aEditTokens");
 
         gridLayout->addWidget(TabDeckEditor_aEditTokens, 5, 1, 1, 1);
@@ -507,7 +506,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aResetLayout, 5, 2, 1, 1);
 
-        TabDeckEditor_aResetLayout = new SecuenceEdit("TabDeckEditor/aResetLayout",groupBox_2);
+        TabDeckEditor_aResetLayout = new SequenceEdit("TabDeckEditor/aResetLayout",groupBox_2);
         TabDeckEditor_aResetLayout->setObjectName("TabDeckEditor_aResetLayout");
 
         gridLayout->addWidget(TabDeckEditor_aResetLayout, 5, 3, 1, 1);
@@ -517,7 +516,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aIncrement, 6, 0, 1, 1);
 
-        TabDeckEditor_aIncrement = new SecuenceEdit("TabDeckEditor/aIncrement",groupBox_2);
+        TabDeckEditor_aIncrement = new SequenceEdit("TabDeckEditor/aIncrement",groupBox_2);
         TabDeckEditor_aIncrement->setObjectName("TabDeckEditor_aIncrement");
 
         gridLayout->addWidget(TabDeckEditor_aIncrement, 6, 1, 1, 1);
@@ -527,7 +526,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aSaveDeck, 6, 2, 1, 1);
 
-        TabDeckEditor_aSaveDeck = new SecuenceEdit("TabDeckEditor/aSaveDeck",groupBox_2);
+        TabDeckEditor_aSaveDeck = new SequenceEdit("TabDeckEditor/aSaveDeck",groupBox_2);
         TabDeckEditor_aSaveDeck->setObjectName("TabDeckEditor_aSaveDeck");
 
         gridLayout->addWidget(TabDeckEditor_aSaveDeck, 6, 3, 1, 1);
@@ -537,7 +536,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aDecrement, 7, 0, 1, 1);
 
-        TabDeckEditor_aDecrement = new SecuenceEdit("TabDeckEditor/aDecrement",groupBox_2);
+        TabDeckEditor_aDecrement = new SequenceEdit("TabDeckEditor/aDecrement",groupBox_2);
         TabDeckEditor_aDecrement->setObjectName("TabDeckEditor_aDecrement");
 
         gridLayout->addWidget(TabDeckEditor_aDecrement, 7, 1, 1, 1);
@@ -547,7 +546,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aSaveDeckAs, 7, 2, 1, 1);
 
-        TabDeckEditor_aSaveDeckAs = new SecuenceEdit("TabDeckEditor/aSaveDeckAs",groupBox_2);
+        TabDeckEditor_aSaveDeckAs = new SequenceEdit("TabDeckEditor/aSaveDeckAs",groupBox_2);
         TabDeckEditor_aSaveDeckAs->setObjectName("TabDeckEditor_aSaveDeckAs");
 
         gridLayout->addWidget(TabDeckEditor_aSaveDeckAs, 7, 3, 1, 1);
@@ -557,7 +556,7 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aLoadDeck, 8, 0, 1, 1);
 
-        TabDeckEditor_aLoadDeck = new SecuenceEdit("TabDeckEditor/aLoadDeck",groupBox_2);
+        TabDeckEditor_aLoadDeck = new SequenceEdit("TabDeckEditor/aLoadDeck",groupBox_2);
         TabDeckEditor_aLoadDeck->setObjectName("TabDeckEditor_aLoadDeck");
 
         gridLayout->addWidget(TabDeckEditor_aLoadDeck, 8, 1, 1, 1);
@@ -567,12 +566,11 @@ public:
 
         gridLayout->addWidget(lbl_TabDeckEditor_aSaveDeckToClipboard, 8, 2, 1, 1);
 
-        TabDeckEditor_aSaveDeckToClipboard = new SecuenceEdit("TabDeckEditor/aSaveDeckToClipboard",groupBox_2);
+        TabDeckEditor_aSaveDeckToClipboard = new SequenceEdit("TabDeckEditor/aSaveDeckToClipboard",groupBox_2);
         TabDeckEditor_aSaveDeckToClipboard->setObjectName("TabDeckEditor_aSaveDeckToClipboard");
 
         gridLayout->addWidget(TabDeckEditor_aSaveDeckToClipboard, 8, 3, 1, 1);
 
-
         gridLayout_3->addWidget(groupBox_2, 0, 1, 1, 1);
 
         groupBox_3 = new QGroupBox(tab);
@@ -588,7 +586,7 @@ public:
 
         gridLayout_4->addWidget(lbl_abstractCounter_sSet, 0, 0, 1, 1);
 
-        abstractCounter_aSet = new SecuenceEdit("Player/aSet",groupBox_4);
+        abstractCounter_aSet = new SequenceEdit("Player/aSet",groupBox_4);
         abstractCounter_aSet->setObjectName("abstractCounter_aSet");
 
         gridLayout_4->addWidget(abstractCounter_aSet, 0, 1, 1, 1);
@@ -598,7 +596,7 @@ public:
 
         gridLayout_4->addWidget(lbl_abstractCounter_aInc, 1, 0, 1, 1);
 
-        abstractCounter_Inc = new SecuenceEdit("Player/Inc",groupBox_4);
+        abstractCounter_Inc = new SequenceEdit("Player/Inc",groupBox_4);
         abstractCounter_Inc->setObjectName("abstractCounter_Inc");
 
         gridLayout_4->addWidget(abstractCounter_Inc, 1, 1, 1, 1);
@@ -608,12 +606,11 @@ public:
 
         gridLayout_4->addWidget(lbl_abstractCounter_aDec, 2, 0, 1, 1);
 
-        abstractCounter_aDec = new SecuenceEdit("Player/aDec",groupBox_4);
+        abstractCounter_aDec = new SequenceEdit("Player/aDec",groupBox_4);
         abstractCounter_aDec->setObjectName("abstractCounter_aDec");
 
         gridLayout_4->addWidget(abstractCounter_aDec, 2, 1, 1, 1);
 
-
         horizontalLayout->addWidget(groupBox_4);
 
         groupBox_5 = new QGroupBox(groupBox_3);
@@ -625,7 +622,7 @@ public:
 
         gridLayout_6->addWidget(lbl_Player_aSCRed, 0, 0, 1, 1);
 
-        Player_aSCRed = new SecuenceEdit("Player/aSCRed",groupBox_5);
+        Player_aSCRed = new SequenceEdit("Player/aSCRed",groupBox_5);
         Player_aSCRed->setObjectName("Player_aSCRed");
 
         gridLayout_6->addWidget(Player_aSCRed, 0, 1, 1, 1);
@@ -635,7 +632,7 @@ public:
 
         gridLayout_6->addWidget(lbl_Player_aCCRed, 1, 0, 1, 1);
 
-        Player_aCCRed = new SecuenceEdit("Player/aCCRed",groupBox_5);
+        Player_aCCRed = new SequenceEdit("Player/aCCRed",groupBox_5);
         Player_aCCRed->setObjectName("Player_aCCRed");
 
         gridLayout_6->addWidget(Player_aCCRed, 1, 1, 1, 1);
@@ -645,12 +642,11 @@ public:
 
         gridLayout_6->addWidget(lbl_Player_aRCRed, 2, 0, 1, 1);
 
-        Player_aRCRed = new SecuenceEdit("Player/aRCRed",groupBox_5);
+        Player_aRCRed = new SequenceEdit("Player/aRCRed",groupBox_5);
         Player_aRCRed->setObjectName("Player_aRCRed");
 
         gridLayout_6->addWidget(Player_aRCRed, 2, 1, 1, 1);
 
-
         horizontalLayout->addWidget(groupBox_5);
 
         groupBox_6 = new QGroupBox(groupBox_3);
@@ -662,7 +658,7 @@ public:
 
         gridLayout_7->addWidget(lbl_Player_aSCGreen, 0, 0, 1, 1);
 
-        Player_aSCGreen = new SecuenceEdit("Player/aSCGreen",groupBox_6);
+        Player_aSCGreen = new SequenceEdit("Player/aSCGreen",groupBox_6);
         Player_aSCGreen->setObjectName("Player_aSCGreen");
 
         gridLayout_7->addWidget(Player_aSCGreen, 0, 1, 1, 1);
@@ -672,7 +668,7 @@ public:
 
         gridLayout_7->addWidget(lbl_Player_aCCGreen, 1, 0, 1, 1);
 
-        Player_aCCGreen = new SecuenceEdit("Player/aCCGreen",groupBox_6);
+        Player_aCCGreen = new SequenceEdit("Player/aCCGreen",groupBox_6);
         Player_aCCGreen->setObjectName("Player_aCCGreen");
 
         gridLayout_7->addWidget(Player_aCCGreen, 1, 1, 1, 1);
@@ -682,12 +678,11 @@ public:
 
         gridLayout_7->addWidget(lbl_Player_aRCGreen, 2, 0, 1, 1);
 
-        Player_aRCGreen = new SecuenceEdit("Player/aRCGreen",groupBox_6);
+        Player_aRCGreen = new SequenceEdit("Player/aRCGreen",groupBox_6);
         Player_aRCGreen->setObjectName("Player_aRCGreen");
 
         gridLayout_7->addWidget(Player_aRCGreen, 2, 1, 1, 1);
 
-
         horizontalLayout->addWidget(groupBox_6);
 
         groupBox_7 = new QGroupBox(groupBox_3);
@@ -699,7 +694,7 @@ public:
 
         gridLayout_8->addWidget(lbl_Player_aSCYellow, 0, 0, 1, 1);
 
-        Player_aSCYellow = new SecuenceEdit("Player/aSCYellow",groupBox_7);
+        Player_aSCYellow = new SequenceEdit("Player/aSCYellow",groupBox_7);
         Player_aSCYellow->setObjectName("Player_aSCYellow");
 
         gridLayout_8->addWidget(Player_aSCYellow, 0, 1, 1, 1);
@@ -709,7 +704,7 @@ public:
 
         gridLayout_8->addWidget(lbl_Player_aCCYellow, 1, 0, 1, 1);
 
-        Player_aCCYellow = new SecuenceEdit("Player/aCCYellow",groupBox_7);
+        Player_aCCYellow = new SequenceEdit("Player/aCCYellow",groupBox_7);
         Player_aCCYellow->setObjectName("Player_aCCYellow");
 
         gridLayout_8->addWidget(Player_aCCYellow, 1, 1, 1, 1);
@@ -719,12 +714,11 @@ public:
 
         gridLayout_8->addWidget(lbl_Player_aRCYellow, 2, 0, 1, 1);
 
-        Player_aRCYellow = new SecuenceEdit("Player/aRCYellow",groupBox_7);
+        Player_aRCYellow = new SequenceEdit("Player/aRCYellow",groupBox_7);
         Player_aRCYellow->setObjectName("Player_aRCYellow");
 
         gridLayout_8->addWidget(Player_aRCYellow, 2, 1, 1, 1);
 
-
         horizontalLayout->addWidget(groupBox_7);
 
         verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
@@ -744,12 +738,12 @@ public:
         groupBox_12->setObjectName("groupBox_12");
         gridLayout_12 = new QGridLayout(groupBox_12);
         gridLayout_12->setObjectName("gridLayout_12");
-        Player_aDecPT = new SecuenceEdit("Player/aDecPT",groupBox_12);
+        Player_aDecPT = new SequenceEdit("Player/aDecPT",groupBox_12);
         Player_aDecPT->setObjectName("Player_aDecPT");
 
         gridLayout_12->addWidget(Player_aDecPT, 2, 1, 1, 1);
 
-        Player_aIncPT = new SecuenceEdit("Player/aIncPT",groupBox_12);
+        Player_aIncPT = new SequenceEdit("Player/aIncPT",groupBox_12);
         Player_aIncPT->setObjectName("Player_aIncPT");
 
         gridLayout_12->addWidget(Player_aIncPT, 1, 1, 1, 1);
@@ -764,7 +758,7 @@ public:
 
         gridLayout_12->addWidget(lbl_Player_aDecPT, 2, 0, 1, 1);
 
-        Player_aSetPT = new SecuenceEdit("Player/aSetPT",groupBox_12);
+        Player_aSetPT = new SequenceEdit("Player/aSetPT",groupBox_12);
         Player_aSetPT->setObjectName("Player_aSetPT");
 
         gridLayout_12->addWidget(Player_aSetPT, 0, 1, 1, 1);
@@ -774,7 +768,6 @@ public:
 
         gridLayout_12->addWidget(lbl_Player_aSetPT, 0, 0, 1, 1);
 
-
         verticalLayout->addWidget(groupBox_12);
 
         groupBox_11 = new QGroupBox(groupBox_9);
@@ -786,7 +779,7 @@ public:
 
         gridLayout_11->addWidget(lbl_Player_aDecT, 1, 0, 1, 1);
 
-        Player_aDecT = new SecuenceEdit("Player/aDecT",groupBox_11);
+        Player_aDecT = new SequenceEdit("Player/aDecT",groupBox_11);
         Player_aDecT->setObjectName("Player_aDecT");
 
         gridLayout_11->addWidget(Player_aDecT, 1, 1, 1, 1);
@@ -796,12 +789,11 @@ public:
 
         gridLayout_11->addWidget(lbl_Player_aIncT, 0, 0, 1, 1);
 
-        Player_aIncT = new SecuenceEdit("Player/aIncT",groupBox_11);
+        Player_aIncT = new SequenceEdit("Player/aIncT",groupBox_11);
         Player_aIncT->setObjectName("Player_aIncT");
 
         gridLayout_11->addWidget(Player_aIncT, 0, 1, 1, 1);
 
-
         verticalLayout->addWidget(groupBox_11);
 
         groupBox_10 = new QGroupBox(groupBox_9);
@@ -813,12 +805,12 @@ public:
 
         gridLayout_10->addWidget(lbl_Player_aDecP, 1, 0, 1, 1);
 
-        Player_aDecP = new SecuenceEdit("Player/aDecP",groupBox_10);
+        Player_aDecP = new SequenceEdit("Player/aDecP",groupBox_10);
         Player_aDecP->setObjectName("Player_aDecP");
 
         gridLayout_10->addWidget(Player_aDecP, 1, 1, 1, 1);
 
-        Player_IncP = new SecuenceEdit("Player/IncP",groupBox_10);
+        Player_IncP = new SequenceEdit("Player/IncP",groupBox_10);
         Player_IncP->setObjectName("Player_IncP");
 
         gridLayout_10->addWidget(Player_IncP, 0, 1, 1, 1);
@@ -828,10 +820,8 @@ public:
 
         gridLayout_10->addWidget(lbl_Player_IncP, 0, 0, 1, 1);
 
-
         verticalLayout->addWidget(groupBox_10);
 
-
         gridLayout_17->addWidget(groupBox_9, 0, 1, 1, 1);
 
         groupBox_8 = new QGroupBox(tab_2);
@@ -843,7 +833,7 @@ public:
 
         gridLayout_5->addWidget(lbl_TabGame_phase0, 0, 0, 1, 1);
 
-        TabGame_phase0 = new SecuenceEdit("Player/phase0",groupBox_8);
+        TabGame_phase0 = new SequenceEdit("Player/phase0",groupBox_8);
         TabGame_phase0->setObjectName("TabGame_phase0");
 
         gridLayout_5->addWidget(TabGame_phase0, 0, 1, 1, 1);
@@ -853,7 +843,7 @@ public:
 
         gridLayout_5->addWidget(lbl_TabGame_phase1, 1, 0, 1, 1);
 
-        TabGame_phase1 = new SecuenceEdit("Player/phase1",groupBox_8);
+        TabGame_phase1 = new SequenceEdit("Player/phase1",groupBox_8);
         TabGame_phase1->setObjectName("TabGame_phase1");
 
         gridLayout_5->addWidget(TabGame_phase1, 1, 1, 1, 1);
@@ -863,7 +853,7 @@ public:
 
         gridLayout_5->addWidget(lbl_TabGame_phase2, 2, 0, 1, 1);
 
-        TabGame_phase2 = new SecuenceEdit("Player/phase2",groupBox_8);
+        TabGame_phase2 = new SequenceEdit("Player/phase2",groupBox_8);
         TabGame_phase2->setObjectName("TabGame_phase2");
 
         gridLayout_5->addWidget(TabGame_phase2, 2, 1, 1, 1);
@@ -873,7 +863,7 @@ public:
 
         gridLayout_5->addWidget(lbl_TabGame_phase3, 3, 0, 1, 1);
 
-        TabGame_phase3 = new SecuenceEdit("Player/phase3",groupBox_8);
+        TabGame_phase3 = new SequenceEdit("Player/phase3",groupBox_8);
         TabGame_phase3->setObjectName("TabGame_phase3");
 
         gridLayout_5->addWidget(TabGame_phase3, 3, 1, 1, 1);
@@ -883,7 +873,7 @@ public:
 
         gridLayout_5->addWidget(lbl_TabGame_phase4, 4, 0, 1, 1);
 
-        TabGame_phase4 = new SecuenceEdit("Player/phase4",groupBox_8);
+        TabGame_phase4 = new SequenceEdit("Player/phase4",groupBox_8);
         TabGame_phase4->setObjectName("TabGame_phase4");
 
         gridLayout_5->addWidget(TabGame_phase4, 4, 1, 1, 1);
@@ -893,7 +883,7 @@ public:
 
         gridLayout_5->addWidget(lbl_TabGame_phase5, 5, 0, 1, 1);
 
-        TabGame_phase5 = new SecuenceEdit("Player/phase5",groupBox_8);
+        TabGame_phase5 = new SequenceEdit("Player/phase5",groupBox_8);
         TabGame_phase5->setObjectName("TabGame_phase5");
 
         gridLayout_5->addWidget(TabGame_phase5, 5, 1, 1, 1);
@@ -908,7 +898,7 @@ public:
 
         gridLayout_5->addWidget(lbl_TabGame_phase7, 7, 0, 1, 1);
 
-        TabGame_phase6 = new SecuenceEdit("Player/phase6",groupBox_8);
+        TabGame_phase6 = new SequenceEdit("Player/phase6",groupBox_8);
         TabGame_phase6->setObjectName("TabGame_phase6");
 
         gridLayout_5->addWidget(TabGame_phase6, 6, 1, 1, 1);
@@ -918,7 +908,7 @@ public:
 
         gridLayout_5->addWidget(lbl_TabGame_phase8, 8, 0, 1, 1);
 
-        TabGame_phase7 = new SecuenceEdit("Player/phase7",groupBox_8);
+        TabGame_phase7 = new SequenceEdit("Player/phase7",groupBox_8);
         TabGame_phase7->setObjectName("TabGame_phase7");
 
         gridLayout_5->addWidget(TabGame_phase7, 7, 1, 1, 1);
@@ -928,7 +918,7 @@ public:
 
         gridLayout_5->addWidget(lbl_TabGame_phase9, 9, 0, 1, 1);
 
-        TabGame_phase8 = new SecuenceEdit("Player/phase8",groupBox_8);
+        TabGame_phase8 = new SequenceEdit("Player/phase8",groupBox_8);
         TabGame_phase8->setObjectName("TabGame_phase8");
 
         gridLayout_5->addWidget(TabGame_phase8, 8, 1, 1, 1);
@@ -938,7 +928,7 @@ public:
 
         gridLayout_5->addWidget(lbl_TabGame_phase10, 10, 0, 1, 1);
 
-        TabGame_phase9 = new SecuenceEdit("Player/phase9",groupBox_8);
+        TabGame_phase9 = new SequenceEdit("Player/phase9",groupBox_8);
         TabGame_phase9->setObjectName("TabGame_phase9");
 
         gridLayout_5->addWidget(TabGame_phase9, 9, 1, 1, 1);
@@ -948,7 +938,7 @@ public:
 
         gridLayout_5->addWidget(lbl_TabGame_aNextPhase, 11, 0, 1, 1);
 
-        TabGame_phase10 = new SecuenceEdit("Player/phase10",groupBox_8);
+        TabGame_phase10 = new SequenceEdit("Player/phase10",groupBox_8);
         TabGame_phase10->setObjectName("TabGame_phase10");
 
         gridLayout_5->addWidget(TabGame_phase10, 10, 1, 1, 1);
@@ -958,17 +948,16 @@ public:
 
         gridLayout_5->addWidget(lbl_TabGame_aNextTurn, 12, 0, 1, 1);
 
-        TabGame_aNextPhase = new SecuenceEdit("Player/aNextPhase",groupBox_8);
+        TabGame_aNextPhase = new SequenceEdit("Player/aNextPhase",groupBox_8);
         TabGame_aNextPhase->setObjectName("TabGame_aNextPhase");
 
         gridLayout_5->addWidget(TabGame_aNextPhase, 11, 1, 1, 1);
 
-        TabGame_aNextTurn = new SecuenceEdit("Player/aNextTurn",groupBox_8);
+        TabGame_aNextTurn = new SequenceEdit("Player/aNextTurn",groupBox_8);
         TabGame_aNextTurn->setObjectName("TabGame_aNextTurn");
 
         gridLayout_5->addWidget(TabGame_aNextTurn, 12, 1, 1, 1);
 
-
         gridLayout_17->addWidget(groupBox_8, 0, 0, 1, 1);
 
         groupBox_13 = new QGroupBox(tab_2);
@@ -980,7 +969,7 @@ public:
 
         gridLayout_13->addWidget(lbl_Player_aTap, 0, 0, 1, 1);
 
-        Player_aTap = new SecuenceEdit("Player/aTap",groupBox_13);
+        Player_aTap = new SequenceEdit("Player/aTap",groupBox_13);
         Player_aTap->setObjectName("Player_aTap");
 
         gridLayout_13->addWidget(Player_aTap, 0, 1, 1, 1);
@@ -990,7 +979,7 @@ public:
 
         gridLayout_13->addWidget(lbl_Player_aUntap, 1, 0, 1, 1);
 
-        Player_aUntap = new SecuenceEdit("Player/aUntap",groupBox_13);
+        Player_aUntap = new SequenceEdit("Player/aUntap",groupBox_13);
         Player_aUntap->setObjectName("Player_aUntap");
 
         gridLayout_13->addWidget(Player_aUntap, 1, 1, 1, 1);
@@ -1000,7 +989,7 @@ public:
 
         gridLayout_13->addWidget(lbl_Player_aUntapAll, 2, 0, 1, 1);
 
-        Player_aUntapAll = new SecuenceEdit("Player/aUntapAll",groupBox_13);
+        Player_aUntapAll = new SequenceEdit("Player/aUntapAll",groupBox_13);
         Player_aUntapAll->setObjectName("Player_aUntapAll");
 
         gridLayout_13->addWidget(Player_aUntapAll, 2, 1, 1, 1);
@@ -1010,7 +999,7 @@ public:
 
         gridLayout_13->addWidget(lbl_Player_aDoesntUntap, 3, 0, 1, 1);
 
-        Player_aDoesntUntap = new SecuenceEdit("Player/aDoesntUntap",groupBox_13);
+        Player_aDoesntUntap = new SequenceEdit("Player/aDoesntUntap",groupBox_13);
         Player_aDoesntUntap->setObjectName("Player_aDoesntUntap");
 
         gridLayout_13->addWidget(Player_aDoesntUntap, 3, 1, 1, 1);
@@ -1020,7 +1009,7 @@ public:
 
         gridLayout_13->addWidget(lbl_Player_aFlip, 4, 0, 1, 1);
 
-        Player_aFlip = new SecuenceEdit("Player/aFlip",groupBox_13);
+        Player_aFlip = new SequenceEdit("Player/aFlip",groupBox_13);
         Player_aFlip->setObjectName("Player_aFlip");
 
         gridLayout_13->addWidget(Player_aFlip, 4, 1, 1, 1);
@@ -1030,7 +1019,7 @@ public:
 
         gridLayout_13->addWidget(lbl_Player_aPeek, 5, 0, 1, 1);
 
-        Player_aPeek = new SecuenceEdit("Player/aPeek",groupBox_13);
+        Player_aPeek = new SequenceEdit("Player/aPeek",groupBox_13);
         Player_aPeek->setObjectName("Player_aPeek");
 
         gridLayout_13->addWidget(Player_aPeek, 5, 1, 1, 1);
@@ -1040,7 +1029,7 @@ public:
 
         gridLayout_13->addWidget(lbl_Player_aPlay, 6, 0, 1, 1);
 
-        Player_aPlay = new SecuenceEdit("Player/aPlay",groupBox_13);
+        Player_aPlay = new SequenceEdit("Player/aPlay",groupBox_13);
         Player_aPlay->setObjectName("Player_aPlay");
 
         gridLayout_13->addWidget(Player_aPlay, 6, 1, 1, 1);
@@ -1050,7 +1039,7 @@ public:
 
         gridLayout_13->addWidget(lbl_Player_aAttach, 7, 0, 1, 1);
 
-        Player_aAttach = new SecuenceEdit("Player/aAttach",groupBox_13);
+        Player_aAttach = new SequenceEdit("Player/aAttach",groupBox_13);
         Player_aAttach->setObjectName("Player_aAttach");
 
         gridLayout_13->addWidget(Player_aAttach, 7, 1, 1, 1);
@@ -1060,7 +1049,7 @@ public:
 
         gridLayout_13->addWidget(lbl_Player_aUnattach, 8, 0, 1, 1);
 
-        Player_aUnattach = new SecuenceEdit("Player/aUnattach",groupBox_13);
+        Player_aUnattach = new SequenceEdit("Player/aUnattach",groupBox_13);
         Player_aUnattach->setObjectName("Player_aUnattach");
 
         gridLayout_13->addWidget(Player_aUnattach, 8, 1, 1, 1);
@@ -1070,7 +1059,7 @@ public:
 
         gridLayout_13->addWidget(lbl_Player_aClone, 9, 0, 1, 1);
 
-        Player_aClone = new SecuenceEdit("Player/aClone",groupBox_13);
+        Player_aClone = new SequenceEdit("Player/aClone",groupBox_13);
         Player_aClone->setObjectName("Player_aClone");
 
         gridLayout_13->addWidget(Player_aClone, 9, 1, 1, 1);
@@ -1080,7 +1069,7 @@ public:
 
         gridLayout_13->addWidget(lbl_Player_aCreateToken, 10, 0, 1, 1);
 
-        Player_aCreateToken = new SecuenceEdit("Player/aCreateToken",groupBox_13);
+        Player_aCreateToken = new SequenceEdit("Player/aCreateToken",groupBox_13);
         Player_aCreateToken->setObjectName("Player_aCreateToken");
 
         gridLayout_13->addWidget(Player_aCreateToken, 10, 1, 1, 1);
@@ -1090,7 +1079,7 @@ public:
 
         gridLayout_13->addWidget(lbl_Player_aCreateAnotherToken, 11, 0, 1, 1);
 
-        Player_aCreateAnotherToken = new SecuenceEdit("Player/aCreateAnotherToken",groupBox_13);
+        Player_aCreateAnotherToken = new SequenceEdit("Player/aCreateAnotherToken",groupBox_13);
         Player_aCreateAnotherToken->setObjectName("Player_aCreateAnotherToken");
 
         gridLayout_13->addWidget(Player_aCreateAnotherToken, 11, 1, 1, 1);
@@ -1100,12 +1089,11 @@ public:
 
         gridLayout_13->addWidget(lbl_Player_aSetAnnotation, 12, 0, 1, 1);
 
-        Player_aSetAnnotation = new SecuenceEdit("Player/aSetAnnotation",groupBox_13);
+        Player_aSetAnnotation = new SequenceEdit("Player/aSetAnnotation",groupBox_13);
         Player_aSetAnnotation->setObjectName("Player_aSetAnnotation");
 
         gridLayout_13->addWidget(Player_aSetAnnotation, 12, 1, 1, 1);
 
-
         gridLayout_17->addWidget(groupBox_13, 0, 2, 1, 1);
 
         verticalSpacer_2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
@@ -1126,7 +1114,7 @@ public:
 
         gridLayout_15->addWidget(lbl_Player_aMoveToBottomLibrary, 0, 0, 1, 1);
 
-        Player_aMoveToBottomLibrary = new SecuenceEdit("Player/aMoveToBottomLibrary",groupBox_15);
+        Player_aMoveToBottomLibrary = new SequenceEdit("Player/aMoveToBottomLibrary",groupBox_15);
         Player_aMoveToBottomLibrary->setObjectName("Player_aMoveToBottomLibrary");
 
         gridLayout_15->addWidget(Player_aMoveToBottomLibrary, 0, 1, 1, 1);
@@ -1136,7 +1124,7 @@ public:
 
         gridLayout_15->addWidget(lbl_Player_aMoveToTopLibrary, 1, 0, 1, 1);
 
-        Player_aMoveToTopLibrary = new SecuenceEdit("Player/aMoveToTopLibrary",groupBox_15);
+        Player_aMoveToTopLibrary = new SequenceEdit("Player/aMoveToTopLibrary",groupBox_15);
         Player_aMoveToTopLibrary->setObjectName("Player_aMoveToTopLibrary");
 
         gridLayout_15->addWidget(Player_aMoveToTopLibrary, 1, 1, 1, 1);
@@ -1146,7 +1134,7 @@ public:
 
         gridLayout_15->addWidget(lbl_Player_aMoveToGraveyard, 2, 0, 1, 1);
 
-        Player_aMoveToGraveyard = new SecuenceEdit("Player/aMoveToGraveyard",groupBox_15);
+        Player_aMoveToGraveyard = new SequenceEdit("Player/aMoveToGraveyard",groupBox_15);
         Player_aMoveToGraveyard->setObjectName("Player_aMoveToGraveyard");
 
         gridLayout_15->addWidget(Player_aMoveToGraveyard, 2, 1, 1, 1);
@@ -1156,7 +1144,7 @@ public:
 
         gridLayout_15->addWidget(lbl_Player_aMoveToExile, 3, 0, 1, 1);
 
-        Player_aMoveToExile = new SecuenceEdit("Player/aMoveToExile",groupBox_15);
+        Player_aMoveToExile = new SequenceEdit("Player/aMoveToExile",groupBox_15);
         Player_aMoveToExile->setObjectName("Player_aMoveToExile");
 
         gridLayout_15->addWidget(Player_aMoveToExile, 3, 1, 1, 1);
@@ -1166,12 +1154,11 @@ public:
 
         gridLayout_15->addWidget(lbl_Player_aMoveToHand, 4, 0, 1, 1);
 
-        Player_aMoveToHand = new SecuenceEdit("Player/aMoveToHand",groupBox_15);
+        Player_aMoveToHand = new SequenceEdit("Player/aMoveToHand",groupBox_15);
         Player_aMoveToHand->setObjectName("Player_aMoveToHand");
 
         gridLayout_15->addWidget(Player_aMoveToHand, 4, 1, 1, 1);
 
-
         gridLayout_20->addWidget(groupBox_15, 0, 1, 1, 1);
 
         groupBox_16 = new QGroupBox(tab_3);
@@ -1183,7 +1170,7 @@ public:
 
         gridLayout_16->addWidget(lbl_Player_aViewGraveyard, 0, 0, 1, 1);
 
-        Player_aViewGraveyard = new SecuenceEdit("Player/aViewGraveyard",groupBox_16);
+        Player_aViewGraveyard = new SequenceEdit("Player/aViewGraveyard",groupBox_16);
         Player_aViewGraveyard->setObjectName("Player_aViewGraveyard");
 
         gridLayout_16->addWidget(Player_aViewGraveyard, 0, 1, 1, 1);
@@ -1193,7 +1180,7 @@ public:
 
         gridLayout_16->addWidget(lbl_Player_aViewLibrary, 1, 0, 1, 1);
 
-        Player_aViewLibrary = new SecuenceEdit("Player/aViewLibrary",groupBox_16);
+        Player_aViewLibrary = new SequenceEdit("Player/aViewLibrary",groupBox_16);
         Player_aViewLibrary->setObjectName("Player_aViewLibrary");
 
         gridLayout_16->addWidget(Player_aViewLibrary, 1, 1, 1, 1);
@@ -1203,7 +1190,7 @@ public:
 
         gridLayout_16->addWidget(lbl_Player_aViewTopCards, 2, 0, 1, 1);
 
-        Player_aViewTopCards = new SecuenceEdit("Player/aViewTopCards",groupBox_16);
+        Player_aViewTopCards = new SequenceEdit("Player/aViewTopCards",groupBox_16);
         Player_aViewTopCards->setObjectName("Player_aViewTopCards");
 
         gridLayout_16->addWidget(Player_aViewTopCards, 2, 1, 1, 1);
@@ -1213,7 +1200,7 @@ public:
 
         gridLayout_16->addWidget(lbl_Player_aViewSideboard, 3, 0, 1, 1);
 
-        Player_aViewSideboard = new SecuenceEdit("Player/aViewSideboard",groupBox_16);
+        Player_aViewSideboard = new SequenceEdit("Player/aViewSideboard",groupBox_16);
         Player_aViewSideboard->setObjectName("Player_aViewSideboard");
 
         gridLayout_16->addWidget(Player_aViewSideboard, 3, 1, 1, 1);
@@ -1223,7 +1210,7 @@ public:
 
         gridLayout_16->addWidget(lbl_Player_aViewRfg, 4, 0, 1, 1);
 
-        Player_aViewRfg = new SecuenceEdit("Player/aViewRfg",groupBox_16);
+        Player_aViewRfg = new SequenceEdit("Player/aViewRfg",groupBox_16);
         Player_aViewRfg->setObjectName("Player_aViewRfg");
 
         gridLayout_16->addWidget(Player_aViewRfg, 4, 1, 1, 1);
@@ -1233,24 +1220,23 @@ public:
 
         gridLayout_16->addWidget(lbl_GameView_aCloseMostRecentZoneView, 5, 0, 1, 1);
 
-        GameView_aCloseMostRecentZoneView = new SecuenceEdit("Player/aCloseMostRecentZoneView",groupBox_16);
+        GameView_aCloseMostRecentZoneView = new SequenceEdit("Player/aCloseMostRecentZoneView",groupBox_16);
         GameView_aCloseMostRecentZoneView->setObjectName("GameView_aCloseMostRecentZoneView");
 
         gridLayout_16->addWidget(GameView_aCloseMostRecentZoneView, 5, 1, 1, 1);
 
-
         gridLayout_20->addWidget(groupBox_16, 0, 2, 1, 1);
 
         groupBox_17 = new QGroupBox(tab_3);
         groupBox_17->setObjectName("groupBox_17");
         gridLayout_18 = new QGridLayout(groupBox_17);
         gridLayout_18->setObjectName("gridLayout_18");
-        DeckViewContainer_loadRemoteButton = new SecuenceEdit("DeckViewContainer/loadRemoteButton",groupBox_17);
+        DeckViewContainer_loadRemoteButton = new SequenceEdit("DeckViewContainer/loadRemoteButton",groupBox_17);
         DeckViewContainer_loadRemoteButton->setObjectName("DeckViewContainer_loadRemoteButton");
 
         gridLayout_18->addWidget(DeckViewContainer_loadRemoteButton, 2, 1, 1, 1);
 
-        DeckViewContainer_loadLocalButton = new SecuenceEdit("DeckViewContainer/loadLocalButton",groupBox_17);
+        DeckViewContainer_loadLocalButton = new SequenceEdit("DeckViewContainer/loadLocalButton",groupBox_17);
         DeckViewContainer_loadLocalButton->setObjectName("DeckViewContainer_loadLocalButton");
 
         gridLayout_18->addWidget(DeckViewContainer_loadLocalButton, 0, 1, 1, 1);
@@ -1265,7 +1251,6 @@ public:
 
         gridLayout_18->addWidget(lbl_DeckViewContainer_loadLocalButton, 0, 0, 1, 1);
 
-
         gridLayout_20->addWidget(groupBox_17, 1, 0, 1, 1);
 
         groupBox_18 = new QGroupBox(tab_3);
@@ -1277,7 +1262,7 @@ public:
 
         gridLayout_19->addWidget(lbl_Player_aDrawArrow, 0, 0, 1, 1);
 
-        Player_aDrawArrow = new SecuenceEdit("Player/aDrawArrow",groupBox_18);
+        Player_aDrawArrow = new SequenceEdit("Player/aDrawArrow",groupBox_18);
         Player_aDrawArrow->setObjectName("Player_aDrawArrow");
 
         gridLayout_19->addWidget(Player_aDrawArrow, 0, 1, 1, 1);
@@ -1287,7 +1272,7 @@ public:
 
         gridLayout_19->addWidget(lbl_TabGame_aLeaveGame, 0, 2, 1, 1);
 
-        TabGame_aLeaveGame = new SecuenceEdit("Player/aLeaveGame",groupBox_18);
+        TabGame_aLeaveGame = new SequenceEdit("Player/aLeaveGame",groupBox_18);
         TabGame_aLeaveGame->setObjectName("TabGame_aLeaveGame");
 
         gridLayout_19->addWidget(TabGame_aLeaveGame, 0, 3, 1, 1);
@@ -1297,7 +1282,7 @@ public:
 
         gridLayout_19->addWidget(lbl_TabGame_aRemoveLocalArrows, 1, 0, 1, 1);
 
-        TabGame_aRemoveLocalArrows = new SecuenceEdit("Player/aRemoveLocalArrows",groupBox_18);
+        TabGame_aRemoveLocalArrows = new SequenceEdit("Player/aRemoveLocalArrows",groupBox_18);
         TabGame_aRemoveLocalArrows->setObjectName("TabGame_aRemoveLocalArrows");
 
         gridLayout_19->addWidget(TabGame_aRemoveLocalArrows, 1, 1, 1, 1);
@@ -1307,7 +1292,7 @@ public:
 
         gridLayout_19->addWidget(lbl_TabGame_aConcede, 1, 2, 1, 1);
 
-        TabGame_aConcede = new SecuenceEdit("Player/aConcede",groupBox_18);
+        TabGame_aConcede = new SequenceEdit("Player/aConcede",groupBox_18);
         TabGame_aConcede->setObjectName("TabGame_aConcede");
 
         gridLayout_19->addWidget(TabGame_aConcede, 1, 3, 1, 1);
@@ -1317,7 +1302,7 @@ public:
 
         gridLayout_19->addWidget(lbl_Player_aRollDie, 2, 0, 1, 1);
 
-        Player_aRollDie = new SecuenceEdit("Player/aRollDie",groupBox_18);
+        Player_aRollDie = new SequenceEdit("Player/aRollDie",groupBox_18);
         Player_aRollDie->setObjectName("Player_aRollDie");
 
         gridLayout_19->addWidget(Player_aRollDie, 2, 1, 1, 1);
@@ -1327,7 +1312,7 @@ public:
 
         gridLayout_19->addWidget(lbl_TabGame_aRotateViewCW, 2, 2, 1, 1);
 
-        TabGame_aRotateViewCW = new SecuenceEdit("Player/aRotateViewCW",groupBox_18);
+        TabGame_aRotateViewCW = new SequenceEdit("Player/aRotateViewCW",groupBox_18);
         TabGame_aRotateViewCW->setObjectName("TabGame_aRotateViewCW");
 
         gridLayout_19->addWidget(TabGame_aRotateViewCW, 2, 3, 1, 1);
@@ -1337,7 +1322,7 @@ public:
 
         gridLayout_19->addWidget(lbl_Player_aShuffle, 3, 0, 1, 1);
 
-        Player_aShuffle = new SecuenceEdit("Player/aShuffle",groupBox_18);
+        Player_aShuffle = new SequenceEdit("Player/aShuffle",groupBox_18);
         Player_aShuffle->setObjectName("Player_aShuffle");
 
         gridLayout_19->addWidget(Player_aShuffle, 3, 1, 1, 1);
@@ -1347,12 +1332,11 @@ public:
 
         gridLayout_19->addWidget(lbl_TabGame_aRotateViewCCW, 3, 2, 1, 1);
 
-        TabGame_aRotateViewCCW = new SecuenceEdit("Player/aRotateViewCCW",groupBox_18);
+        TabGame_aRotateViewCCW = new SequenceEdit("Player/aRotateViewCCW",groupBox_18);
         TabGame_aRotateViewCCW->setObjectName("TabGame_aRotateViewCCW");
 
         gridLayout_19->addWidget(TabGame_aRotateViewCCW, 3, 3, 1, 1);
 
-
         gridLayout_20->addWidget(groupBox_18, 1, 1, 1, 2);
 
         groupBox_14 = new QGroupBox(tab_3);
@@ -1364,7 +1348,7 @@ public:
 
         gridLayout_14->addWidget(lbl_Player_aMulligan, 4, 0, 1, 1);
 
-        Player_aMulligan = new SecuenceEdit("Player/aMulligan",groupBox_14);
+        Player_aMulligan = new SequenceEdit("Player/aMulligan",groupBox_14);
         Player_aMulligan->setObjectName("Player_aMulligan");
 
         gridLayout_14->addWidget(Player_aMulligan, 4, 1, 1, 1);
@@ -1374,7 +1358,7 @@ public:
 
         gridLayout_14->addWidget(lbl_Player_aDrawCard, 0, 0, 1, 1);
 
-        Player_aDrawCard = new SecuenceEdit("Player/aDrawCard",groupBox_14);
+        Player_aDrawCard = new SequenceEdit("Player/aDrawCard",groupBox_14);
         Player_aDrawCard->setObjectName("Player_aDrawCard");
 
         gridLayout_14->addWidget(Player_aDrawCard, 0, 1, 1, 1);
@@ -1384,7 +1368,7 @@ public:
 
         gridLayout_14->addWidget(lbl_Player_aDrawCards, 1, 0, 1, 1);
 
-        Player_aDrawCards = new SecuenceEdit("Player/aDrawCards",groupBox_14);
+        Player_aDrawCards = new SequenceEdit("Player/aDrawCards",groupBox_14);
         Player_aDrawCards->setObjectName("Player_aDrawCards");
 
         gridLayout_14->addWidget(Player_aDrawCards, 1, 1, 1, 1);
@@ -1394,7 +1378,7 @@ public:
 
         gridLayout_14->addWidget(lbl_Player_aUndoDraw, 2, 0, 1, 1);
 
-        Player_aUndoDraw = new SecuenceEdit("Player/aUndoDraw",groupBox_14);
+        Player_aUndoDraw = new SequenceEdit("Player/aUndoDraw",groupBox_14);
         Player_aUndoDraw->setObjectName("Player_aUndoDraw");
 
         gridLayout_14->addWidget(Player_aUndoDraw, 2, 1, 1, 1);
@@ -1404,36 +1388,49 @@ public:
 
         gridLayout_14->addWidget(lbl_Player_aAlwaysRevealTopCard, 3, 0, 1, 1);
 
-        Player_aAlwaysRevealTopCard = new SecuenceEdit("Player/aAlwaysRevealTopCard",groupBox_14);
+        Player_aAlwaysRevealTopCard = new SequenceEdit("Player/aAlwaysRevealTopCard",groupBox_14);
         Player_aAlwaysRevealTopCard->setObjectName("Player_aAlwaysRevealTopCard");
 
         gridLayout_14->addWidget(Player_aAlwaysRevealTopCard, 3, 1, 1, 1);
-
-
         gridLayout_20->addWidget(groupBox_14, 0, 0, 1, 1);
-
         verticalSpacer_3 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
-
         gridLayout_20->addItem(verticalSpacer_3, 2, 1, 1, 1);
-
         tabWidget->addTab(tab_3, QString());
-
         tab_4 = new QWidget(tabWidget);
         QGridLayout* grid = new QGridLayout(tab_4);
         grid->addWidget(groupBox_3);
         grid->addItem(new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding),1,0);
 
         tabWidget->addTab(tab_4, QString());
-
-        gridLayout_9->addWidget(tabWidget, 0, 0, 1, 1);
-
-
-        retranslateUi(shortcutsTab);
-
+        gridLayout_9->addWidget(tabWidget, 0, 0, 1, 1);        
         tabWidget->setCurrentIndex(0);
 
+        grid->setSpacing(3);
+        gridLayout->setSpacing(3);
+        gridLayout_2->setSpacing(3);
+        gridLayout_3->setSpacing(3);
+        gridLayout_4->setSpacing(3);
+        gridLayout_5->setSpacing(3);
+        gridLayout_6->setSpacing(3);
+        gridLayout_7->setSpacing(3);
+        gridLayout_8->setSpacing(3);
+        gridLayout_9->setSpacing(3);
+        gridLayout_10->setSpacing(3);
+        gridLayout_11->setSpacing(3);
+        gridLayout_12->setSpacing(3);
+        gridLayout_13->setSpacing(3);
+        gridLayout_14->setSpacing(3);
+        gridLayout_15->setSpacing(3);
+        gridLayout_16->setSpacing(3);
+        gridLayout_17->setSpacing(3);
+        gridLayout_18->setSpacing(3);
+        gridLayout_19->setSpacing(3);
+        gridLayout_20->setSpacing(3);
 
+        verticalLayout->setSpacing(3);
+        horizontalLayout->setSpacing(3);
         QMetaObject::connectSlotsByName(shortcutsTab);
+        retranslateUi(shortcutsTab);
     } // setupUi
 
     void retranslateUi(QWidget *shortcutsTab)
diff --git a/cockatrice/src/shortcutssettings.cpp b/cockatrice/src/shortcutssettings.cpp
index a22a9d22..242140a3 100644
--- a/cockatrice/src/shortcutssettings.cpp
+++ b/cockatrice/src/shortcutssettings.cpp
@@ -83,6 +83,7 @@ void ShortcutsSettings::setShortcuts(QString name, QList<QKeySequence> secuence)
     QString stringSecuence = stringifySecuence(secuence);
     shortCutsFile.setValue(name, stringSecuence);
     shortCutsFile.endGroup();
+    emit shortCutchanged();
 }
 
 void ShortcutsSettings::setShortcuts(QString name, QKeySequence secuence)
diff --git a/cockatrice/src/shortcutssettings.h b/cockatrice/src/shortcutssettings.h
index 5958b9f7..45324106 100644
--- a/cockatrice/src/shortcutssettings.h
+++ b/cockatrice/src/shortcutssettings.h
@@ -24,6 +24,9 @@ public:
     void setShortcuts(QString name, QString secuences);
 
     bool isValid(QString name, QString secuences);
+signals:
+    void shortCutchanged();
+
 private:
     QString settingsFilePath;
     QMap<QString,QList<QKeySequence> > shortCuts;
diff --git a/cockatrice/src/tab_deck_editor.cpp b/cockatrice/src/tab_deck_editor.cpp
index c7b22b73..52c24995 100644
--- a/cockatrice/src/tab_deck_editor.cpp
+++ b/cockatrice/src/tab_deck_editor.cpp
@@ -257,71 +257,45 @@ void TabDeckEditor::createMenus()
 {
     aNewDeck = new QAction(QString(), this);
     connect(aNewDeck, SIGNAL(triggered()), this, SLOT(actNewDeck()));
-    aNewDeck->setShortcuts(settingsCache->shortcuts().getShortcut(
-                               "TabDeckEditor/aNewDeck"));
 
     aLoadDeck = new QAction(QString(), this);
     connect(aLoadDeck, SIGNAL(triggered()), this, SLOT(actLoadDeck()));
-    aLoadDeck->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                "TabDeckEditor/aLoadDeck"));
 
     aSaveDeck = new QAction(QString(), this);
     connect(aSaveDeck, SIGNAL(triggered()), this, SLOT(actSaveDeck()));
-    aSaveDeck->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                "TabDeckEditor/aSaveDeck"));
 
     aSaveDeckAs = new QAction(QString(), this);
     connect(aSaveDeckAs, SIGNAL(triggered()), this, SLOT(actSaveDeckAs()));
-    aSaveDeckAs->setShortcuts(QKeySequence::SaveAs);
-    aSaveDeckAs->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                "TabDeckEditor/aSaveDeckAs"));
 
     aOpenCustomsetsFolder = new QAction(QString(), this);
         connect(aOpenCustomsetsFolder, SIGNAL(triggered()), this, SLOT(actOpenCustomsetsFolder()));
 
     aLoadDeckFromClipboard = new QAction(QString(), this);
     connect(aLoadDeckFromClipboard, SIGNAL(triggered()), this, SLOT(actLoadDeckFromClipboard()));
-    aLoadDeckFromClipboard->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                        "TabDeckEditor/aLoadDeckFromClipboard"));
 
     aSaveDeckToClipboard = new QAction(QString(), this);
     connect(aSaveDeckToClipboard, SIGNAL(triggered()), this, SLOT(actSaveDeckToClipboard()));
-    aSaveDeckToClipboard->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                           "TabDeckEditor/aSaveDeckToClipboard"));
 
     aPrintDeck = new QAction(QString(), this);
     connect(aPrintDeck, SIGNAL(triggered()), this, SLOT(actPrintDeck()));
-    aPrintDeck->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                 "TabDeckEditor/aPrintDeck"));
 
     aAnalyzeDeck = new QAction(QString(), this);
     connect(aAnalyzeDeck, SIGNAL(triggered()), this, SLOT(actAnalyzeDeck()));
-    aAnalyzeDeck->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                   "TabDeckEditor/aAnalyzeDeck"));
 
     aClose = new QAction(QString(), this);
     connect(aClose, SIGNAL(triggered()), this, SLOT(closeRequest()));
-    aClose->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aClose"));
 
     aOpenCustomFolder = new QAction(QString(), this);
     connect(aOpenCustomFolder, SIGNAL(triggered()), this, SLOT(actOpenCustomFolder()));
-    aOpenCustomFolder->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                        "TabDeckEditor/aOpenCustomFolder"));
 
     aEditSets = new QAction(QString(), this);
     connect(aEditSets, SIGNAL(triggered()), this, SLOT(actEditSets()));
-    aEditSets->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                            "TabDeckEditor/aEditSets"));
 
     aEditTokens = new QAction(QString(), this);
     connect(aEditTokens, SIGNAL(triggered()), this, SLOT(actEditTokens()));
-    aEditTokens->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                            "TabDeckEditor/aEditTokens"));
 
     aResetLayout = new QAction(QString(), this);
     connect(aResetLayout,SIGNAL(triggered()),this,SLOT(restartLayout()));
-    aResetLayout->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                            "TabDeckEditor/aResetLayout"));
 
     deckMenu = new QMenu(this);
     deckMenu->addAction(aNewDeck);
@@ -344,14 +318,10 @@ void TabDeckEditor::createMenus()
     aClearFilterAll = new QAction(QString(), this);
     aClearFilterAll->setIcon(QIcon(":/resources/icon_clearsearch.svg"));
     connect(aClearFilterAll, SIGNAL(triggered()), this, SLOT(actClearFilterAll()));
-    aClearFilterAll->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                                "TabDeckEditor/aClearFilterAll"));
 
     aClearFilterOne = new QAction(QString(), this);
     aClearFilterOne->setIcon(QIcon(":/resources/decrement.svg"));
     connect(aClearFilterOne, SIGNAL(triggered()), this, SLOT(actClearFilterOne()));
-    aClearFilterOne->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                                "TabDeckEditor/aClearFilterOne"));
 
     dbMenu = new QMenu(this);
     dbMenu->addAction(aEditSets);
@@ -458,7 +428,7 @@ void TabDeckEditor::createCentralFrame()
     QHBoxLayout *mainLayout = new QHBoxLayout;
     mainLayout->setObjectName("mainLayout");
     mainLayout->addWidget(MainWindow);
-    setLayout(mainLayout);    
+    setLayout(mainLayout);
 }
 
 void TabDeckEditor::restartLayout()
@@ -498,6 +468,30 @@ void TabDeckEditor::freeDocksSize()
     filterDock->setMaximumSize(5000,5000);
 }
 
+void TabDeckEditor::refreshShortcuts()
+{
+    aNewDeck->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aNewDeck"));
+    aLoadDeck->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aLoadDeck"));
+    aSaveDeck->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aSaveDeck"));
+    aSaveDeckAs->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aSaveDeckAs"));
+    aLoadDeckFromClipboard->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aLoadDeckFromClipboard"));
+    aPrintDeck->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aPrintDeck"));
+    aAnalyzeDeck->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aAnalyzeDeck"));
+    aClose->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aClose"));
+    aOpenCustomFolder->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aOpenCustomFolder"));
+    aEditSets->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aEditSets"));
+    aEditTokens->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aEditTokens"));
+    aResetLayout->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aResetLayout"));
+    aClearFilterAll->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aClearFilterAll"));
+    aClearFilterOne->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aClearFilterOne"));
+    aSaveDeckToClipboard->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aSaveDeckToClipboard"));
+    aClearFilterOne->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aClearFilterOne"));
+    aClose->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aClose"));
+    aRemoveCard->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aRemoveCard"));
+    aIncrement->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aIncrement"));
+    aDecrement->setShortcuts(settingsCache->shortcuts().getShortcut("TabDeckEditor/aDecrement"));
+}
+
 void TabDeckEditor::loadLayout()
 {
     MainWindow->restoreState(settingsCache->getDeckEditorLayoutState());
@@ -538,6 +532,9 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
     this->installEventFilter(this);    
 
     retranslateUi();
+    connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()),this,SLOT(refreshShortcuts()));
+    refreshShortcuts();
+
     QTimer::singleShot(0, this, SLOT(checkFirstRunDetected()));
     QTimer::singleShot(0, this, SLOT(loadLayout()));
 }
@@ -553,8 +550,6 @@ void TabDeckEditor::retranslateUi()
 
     aClearFilterAll->setText(tr("&Clear all filters"));
     aClearFilterOne->setText(tr("Delete selected"));
-    aClearFilterOne->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                      "TabDeckEditor/aClearFilterOne"));
     
     nameLabel->setText(tr("Deck &name:"));
     commentsLabel->setText(tr("&Comments:"));
@@ -574,23 +569,15 @@ void TabDeckEditor::retranslateUi()
     aOpenCustomFolder->setText(tr("Open custom image folder"));
     aOpenCustomsetsFolder->setText(tr("Open custom sets folder"));    
     aClose->setText(tr("&Close"));
-    aClose->setShortcuts(settingsCache->shortcuts().getShortcut(
-                             "TabDeckEditor/aClose"));
     
     aAddCard->setText(tr("Add card to &maindeck"));
     aAddCardToSideboard->setText(tr("Add card to &sideboard"));
 
     aRemoveCard->setText(tr("&Remove row"));
-    aRemoveCard->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                  "TabDeckEditor/aRemoveCard"));
 
     aIncrement->setText(tr("&Increment number"));
-    aIncrement->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                 "TabDeckEditor/aIncrement"));
 
     aDecrement->setText(tr("&Decrement number"));
-    aDecrement->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                 "TabDeckEditor/aDecrement"));
     
     deckMenu->setTitle(tr("&Deck Editor"));
     dbMenu->setTitle(tr("C&ard Database"));
diff --git a/cockatrice/src/tab_deck_editor.h b/cockatrice/src/tab_deck_editor.h
index 19591e3f..996e3ec8 100644
--- a/cockatrice/src/tab_deck_editor.h
+++ b/cockatrice/src/tab_deck_editor.h
@@ -83,6 +83,7 @@ class TabDeckEditor : public Tab {
             void loadLayout();
             void restartLayout();
             void freeDocksSize();
+            void refreshShortcuts();
 
 private:
     CardInfo *currentCardInfo() const;
diff --git a/cockatrice/src/tab_game.cpp b/cockatrice/src/tab_game.cpp
index 1b278459..22f54831 100644
--- a/cockatrice/src/tab_game.cpp
+++ b/cockatrice/src/tab_game.cpp
@@ -120,16 +120,14 @@ DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent)
     setLayout(deckViewLayout);
     
     retranslateUi();
+    connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()),this,SLOT(refreshShortcuts()));
+    refreshShortcuts();
 }
 
 void DeckViewContainer::retranslateUi()
 {
     loadLocalButton->setText(tr("Load local deck"));
-    loadLocalButton->setShortcut(settingsCache->shortcuts().getSingleShortcut(
-                                     "DeckViewContainer/loadLocalButton"));
     loadRemoteButton->setText(tr("Load deck from server"));
-    loadRemoteButton->setShortcut(settingsCache->shortcuts().getSingleShortcut(
-                                      "DeckViewContainer/loadRemoteButton"));
     readyStartButton->setText(tr("Ready to s&tart"));
     updateSideboardLockButtonText();
 }
@@ -150,6 +148,58 @@ void DeckViewContainer::updateSideboardLockButtonText()
         sideboardLockButton->setText(tr("S&ideboard locked"));
 }
 
+void DeckViewContainer::refreshShortcuts()
+{
+    loadLocalButton->setShortcut(settingsCache->shortcuts().getSingleShortcut("DeckViewContainer/loadLocalButton"));
+    loadRemoteButton->setShortcut(settingsCache->shortcuts().getSingleShortcut("DeckViewContainer/loadRemoteButton"));
+}
+
+void TabGame::refreshShortcuts()
+{
+    for (int i = 0; i < phaseActions.size(); ++i) {
+        QAction *temp = phaseActions.at(i);
+        switch (i) {
+            case 0: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase0")); break;
+            case 1: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase1")); break;
+            case 2: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase2")); break;
+            case 3: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase3")); break;
+            case 4: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase4")); break;
+            case 5: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase5")); break;
+            case 6: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase6")); break;
+            case 7: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase7")); break;
+            case 8: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase8")); break;
+            case 9: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase9")); break;
+            case 10:temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase10")); break;
+            default: ;
+        }
+    }
+
+    if (aNextPhase) {
+        aNextPhase->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aNextPhase"));
+    }
+    if (aNextTurn) {
+        aNextTurn->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aNextTurn"));
+    }
+    if (aRemoveLocalArrows) {
+        aRemoveLocalArrows->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aRemoveLocalArrows"));
+    }
+    if (aRotateViewCW) {
+        aRotateViewCW->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aRotateViewCW"));
+    }
+    if (aRotateViewCCW) {
+        aRotateViewCCW->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aRotateViewCCW"));
+    }
+    if (aConcede) {
+        aConcede->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aConcede"));
+    }
+    if (aLeaveGame) {
+        aLeaveGame->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aLeaveGame"));
+    }
+    if (aCloseReplay) {
+        aCloseReplay->setShortcuts(settingsCache->shortcuts().getShortcut("Player/aCloseReplay"));
+    }
+}
+
 void DeckViewContainer::loadLocalDeck()
 {
     QFileDialog dialog(this, tr("Load deck"));
@@ -361,6 +411,8 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
     addTabMenu(gameMenu);
     
     retranslateUi();
+    connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()),this,SLOT(refreshShortcuts()));
+    refreshShortcuts();
     setLayout(superMainLayout);
 
     splitter->restoreState(settingsCache->getTabGameSplitterSizes());
@@ -470,23 +522,10 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_client
     for (int i = 0; i < phasesToolbar->phaseCount(); ++i) {
         QAction *temp = new QAction(QString(), this);
         connect(temp, SIGNAL(triggered()), this, SLOT(actPhaseAction()));
-        switch (i) {
-            case 0: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase0")); break;
-            case 1: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase1")); break;
-            case 2: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase2")); break;
-            case 3: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase3")); break;
-            case 4: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase4")); break;
-            case 5: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase5")); break;
-            case 6: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase6")); break;
-            case 7: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase7")); break;
-            case 8: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase8")); break;
-            case 9: temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase9")); break;
-            case 10:temp->setShortcuts(settingsCache->shortcuts().getShortcut("Player/phase10")); break;
-            default: ;
-        }
         phasesMenu->addAction(temp);
         phaseActions.append(temp);
     }
+
     phasesMenu->addSeparator();
     phasesMenu->addAction(aNextPhase);
     
@@ -505,6 +544,8 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_client
     addTabMenu(gameMenu);
     
     retranslateUi();
+    connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()),this,SLOT(refreshShortcuts()));
+    refreshShortcuts();
     setLayout(mainLayout);
 
     splitter->restoreState(settingsCache->getTabGameSplitterSizes());
@@ -552,45 +593,29 @@ void TabGame::retranslateUi()
     gameMenu->setTitle(tr("&Game"));
     if (aNextPhase) {
         aNextPhase->setText(tr("Next &phase"));
-        aNextPhase->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                     "Player/aNextPhase"));
     }
     if (aNextTurn) {
         aNextTurn->setText(tr("Next &turn"));
-        aNextTurn->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                    "Player/aNextTurn"));
     }
     if (aRemoveLocalArrows) {
         aRemoveLocalArrows->setText(tr("&Remove all local arrows"));
-        aRemoveLocalArrows->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                             "Player/aRemoveLocalArrows"));
     }
     if (aRotateViewCW) {
         aRotateViewCW->setText(tr("Rotate View Cl&ockwise"));
-        aRotateViewCW->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                        "Player/aRotateViewCW"));
     }
     if (aRotateViewCCW) {
         aRotateViewCCW->setText(tr("Rotate View Co&unterclockwise"));
-        aRotateViewCCW->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                         "Player/aRotateViewCCW"));
     }
     if (aGameInfo)
         aGameInfo->setText(tr("Game &information"));
     if (aConcede) {
         aConcede->setText(tr("&Concede"));
-        aConcede->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                   "Player/aConcede"));
     }
     if (aLeaveGame) {
         aLeaveGame->setText(tr("&Leave game"));
-        aLeaveGame->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                     "Player/aLeaveGame"));
     }
     if (aCloseReplay) {
         aCloseReplay->setText(tr("C&lose replay"));
-        aCloseReplay->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                       "Player/aCloseReplay"));
     }
     
     if (sayLabel)
diff --git a/cockatrice/src/tab_game.h b/cockatrice/src/tab_game.h
index e704b569..719d4dd5 100644
--- a/cockatrice/src/tab_game.h
+++ b/cockatrice/src/tab_game.h
@@ -84,6 +84,7 @@ private slots:
     void sideboardPlanChanged();
     void sideboardLockButtonClicked();
     void updateSideboardLockButtonText();
+    void refreshShortcuts();
 signals:
     void newCardAdded(AbstractCardItem *card);
 public:
@@ -199,6 +200,7 @@ private slots:
 
     void addMentionTag(QString value);
     void commandFinished(const Response &response);
+    void refreshShortcuts();
 public:
     TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_clients, const Event_GameJoined &event, const QMap<int, QString> &_roomGameTypes);
     TabGame(TabSupervisor *_tabSupervisor, GameReplay *replay);
diff --git a/cockatrice/src/tab_room.cpp b/cockatrice/src/tab_room.cpp
index 68e43196..45b6f281 100644
--- a/cockatrice/src/tab_room.cpp
+++ b/cockatrice/src/tab_room.cpp
@@ -68,7 +68,6 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, ServerI
     QMenu *chatSettingsMenu = new QMenu(this);
 
     aClearChat = chatSettingsMenu->addAction(QString());
-    aClearChat->setShortcuts(settingsCache->shortcuts().getShortcut("tab_room/aClearChat"));
     connect(aClearChat, SIGNAL(triggered()), this, SLOT(actClearChat()));
 
     chatSettingsMenu->addSeparator();
@@ -132,6 +131,8 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, ServerI
 
     sayEdit->setCompleter(completer);
     actCompleterChanged();
+    connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()),this,SLOT(refreshShortcuts()));
+    refreshShortcuts();
 }
 
 TabRoom::~TabRoom()
@@ -282,6 +283,11 @@ void TabRoom::processRoomSayEvent(const Event_RoomSay &event)
     emit userEvent(false);
 }
 
+void TabRoom::refreshShortcuts()
+{
+    aClearChat->setShortcuts(settingsCache->shortcuts().getShortcut("tab_room/aClearChat"));
+}
+
 void TabRoom::addMentionTag(QString mentionTag) {
     sayEdit->insert(mentionTag + " ");
     sayEdit->setFocus();
diff --git a/cockatrice/src/tab_room.h b/cockatrice/src/tab_room.h
index 98a74d8f..d8201e08 100644
--- a/cockatrice/src/tab_room.h
+++ b/cockatrice/src/tab_room.h
@@ -73,6 +73,7 @@ private slots:
     void processJoinRoomEvent(const Event_JoinRoom &event);
     void processLeaveRoomEvent(const Event_LeaveRoom &event);
     void processRoomSayEvent(const Event_RoomSay &event);
+    void refreshShortcuts();
 public:
     TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, ServerInfo_User *_ownUser, const ServerInfo_Room &info);
     ~TabRoom();
diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp
index 44fafb35..a2edd199 100644
--- a/cockatrice/src/window_main.cpp
+++ b/cockatrice/src/window_main.cpp
@@ -456,40 +456,14 @@ void MainWindow::retranslateUi()
     setClientStatusTitle();
 
     aConnect->setText(tr("&Connect..."));
-    aConnect->setShortcuts(settingsCache->shortcuts().getShortcut(
-                               "MainWindow/aConnect"));
-
     aDisconnect->setText(tr("&Disconnect"));
-    aDisconnect->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                  "MainWindow/aDisconnect"));
-
     aSinglePlayer->setText(tr("Start &local game..."));
-    aSinglePlayer->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                    "MainWindow/aSinglePlayer"));
-
     aWatchReplay->setText(tr("&Watch replay..."));
-    aWatchReplay->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                   "MainWindow/aWatchReplay"));
-
     aDeckEditor->setText(tr("&Deck editor"));
-    aDeckEditor->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                  "MainWindow/aDeckEditor"));
-
     aFullScreen->setText(tr("&Full screen"));
-    aFullScreen->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                  "MainWindow/aFullScreen"));
-
     aRegister->setText(tr("&Register to server..."));
-    aRegister->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                "MainWindow/aRegister"));
-
     aSettings->setText(tr("&Settings..."));
-    aSettings->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                "MainWindow/aSettings"));
-
     aExit->setText(tr("&Exit"));
-    aExit->setShortcuts(settingsCache->shortcuts().getShortcut(
-                            "MainWindow/aExit"));
 
 #if defined(__APPLE__)  /* For OSX */
     cockatriceMenu->setTitle(tr("A&ctions"));
@@ -499,11 +473,7 @@ void MainWindow::retranslateUi()
 
     aAbout->setText(tr("&About Cockatrice"));
     helpMenu->setTitle(tr("&Help"));
-
     aCheckCardUpdates->setText(tr("Check for card updates..."));
-    aCheckCardUpdates->setShortcuts(settingsCache->shortcuts().getShortcut(
-                                        "MainWindow/aCheckCardUpdates"));
-
     tabSupervisor->retranslateUi();
 }
 
@@ -622,6 +592,9 @@ MainWindow::MainWindow(QWidget *parent)
         createTrayActions();
         createTrayIcon();
     }
+
+    connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()),this,SLOT(refreshShortcuts()));
+    refreshShortcuts();
 }
 
 MainWindow::~MainWindow()
@@ -801,3 +774,17 @@ void MainWindow::cardUpdateFinished(int, QProcess::ExitStatus)
     // this will force a database reload
     settingsCache->setCardDatabasePath(settingsCache->getCardDatabasePath());
 }
+
+void MainWindow::refreshShortcuts()
+{
+    aConnect->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aConnect"));
+    aDisconnect->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aDisconnect"));
+    aSinglePlayer->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aSinglePlayer"));
+    aWatchReplay->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aWatchReplay"));
+    aDeckEditor->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aDeckEditor"));
+    aFullScreen->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aFullScreen"));
+    aRegister->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aRegister"));
+    aSettings->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aSettings"));
+    aExit->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aExit"));
+    aCheckCardUpdates->setShortcuts(settingsCache->shortcuts().getShortcut("MainWindow/aCheckCardUpdates"));
+}
diff --git a/cockatrice/src/window_main.h b/cockatrice/src/window_main.h
index 5c319318..5a12676e 100644
--- a/cockatrice/src/window_main.h
+++ b/cockatrice/src/window_main.h
@@ -73,6 +73,7 @@ private slots:
     void actCheckCardUpdates();
     void cardUpdateError(QProcess::ProcessError err);
     void cardUpdateFinished(int exitCode, QProcess::ExitStatus exitStatus);
+    void refreshShortcuts();
 private:
     static const QString appName;
     void setClientStatusTitle();