diff --git a/package-lock.json b/package-lock.json
index 1179e9a..7168ef1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,17 +1,17 @@
 {
   "name": "highlightjs-solidity",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "highlightjs-solidity",
-      "version": "2.0.6",
+      "version": "2.1.0",
       "license": "MIT",
       "devDependencies": {
         "eslint": "^8.57.0",
         "eslint-config-standard": "^17.1.0",
-        "highlight.js": "^11.9.0",
+        "highlight.js": "^10.7.3",
         "highlightjs": "^9.16.2",
         "mocha": "^10.3.0",
         "parse5": "^7.1.2"
@@ -1864,12 +1864,12 @@
       }
     },
     "node_modules/highlight.js": {
-      "version": "11.9.0",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz",
-      "integrity": "sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==",
+      "version": "10.7.3",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
+      "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
       "dev": true,
       "engines": {
-        "node": ">=12.0.0"
+        "node": "*"
       }
     },
     "node_modules/highlightjs": {
diff --git a/package.json b/package.json
index 0de3ff6..82f4020 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/pospi/highlightjs-solidity.git"
+    "url": "git+ssh://git@github.com/highlightjs/highlightjs-solidity.git"
   },
   "keywords": [
     "Solidity",
@@ -30,7 +30,7 @@
   "devDependencies": {
     "eslint": "^8.57.0",
     "eslint-config-standard": "^17.1.0",
-    "highlight.js": "^11.9.0",
+    "highlight.js": "^10.7.3",
     "highlightjs": "^9.16.2",
     "mocha": "^10.3.0",
     "parse5": "^7.1.2"
diff --git a/src/common.js b/src/common.js
index e7d651f..6c17173 100644
--- a/src/common.js
+++ b/src/common.js
@@ -63,9 +63,9 @@ var SOL_ASSEMBLY_KEYWORDS = {
         'pc pop ' +
         'dup1 dup2 dup3 dup4 dup5 dup6 dup7 dup8 dup9 dup10 dup11 dup12 dup13 dup14 dup15 dup16 ' +
         'swap1 swap2 swap3 swap4 swap5 swap6 swap7 swap8 swap9 swap10 swap11 swap12 swap13 swap14 swap15 swap16 ' +
-        'mload mstore mstore8 sload sstore msize tload tstore ' +
+        'mload mstore mstore8 sload sstore msize tload tstore mcopy ' +
         'gas address balance selfbalance caller callvalue ' +
-        'calldataload calldatasize calldatacopy codesize codecopy extcodesize extcodecopy returndatasize returndatacopy extcodehash mcopy ' +
+        'calldataload calldatasize calldatacopy codesize codecopy extcodesize extcodecopy returndatasize returndatacopy extcodehash ' +
         'create create2 call callcode delegatecall staticcall ' +
         'log0 log1 log2 log3 log4 ' +
         'chainid origin gasprice basefee blobbasefee blockhash blobhash coinbase timestamp number difficulty prevrandao gaslimit ',
diff --git a/src/index.js b/src/index.js
index f3fd7f6..cd0469c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,3 +1,13 @@
+/*
+Language: Solidity
+Requires: solidity.js, yul.js
+Author: SEE AUTHOR
+Contributors: SEE CONTRIBUTORS
+Description: A statically-typed curly-braces programming language designed for developing smart contracts that run on Ethereum.
+Website: https://docs.soliditylang.org/en/latest/grammar.html
+*/
+
+
 /**
  * highlight.js Solidity syntax highlighting definition
  *
@@ -8,8 +18,8 @@
  * @since:   2016-07-01
  */
 
-const solidityGrammar = require("./languages/solidity.js");
-const yulGrammar = require("./languages/yul.js");
+const solidityGrammar = require("./languages/solidity");
+const yulGrammar = require("./languages/yul");
 
 module.exports = function(hljs) {
     hljs.registerLanguage('solidity', solidityGrammar);
diff --git a/src/languages/yul.js b/src/languages/yul.js
index cd00423..5b7999a 100644
--- a/src/languages/yul.js
+++ b/src/languages/yul.js
@@ -12,7 +12,7 @@ const {
     SOL_ASSEMBLY_KEYWORDS,
     baseAssembly,
     isNegativeLookbehindAvailable
-} = require("../common.js");
+} = require("../common");
 
 function hljsDefineYul(hljs) {