diff --git a/.madrun.mjs b/.madrun.mjs
index 9eda8ec0..c200e568 100644
--- a/.madrun.mjs
+++ b/.madrun.mjs
@@ -20,6 +20,7 @@ export default {
     'build:start:dev': () => run(['build:client:dev', 'start:dev']),
     'lint:all': () => run(['lint', 'spell']),
     'lint': () => 'putout .',
+    'watch:lint': () => 'nodemon -w client -w server -w test -w common -w .webpack -x "putout -s"',
     'fresh:lint': () => run('lint', '--fresh'),
     'lint:fresh': () => run('lint', '--fresh'),
     'spell': () => 'yaspeller .',
@@ -127,7 +128,6 @@ export default {
     'watch:client': () => run('6to5:client', '--watch'),
     'watch:client:dev': () => run('6to5:client:dev', '--watch'),
     'watch:server': () => 'nodemon bin/cloudcmd.js',
-    'watch:lint': async () => `nodemon -w client -w server -w webpack.config.js -x ${await run('lint')}`,
     'watch:test': async () => [testEnv, `nodemon -w client -w server -w test -w common -x ${await cutEnv('test')}`],
     'watch:test:client': async () => `nodemon -w client -w test/client -x ${await run('test:client')}`,
     'watch:test:server': async () => `nodemon -w client -w test/client -x ${await run('test:server')}`,
diff --git a/package.json b/package.json
index 5d4ca380..33cc2cd5 100644
--- a/package.json
+++ b/package.json
@@ -45,10 +45,12 @@
     "build:start:dev": "madrun build:start:dev",
     "lint:all": "madrun lint:all",
     "lint": "madrun lint",
+    "watch:lint": "madrun watch:lint",
+    "fresh:lint": "madrun fresh:lint",
+    "lint:fresh": "madrun lint:fresh",
     "spell": "madrun spell",
     "fix:lint": "madrun fix:lint",
     "lint:stream": "madrun lint:stream",
-    "test:base": "madrun test:base",
     "test": "madrun test",
     "test:client": "madrun test:client",
     "test:server": "madrun test:server",
@@ -99,7 +101,6 @@
     "watch:client": "madrun watch:client",
     "watch:client:dev": "madrun watch:client:dev",
     "watch:server": "madrun watch:server",
-    "watch:lint": "madrun watch:lint",
     "watch:test": "madrun watch:test",
     "watch:test:client": "madrun watch:test:client",
     "watch:test:server": "madrun watch:test:server",