diff --git a/tools/kraker-js/package-lock.json b/tools/kraker-js/package-lock.json
index b8d62e31..6301660a 100644
--- a/tools/kraker-js/package-lock.json
+++ b/tools/kraker-js/package-lock.json
@@ -1,16 +1,17 @@
 {
-  "name": "crackjs",
+  "name": "kraker-js",
   "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "crackjs",
+      "name": "kraker-js",
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
         "bulma": "^1.0.2",
         "crack-js": "^1.0.5",
+        "hashcat-rules-js": "^1.0.8",
         "mitt": "^3.0.1",
         "vue": "^3.5.12"
       },
@@ -941,6 +942,12 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
+    "node_modules/hashcat-rules-js": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/hashcat-rules-js/-/hashcat-rules-js-1.0.8.tgz",
+      "integrity": "sha512-XIjr4bKHScQJe1NInVuXuX9C9B8We+hAgj3nksG+42hiVJfvsGw4ODbumsszJ0oRz/7fqMK1aZfNx9wT3NF29g==",
+      "license": "ISC"
+    },
     "node_modules/magic-string": {
       "version": "0.30.12",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz",
diff --git a/tools/kraker-js/package.json b/tools/kraker-js/package.json
index 84768cc3..817957ea 100644
--- a/tools/kraker-js/package.json
+++ b/tools/kraker-js/package.json
@@ -14,6 +14,7 @@
   "dependencies": {
     "bulma": "^1.0.2",
     "crack-js": "^1.0.5",
+    "hashcat-rules-js": "^1.0.8",
     "mitt": "^3.0.1",
     "vue": "^3.5.12"
   },
diff --git a/tools/kraker-js/src/App.vue b/tools/kraker-js/src/App.vue
index a72f897d..ccad7c2d 100644
--- a/tools/kraker-js/src/App.vue
+++ b/tools/kraker-js/src/App.vue
@@ -53,7 +53,7 @@ const hashesInput = ref('');
 
 
 const hashEntries = computed(() => {
-  return hashesInput.value.split('\n').filter(entry => entry.trim() !== '');
+  return hashesInput.value.split('\n').map(entry => entry.trim()).filter(entry => entry !== '');
 });
 const foundEntries = ref([]);
 
@@ -116,7 +116,7 @@ const runCrackWorker = () => {
       }    
       else if(attackTab.value=="files")
       {
-       crackWorker.value.postMessage({    action: 'start',    useRules: useRules.value,    wordlistFile: wordlistFile.value,    rulesFile: rulesFile.value});
+       crackWorker.value.postMessage({    action: 'start',    useRules: useRules.value,    wordlistFile: wordlistFile.value,   hashEntries: hashEntries.value, rulesFile: rulesFile.value,    selectedHashType:selectedHashType.value});
       }  
       else
       {
@@ -223,6 +223,7 @@ function handleWordlistSelect(event) {
 
 function handleRulesSelect(event) {
    rulesFile.value = event.target.files[0];
+   console.log(rulesFile.value.name );
    rulesName.value = rulesFile.value ? rulesFile.value.name : '';
 }
 
@@ -373,18 +374,6 @@ function handleRulesSelect(event) {
                 </div>
             </div>
 
-
-            <div class="column is-12 ml-auto">
-                <div class="notification is-primary" id="notify">Done!</div>
-            </div>
-            <div class="column is-12 ml-auto">
-                <div class="field has-addons" id="div_progress">
-                    <p class="control is-expanded">
-                        <progress class="progress is-medium" id="progress" value="0" max="100"></progress>
-                    </p>
-                </div>
-            </div>
-
         </div>
 
          
@@ -433,7 +422,7 @@ function handleRulesSelect(event) {
                      <label class="file-label">
                         <input class="file-input" type="file"  @change="handleRulesSelect" />
                         <span class="file-cta">
-                           <span class="file-label" v-if="ruleName">{{ ruleName }}</span>
+                           <span class="file-label" v-if="rulesName">{{ rulesName }}</span>
                            <span class="file-label" v-else> Choose a file… </span>
                            
                         </span>
diff --git a/tools/kraker-js/src/workers/files.js b/tools/kraker-js/src/workers/files.js
index 6aefd8bc..a38d2b84 100644
--- a/tools/kraker-js/src/workers/files.js
+++ b/tools/kraker-js/src/workers/files.js
@@ -1,49 +1,132 @@
 import hashcat from 'crack-js';
+import hashcatRule from 'hashcat-rules-js';
 self.onmessage = async  (event) => {
     if (event.data.action === 'start') {
         console.log("START");
 
             const wordlistFile = event.data.wordlistFile;
             const useRules = event.data.useRules;
-            const rulesFile = event.data.wordlistFile;
+            const rulesFile = event.data.rulesFile;
+            const selectedHashType=event.data.selectedHashType;
+            let hashEntries=event.data.hashEntries;
 
+            if(!hashcat.availableHashTypes.includes(selectedHashType))
+            {
+                postMessage({ type:"log", message: 'Undefined hashtype - ('+selectedHashType+')' });
+                postMessage({ type:"status", status: "done"});
+                self.close();
+                return;
+            }
+  
+            if (!Array.isArray(hashEntries) || hashEntries.length == 0) {
+                postMessage({ type:"log", message: 'Hash entries is empty  - ('+hashEntries+')' });
+                postMessage({ type:"status", status: "done"});
+                self.close();
+                return;
+            } 
+  
+            
+
+
+
+
+
+
+
+
+            const chunkSize=64 * 1024;
             let countLines=0;
-            postMessage({ type:"log", message: "wordlistFile:"+wordlistFile.name});
+            postMessage({ type:"log", message: "wordlistFile to use:"+wordlistFile.name});
 
+            let offset = 0;
+            let remainder = '';
+          
+            let fileContent =false;
+            if(useRules) fileContent=await loadRules(rulesFile);
 
-              readChunk(wordlistFile,0,'');
-        console.log(countLines);
+            let reader = new FileReader();
+            while (offset < wordlistFile.size) {
+              let blob = wordlistFile.slice(offset, offset + chunkSize);
+              
+                const readPromise = new Promise((resolve) => {
+                reader.onload = (event) => {
+                  const text = remainder + event.target.result;
+                  const lines = text.split('\n');
+                  remainder = lines.pop();
+                  
+                  lines.forEach((line) => {
+                    console.log(line);
+                    if(useRules)
+                  {
+                    
+                    for (const rule of fileContent) {
+                      let modifiedLine=hashcatRule.applyRule(line.trim(),rule);
+                      processHashes(hashEntries,modifiedLine,selectedHashType)
+                    }
+                  }
+                  else
+                  {
+                    processHashes(hashEntries,line.trim(),selectedHashType)
+                  }
 
+                  });
+          
+                  resolve(); 
+                };
+              });
+          
+        
+              reader.readAsText(blob);
+              await readPromise;
+              offset += chunkSize;
+            }
+            if (remainder) {
+              console.log(remainder);
+            }
+
+            console.log(countLines);
+      
 
             postMessage({ type:"status", status: "done"});
             
     }
   };
 
-  function readChunk(wordlistFile,offset, remainder) {
-    const chunkSize=64 * 1024;
-    console.log(wordlistFile.size);
-    console.log(wordlistFile.name);
-    if (offset >= wordlistFile.size) {
-      self.close();
-      return;
-    }
-
-    const blob = wordlistFile.slice(offset, offset + chunkSize);
-    const reader = new FileReader();
-
-    reader.onload = (event) => {
-      const text = remainder + event.target.result;
-      const lines = text.split('\n');
-      remainder = lines.pop();
-        
-      lines.forEach((line) => {
+  function loadRules(file) {
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+  
+      reader.onload = (event) => {
+        const content = event.target.result;
+        const lines = content.split('\n').map(line => line.trim()).filter(line => line !== '');//trim and skip empty lines
+        const uniqueLines = Array.from(new Set(lines));
+        resolve(uniqueLines); // return only uniq rules
+      };
+  
+      reader.onerror = (error) => {
+        reject(error);
+      };
+  
+      reader.readAsText(file);
+    });
+  }
+  function processHashes(hashEntries, line, selectedHashType) {
+    for (let i = 0; i < hashEntries.length; i++) {
+      const hash = hashEntries[i];
+      console.log(hash);
+      console.log(line);
+      console.log(selectedHashType);
+      console.log(hashcat.verifyHash(line, hash, selectedHashType));
+      if (hashcat.verifyHash(line, hash, selectedHashType) === true) {
+        postMessage({
+          type: "found",
+          hash: hash,
+          password: line,
+          type: selectedHashType
+        });
         console.log(line);
-      });
-
-      offset += chunkSize;
-      readChunk(wordlistFile,offset, remainder); 
-    };
-
-    reader.readAsText(blob);
+        hashEntries.splice(i, 1);
+        i--;
+      }
+    }
   }
\ No newline at end of file