diff --git a/apps/client/package.json b/apps/client/package.json
index 0dada23..707449d 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -8,6 +8,6 @@
     "build": "esbuild src/index.ts --bundle --platform=node --outfile=../../server/client_packages/index.js --format=esm"
   },
   "dependencies": {
-    "rage-fw-client": "latest"
+    "@entityseven/rage-fw-client": "latest"
   }
 }
diff --git a/apps/client/src/index.ts b/apps/client/src/index.ts
index 8c65fc2..21e5ac9 100644
--- a/apps/client/src/index.ts
+++ b/apps/client/src/index.ts
@@ -1,12 +1,3 @@
-import { fw } from 'rage-fw-client'
+import { fw } from '@entityseven/rage-fw-client'
 
-fw.browser.registerBrowser(mp.browsers.new('package://cef/index.html'))
-
-fw.event.register('customClientEvent', async ([greetings]) => {
-    fw.system.log.info(greetings)
-
-    const data = await fw.player.triggerBrowser('customCefEvent', ['str'])
-    fw.system.log.info(`CEF RESPONSE: ${data}`)
-
-    return 'Hola from client!'
-})
+fw.player.browser = mp.browsers.new('https://localhost:8080')
diff --git a/apps/server/package.json b/apps/server/package.json
index 5c2b8b6..5e5c773 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -8,6 +8,6 @@
     "build": "esbuild src/index.ts --bundle --platform=node --target=node10.4 --outfile=../../server/packages/server/index.js"
   },
   "dependencies": {
-    "rage-fw-server": "latest"
+    "@entityseven/rage-fw-server": "latest"
   }
 }
diff --git a/apps/server/src/commands.ts b/apps/server/src/commands.ts
new file mode 100644
index 0000000..16929cc
--- /dev/null
+++ b/apps/server/src/commands.ts
@@ -0,0 +1,10 @@
+mp.events.addCommand('veh', async (player, fullText) => {
+    const vehicleID = mp.joaat(fullText)
+    const vehicle = mp.vehicles.new(vehicleID, player.position, {
+        numberPlate: 'admin',
+    })
+
+    setTimeout(() => {
+        player.putIntoVehicle(vehicle, 0)
+    }, 250)
+})
diff --git a/apps/server/src/index.ts b/apps/server/src/index.ts
index ef79917..e167789 100644
--- a/apps/server/src/index.ts
+++ b/apps/server/src/index.ts
@@ -1,13 +1,9 @@
-import { fw } from 'rage-fw-server'
+import { fw } from '@entityseven/rage-fw-server'
 
-fw.event.register('playerJoin', async ([player]) => {
+import './commands'
+
+fw.event.register('playerJoin', async player => {
     fw.system.log.info(`Connected: ${player.socialClub}`)
 
-    const response = await fw.player.triggerClient(
-        player,
-        'customClientEvent',
-        ['Hi from server!'],
-    )
-
-    fw.system.log.info(`Response from client: ${response}`)
+    fw.system.log.info(`Response from client: here respionse}`)
 })
diff --git a/apps/server/tsconfig.json b/apps/server/tsconfig.json
index 7f70b26..24a4ac0 100644
--- a/apps/server/tsconfig.json
+++ b/apps/server/tsconfig.json
@@ -4,7 +4,7 @@
     "resolveJsonModule": true,
     "baseUrl": "./src",
     "types": [
-      "../../node_modules/@ragempcommunity/types-server",
+      "../../node_modules/@ragempcommunity/types-server/",
       "../shared/declarations/rage-fw-shared-types/"
     ]
   }
diff --git a/package.json b/package.json
index 129698b..fb77fdf 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,6 @@
   "description": "This project is example of RAGE FW usage.",
   "scripts": {
     "server:update": "cd server && rage-win64.exe",
-
     "build:client": "cd apps/client && pnpm build",
     "build:server": "cd apps/server && pnpm build",
     "build:cef": "cd apps/cef && pnpm build",
diff --git a/tsconfig.json b/tsconfig.json
index 7d3f5fc..66ce038 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "ESNext",
-    "lib": ["ESNext", "ES2019"],
+    "lib": ["ESNext", "ES2019", "DOM"],
     "moduleResolution": "node",
     "module": "ESNext",
     "resolveJsonModule": true,