diff --git a/backend/nebula/version.py b/backend/nebula/version.py
index 35504ed1..52b23b00 100644
--- a/backend/nebula/version.py
+++ b/backend/nebula/version.py
@@ -1 +1 @@
-__version__ = "6.0.5"
+__version__ = "6.0.6"
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
index 33b06c9d..c5f8aa8e 100644
--- a/backend/pyproject.toml
+++ b/backend/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nebula"
-version = "6.0.5"
+version = "6.0.6"
 description = "Open source broadcast automation system"
 authors = ["Nebula Broadcast <info@nebulabroadcast.com>"]
 
diff --git a/backend/setup/settings.py b/backend/setup/settings.py
index 5ac25069..aa58494c 100644
--- a/backend/setup/settings.py
+++ b/backend/setup/settings.py
@@ -25,7 +25,7 @@
     "views": VIEWS,
     "meta_types": META_TYPES,
     "storages": [],
-    "system": {},
+    "settings": {},
     "cs": [],
 }
 
@@ -74,7 +74,7 @@ async def setup_settings(db: DatabaseConnection) -> None:
         # SetupServerModel
 
         settings = SetupServerModel(
-            system=TEMPLATE.pop("system", {}),
+            system=TEMPLATE.pop("settings", {}),
             playout_channels=TEMPLATE.pop("channels", []),
             folders=TEMPLATE.pop("folders", []),
             views=TEMPLATE.pop("views", []),
diff --git a/frontend/.eslintrc.cjs b/frontend/.eslintrc.cjs
new file mode 100644
index 00000000..69d05186
--- /dev/null
+++ b/frontend/.eslintrc.cjs
@@ -0,0 +1,27 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:react/recommended",
+        "prettier"
+    ],
+    "overrides": [
+    ],
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "plugins": [
+        "react",
+        "react-hooks",
+        "prettier",
+        "simple-import-sort"
+    ],
+    "rules": {
+      "react/react-in-jsx-scope": "off",
+      "react/prop-types": "off",
+    }
+}
diff --git a/frontend/package.json b/frontend/package.json
index a30cdc26..d42c072f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -7,6 +7,7 @@
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
+    "lint": "eslint --fix 'src/**/*.{jsx,ts,tsx}'",
     "format": "prettier --write ./src"
   },
   "dependencies": {
@@ -34,6 +35,12 @@
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
     "@vitejs/plugin-react": "^2.0.1",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-react": "^7.34.1",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-simple-import-sort": "^12.0.0",
     "prettier": "^2.7.1",
     "vite": "^5.1.5"
   }
diff --git a/frontend/src/components/Button.jsx b/frontend/src/components/Button.jsx
index 0d009e49..75b01a22 100644
--- a/frontend/src/components/Button.jsx
+++ b/frontend/src/components/Button.jsx
@@ -89,6 +89,7 @@ const Button = forwardRef(
   }
 )
 
