diff --git a/package.json b/package.json
index 01517e9..a325b8a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@new-objects/cli",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "main": "./src/index.js",
   "bin": {
     "nobj": "src/index.js"
diff --git a/src/askProjectName.js b/src/askProjectName.js
index ff294b7..fe5df00 100644
--- a/src/askProjectName.js
+++ b/src/askProjectName.js
@@ -2,13 +2,18 @@ import inquirer from 'inquirer';
 import { settings } from './settings.js';
 
 export async function askProjectName() {
-  const answer = await inquirer.prompt({
-    name: 'project_name',
-    type: 'input',
-    message: 'Project name: ',
-    default() {
-      return 'nobj-project';
-    },
-  });
-  settings.projectName = answer.project_name;
+  const projectName = process.argv[2];
+  if (projectName) {
+    settings.projectName = projectName;
+  } else {
+    const answer = await inquirer.prompt({
+      name: 'project_name',
+      type: 'input',
+      message: 'Project name: ',
+      default() {
+        return 'nobj-project';
+      },
+    });
+    settings.projectName = answer.project_name;
+  }
 }
diff --git a/src/projectType.js b/src/projectType.js
index 5b6eaaa..02b8056 100644
--- a/src/projectType.js
+++ b/src/projectType.js
@@ -5,11 +5,16 @@ import { templateRepos } from './templates.js';
 const projectTypes = Object.keys(templateRepos);
 
 export async function projectType() {
-  const answer = await inquirer.prompt({
-    name: 'project_type',
-    type: 'list',
-    message: 'Choose your template: ',
-    choices: projectTypes,
-  });
-  settings.projectType = answer.project_type;
+  const projectType = process.argv[3];
+  if (projectType && projectTypes.includes(projectType)) {
+    settings.projectType = projectType;
+  } else {
+    const answer = await inquirer.prompt({
+      name: 'project_type',
+      type: 'list',
+      message: 'Choose your template: ',
+      choices: projectTypes,
+    });
+    settings.projectType = answer.project_type;
+  }
 }
diff --git a/src/templates.js b/src/templates.js
index 5ca1da4..ab26daa 100644
--- a/src/templates.js
+++ b/src/templates.js
@@ -1,9 +1,10 @@
 export const templateRepos = {
-  'vanilla ': 'new-objects/template-vite-vanilla',
+  // eslint-disable-next-line
+  vanilla: 'new-objects/template-vite-vanilla',
   'vanilla-tailwindcss': 'new-objects/template-vite-vanilla-tailwind',
   'vanilla-pixi5': 'new-objects/template-vite-pixi5',
   'vanilla-phaser3': 'new-objects/template-vite-phaser3',
   'vanilla-babylonjs': 'new-objects/template-vite-babylonjs',
-  'bun (backend)': 'new-objects/template-bun',
-  'nodejs (backend)': 'new-objects/template-nodejs',
+  bun: 'new-objects/template-bun',
+  nodejs: 'new-objects/template-nodejs',
 };