diff --git a/Python/EyeWitness.py b/Python/EyeWitness.py
index 92fd1e14..48573cf3 100755
--- a/Python/EyeWitness.py
+++ b/Python/EyeWitness.py
@@ -135,7 +135,7 @@ def create_cli_parser():
     rdp_options.add_argument('--ocr', default=False, action='store_true', help='Use OCR to determine RDP usernames')
 
     args = parser.parse_args()
-    args.date = time.strftime('%m/%d/%Y')
+    args.date = time.strftime('%Y/%m/%d')
     args.time = time.strftime('%H:%M:%S')
 
     if args.h:
@@ -174,7 +174,7 @@ def create_cli_parser():
 
     else:
         output_folder = args.date.replace(
-            '/', '') + '_' + args.time.replace(':', '')
+            '/', '-') + '_' + args.time.replace(':', '')
         args.d = os.path.join(os.getcwd(), output_folder)
 
     args.log_file_path = os.path.join(args.d, 'logfile.log')
diff --git a/Python/categories.txt b/Python/categories.txt
index c48e3a69..55c62a63 100644
--- a/Python/categories.txt
+++ b/Python/categories.txt
@@ -438,4 +438,8 @@ Nimble Storage;/assets/vendor;/oem/settings.js;<!-- Username field -->;data-embe
 <title>SyncThru Web Service</title>;var autoLogoutTimeReNewSec=0;pOverLayZIndex = Number(overlayZidx) + 10|printer
 <title>Data Center Network Manager</title>;.loadingStatusErrorParent;var h = document.getElementsByTagName("head")[0]|infrastructure
 <title>Data Center Network Manager</title>;<div class="userFormContainer">;<div class="middleContent" dojoattachpoint="containerNode">|infrastructure
-<title>Identity Services Engine</title>;Cisco Systems,Inc. Cisco, Cisco Systems;for(key in localStorage){|infrastructure
\ No newline at end of file
+<title>Identity Services Engine</title>;Cisco Systems,Inc. Cisco, Cisco Systems;for(key in localStorage){|infrastructure
+var InternalSessionTimeout = 1 * 60 * 1000;theForm.__EVENTTARGET.value = eventTarget;ctl00_MyHeader_Label1|netdev
+var helpTip = new Tooltip("signin-help");var helpTip = new Tooltip("signin-help");form action="/content/login.php"|netdev
+function changeMyPage(val);MX-M5070;var elemLi = document.createElement('li')|printer
+<title>Netgear Prosafe Plus Switch</title>;var productName = sysGeneInfor.split|netdev
\ No newline at end of file
diff --git a/Python/signatures.txt b/Python/signatures.txt
index 0b57377f..64119656 100644
--- a/Python/signatures.txt
+++ b/Python/signatures.txt
@@ -320,4 +320,8 @@ Nimble Storage;/assets/vendor;/oem/settings.js;<!-- Username field -->;data-embe
 <title>SyncThru Web Service</title>;var autoLogoutTimeReNewSec=0;pOverLayZIndex = Number(overlayZidx) + 10|Panasonic SyncThrough Web Service admin/sec00000
 <title>Data Center Network Manager</title>;.loadingStatusErrorParent;var h = document.getElementsByTagName("head")[0]|Cisco Data Center Network Management admin/admin
 <title>Data Center Network Manager</title>;<div class="userFormContainer">;<div class="middleContent" dojoattachpoint="containerNode">|Cisco Data Center Network Management admin/admin
-<title>Identity Services Engine</title>;Cisco Systems,Inc. Cisco, Cisco Systems;for(key in localStorage){|Cisco Identity Services Engine admin/<passwordsetatinstall>
\ No newline at end of file
+<title>Identity Services Engine</title>;Cisco Systems,Inc. Cisco, Cisco Systems;for(key in localStorage){|Cisco Identity Services Engine admin/<passwordsetatinstall>
+var InternalSessionTimeout = 1 * 60 * 1000;theForm.__EVENTTARGET.value = eventTarget;ctl00_MyHeader_Label1|Bosch Security Camera user1/8088
+var helpTip = new Tooltip("signin-help");var helpTip = new Tooltip("signin-help");form action="/content/login.php"|Pelco IP110 admin/admin
+function changeMyPage(val);MX-M5070;var elemLi = document.createElement('li')|Sharp MX 5070 administrator/admin
+<title>Netgear Prosafe Plus Switch</title>;var productName = sysGeneInfor.split|NetGear GS116ev2 <nousername>/password
\ No newline at end of file