diff --git a/requirements.txt b/requirements.txt
index c5d7219..81aef32 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,8 @@
 colorama==0.3.9
 nose==1.3.7
-PyYAML>=3.12,<4
+PyYAML>=6.0.1
 requests>=2.18.3,<3
-Requires==0.0.3
-screepsapi>=0.5.1
+screepsapi @ git+https://github.com/screepers/python-screeps@b4dd23c4d7d987ea73bfc53faca445abd4f5b58d
 six>=1.10.0,<2
-urwid==1.3.1
+urwid==2.1.2
 websocket-client==0.44.0
diff --git a/screeps_console/interactive.py b/screeps_console/interactive.py
index b0d6884..c48b494 100755
--- a/screeps_console/interactive.py
+++ b/screeps_console/interactive.py
@@ -401,7 +401,7 @@ def __del__(self):
                     connectionSettings = settings.getConnection(server)
 
     if not connectionSettings:
-        if server is 'main':
+        if server == 'main':
             host = 'screeps.com'
             secure = True
         else:
@@ -409,7 +409,8 @@ def __del__(self):
             secure = input("Secure (y/n) ") == "y"
         username = input("Username: ")
         password = input("Password: ")
-        settings.addConnection(server, username, password, host, secure)
+        token = input("Token: ")
+        settings.addConnection(server, username, password, token, host, secure)
 
     if server == 'main' and 'token' not in connectionSettings:
         settings.addConnection('main', connectionSettings['username'], connectionSettings['password'])
diff --git a/screeps_console/settings.py b/screeps_console/settings.py
index 7ba7f87..2ec3ead 100644
--- a/screeps_console/settings.py
+++ b/screeps_console/settings.py
@@ -22,7 +22,7 @@ def getSettings():
         saveSettings(settings)
         return settings
     with open(settingsfile, 'r') as f:
-        settings = yaml.load(f)
+        settings = yaml.safe_load(f)
     return settings
 
 
@@ -41,7 +41,7 @@ def getConnection(name):
     return settings['connections'][name]
 
 
-def addConnection(name, username, password, host=False, secure=False):
+def addConnection(name, username, password, token=False, host=False, secure=False):
     if name == 'main':
         secure = True
         host = 'screeps.com'
@@ -58,7 +58,7 @@ def addConnection(name, username, password, host=False, secure=False):
         settings['connections'] = {}
 
     if name == 'main' or name == 'ptr':
-        token = getToken(username, password, host, secure)
+        token = token if token else getToken(username, password, host, secure)
         settings['connections'][name] = {
             'host': host,
             'secure': secure,