+Button.displayName = 'Button'
 Button.defaultProps = {
   iconOnRight: false,
   //component: 'button',
diff --git a/frontend/src/components/Dropdown.jsx b/frontend/src/components/Dropdown.jsx
index 86910761..bc887b97 100644
--- a/frontend/src/components/Dropdown.jsx
+++ b/frontend/src/components/Dropdown.jsx
@@ -64,14 +64,13 @@ const DropdownOption = ({
   currentValue,
   separator,
   disabled,
-  active,
   ...props
 }) => (
   <span>
     {separator && <hr />}
     <Button
       {...props}
-      disabled={props.disabled || currentValue === props.value}
+      disabled={disabled || currentValue === props.value}
     />
   </span>
 )
diff --git a/frontend/src/components/InputDatetime.jsx b/frontend/src/components/InputDatetime.jsx
index a7cdb491..fabedabd 100644
--- a/frontend/src/components/InputDatetime.jsx
+++ b/frontend/src/components/InputDatetime.jsx
@@ -8,12 +8,11 @@ import Dialog from './Dialog'
 import BaseInput from './BaseInput'
 import Button from './Button'
 
-//import "react-datepicker/dist/react-datepicker.css"
-
 import './datepicker.sass'
 
 const timeRegex = /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/
 const dateRegex = /^(\d{4})-(\d{2})-(\d{2})$/
+//eslint-disable-next-line
 const allowedDateCharsRegex = /^[\d-\:\ ]*$/
 
 const DateTimeWrapper = styled.div`
diff --git a/frontend/src/components/InputPassword.jsx b/frontend/src/components/InputPassword.jsx
index 756fa9a4..d56cbe6b 100644
--- a/frontend/src/components/InputPassword.jsx
+++ b/frontend/src/components/InputPassword.jsx
@@ -15,5 +15,6 @@ const InputPassword = forwardRef(
     )
   }
 )
+InputPassword.displayName = 'InputPassword'
 
 export default InputPassword
diff --git a/frontend/src/components/InputText.jsx b/frontend/src/components/InputText.jsx
index 0969c9d2..aebf6af9 100644
--- a/frontend/src/components/InputText.jsx
+++ b/frontend/src/components/InputText.jsx
@@ -13,5 +13,6 @@ const InputText = forwardRef(({ value, onChange, tooltip, ...props }, ref) => {
     />
   )
 })
+InputText.displayName = 'InputText'
 
 export default InputText
diff --git a/frontend/src/components/Video.jsx b/frontend/src/components/Video.jsx
index c0c92ae5..de4ba79c 100644
--- a/frontend/src/components/Video.jsx
+++ b/frontend/src/components/Video.jsx
@@ -68,7 +68,7 @@ const Video = ({ src, style, showMarks, marks = {}, setMarks = () => {} }) => {
   const [videoPosition, setVideoPosition] = useState(0)
   const [videoDuration, setVideoDuration] = useState(0)
   const [trackbarPosition, setTrackbarPosition] = useState(0)
-  const [maximize, setMaximize] = useState(false)
+  //const [maximize, setMaximize] = useState(false)
 
   const frameRate = 25
 
diff --git a/frontend/src/containers/Browser/Browser.jsx b/frontend/src/containers/Browser/Browser.jsx
index edb9b03b..8bb5b144 100644
--- a/frontend/src/containers/Browser/Browser.jsx
+++ b/frontend/src/containers/Browser/Browser.jsx
@@ -144,7 +144,9 @@ const BrowserTable = () => {
   }
 
   useEffect(() => {
+    // eslint-disable-next-line no-undef
     const token = PubSub.subscribe('objects_changed', handlePubSub)
+    // eslint-disable-next-line no-undef
     return () => PubSub.unsubscribe(token)
   }, [])
 
diff --git a/frontend/src/containers/Browser/Formatting.jsx b/frontend/src/containers/Browser/Formatting.jsx
index 45f10baa..3a380311 100644
--- a/frontend/src/containers/Browser/Formatting.jsx
+++ b/frontend/src/containers/Browser/Formatting.jsx
@@ -47,12 +47,59 @@ const getColumnWidth = (key) => {
 
 // Field formatters
 
+
+const getDefaultFormatter = (key) =>  {
+  const metaType = nebula.metaType(key)
+  switch (metaType.type) {
+    case 'boolean':
+      // eslint-disable-next-line
+      return (rowData, key) => <td>{rowData[key] ? '✓' : ''}</td>
+
+    case 'datetime':
+      // eslint-disable-next-line
+      return (rowData, key) => (
+        <td>
+          <Timestamp timestamp={rowData[key]} mode={metaType.mode} />{' '}
+        </td>
+      )
+
+    case 'select':
+      // eslint-disable-next-line
+      return (rowData, key) => {
+        if (!metaType.cs) return <td>{rowData[key]}</td>
+
+        const option = nebula
+          .csOptions(metaType.cs)
+          .find((opt) => opt.value === rowData[key])
+
+        return <td>{option?.title}</td>
+      }
+
+    case 'list':
+      // eslint-disable-next-line
+      return (rowData, key) => {
+        if (!metaType.cs) return <td>{rowData[key].join(', ')}</td>
+        const options = nebula
+          .csOptions(metaType.cs)
+          .filter((opt) => rowData[key].includes(opt.value))
+        return <td>{options.map((opt) => opt.title).join(', ')}</td>
+      }
+
+    default:
+      // eslint-disable-next-line
+      return (rowData, key) => <td>{rowData[key]}</td>
+  } // switch metaType
+}
+
+
 const getFormatter = (key) => {
   if (['title', 'subtitle', 'description'].includes(key))
+    // eslint-disable-next-line
     return (rowData, key) => <td>{rowData[key]}</td>
 
   switch (key) {
     case 'qc/state':
+      // eslint-disable-next-line
       return (rowData, key) => (
         <td>
           <QCState className={`qc-state-${rowData[key]}`} />
@@ -60,6 +107,7 @@ const getFormatter = (key) => {
       )
 
     case 'id_folder':
+      // eslint-disable-next-line
       return (rowData, key) => {
         const folder = nebula.settings.folders.find(
           (f) => f.id === rowData[key]
@@ -68,6 +116,7 @@ const getFormatter = (key) => {
       }
 
     case 'duration':
+      // eslint-disable-next-line
       return (rowData, key) => {
         const fps = rowData['video/fps_f'] || 25
         const duration = rowData[key] || 0
@@ -76,51 +125,19 @@ const getFormatter = (key) => {
       }
 
     case 'created_by':
+      // eslint-disable-next-line
       return (rowData, key) => {
         return <td>{nebula.getUserName(rowData[key])}</td>
       }
 
     case 'updated_by':
+      // eslint-disable-next-line
       return (rowData, key) => {
         return <td>{nebula.getUserName(rowData[key])}</td>
       }
 
     default:
-      const metaType = nebula.metaType(key)
-      switch (metaType.type) {
-        case 'boolean':
-          return (rowData, key) => <td>{rowData[key] ? '✓' : ''}</td>
-
-        case 'datetime':
-          return (rowData, key) => (
-            <td>
-              <Timestamp timestamp={rowData[key]} mode={metaType.mode} />{' '}
-            </td>
-          )
-
-        case 'select':
-          return (rowData, key) => {
-            if (!metaType.cs) return <td>{rowData[key]}</td>
-
-            const option = nebula
-              .csOptions(metaType.cs)
-              .find((opt) => opt.value === rowData[key])
-
-            return <td>{option?.title}</td>
-          }
-
-        case 'list':
-          return (rowData, key) => {
-            if (!metaType.cs) return <td>{rowData[key].join(', ')}</td>
-            const options = nebula
-              .csOptions(metaType.cs)
-              .filter((opt) => rowData[key].includes(opt.value))
-            return <td>{options.map((opt) => opt.title).join(', ')}</td>
-          }
-
-        default:
-          return (rowData, key) => <td>{rowData[key]}</td>
-      } // switch metaType
+      return getDefaultFormatter(key)
   } // end switch key
 } // end getFormatter
 
diff --git a/frontend/src/hooks.jsx b/frontend/src/hooks.jsx
index d646df7a..ba17c20e 100644
--- a/frontend/src/hooks.jsx
+++ b/frontend/src/hooks.jsx
@@ -13,6 +13,7 @@ const useConfirm = () => {
   const [message, setMessage] = useState('')
 
   const confirm = (title, message) =>
+    // eslint-disable-next-line
     new Promise((resolve, reject) => {
       setTitle(title)
       setMessage(message)
diff --git a/frontend/src/pages/JobsPage/JobsPage.jsx b/frontend/src/pages/JobsPage/JobsPage.jsx
index 35812a9c..5a04bed1 100644
--- a/frontend/src/pages/JobsPage/JobsPage.jsx
+++ b/frontend/src/pages/JobsPage/JobsPage.jsx
@@ -55,6 +55,7 @@ const JobsPage = () => {
     nebula.request('jobs', { abort: id }).then(() => loadJobs())
   }
 
+  // eslint-disable-next-line
   const formatAction = (rowData, key) => {
     if ([0, 1, 5].includes(rowData['status']))
       return (
@@ -168,7 +169,9 @@ const JobsPage = () => {
   } // handlePubSub
 
   useEffect(() => {
+    // eslint-disable-next-line no-undef
     const token = PubSub.subscribe('job_progress', handlePubSub)
+    // eslint-disable-next-line no-undef
     return () => PubSub.unsubscribe(token)
   }, [])
 
diff --git a/frontend/src/pages/ServicesPage.jsx b/frontend/src/pages/ServicesPage.jsx
index 69f5f86f..ceed34a7 100644
--- a/frontend/src/pages/ServicesPage.jsx
+++ b/frontend/src/pages/ServicesPage.jsx
@@ -77,6 +77,7 @@ const ServicesPage = () => {
     )
   }
 
+  //eslint-disable-next-line
   const formatAction = (rowData, key) => {
     const status = rowData.status
     let b = null
@@ -104,6 +105,7 @@ const ServicesPage = () => {
             label="Kill"
           />
         )
+        break
       default:
         b = <Button disabled={true} label="Please wait..." />
     }
diff --git a/frontend/src/websocket.jsx b/frontend/src/websocket.jsx
index bb4b9897..e77650a6 100644
--- a/frontend/src/websocket.jsx
+++ b/frontend/src/websocket.jsx
@@ -3,6 +3,7 @@ import { useEffect, useState } from 'react'
 import useWebSocket, { ReadyState } from 'react-use-websocket'
 import PubSub from '/src/pubsub'
 import { arrayEquals } from '/src/utils'
+import { toast } from 'react-toastify'
 
 const proto = window.location.protocol.replace('http', 'ws')
 const wsAddress = `${proto}//${window.location.host}/ws`