diff --git a/.eslintrc.json b/.eslintrc.json
index 63490e22..44fc0b50 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -19,10 +19,12 @@
     "react"
   ],
   "rules": {
-    "@typescript-eslint/no-unused-vars": "off",
+    "@typescript-eslint/no-unused-vars": ["warn", {
+      "varsIgnorePattern": "^_",
+      "args": "none"
+    }],
     "@typescript-eslint/no-explicit-any": "off",
-    "react/prop-types": "off",
-    "@next/next/no-img-element": "off"
+    "react/prop-types": "off"
   },
   "settings": {
     "react": {
diff --git a/src/common/data/stores/accounts/indentityStore.ts b/src/common/data/stores/accounts/indentityStore.ts
index 1fe6c1f4..4ed5e001 100644
--- a/src/common/data/stores/accounts/indentityStore.ts
+++ b/src/common/data/stores/accounts/indentityStore.ts
@@ -1,4 +1,4 @@
-import { isArray, find, map, isUndefined, isNull } from 'lodash';
+import { isArray, find, isUndefined, isNull } from 'lodash';
 import { Wallet } from '@privy-io/react-auth';
 import { secp256k1 } from '@noble/curves/secp256k1';
 import { xchacha20poly1305 } from '@noble/ciphers/chacha';
diff --git a/src/common/data/stores/accounts/privyStore.ts b/src/common/data/stores/accounts/privyStore.ts
index 18e241c3..e2d9d140 100644
--- a/src/common/data/stores/accounts/privyStore.ts
+++ b/src/common/data/stores/accounts/privyStore.ts
@@ -1,4 +1,4 @@
-import { ConnectedWallet, PrivyInterface, User as PrivyUser, usePrivy, useWallets } from '@privy-io/react-auth';
+import { ConnectedWallet, User as PrivyUser, usePrivy, useWallets } from '@privy-io/react-auth';
 import type { AccountStore } from '.';
 import { StoreSet } from '..';
 import { find, isUndefined } from 'lodash';
diff --git a/src/common/data/stores/accounts/providerStore.ts b/src/common/data/stores/accounts/providerStore.ts
index 1e32c74e..6fa4068b 100644
--- a/src/common/data/stores/accounts/providerStore.ts
+++ b/src/common/data/stores/accounts/providerStore.ts
@@ -1,5 +1,4 @@
-
-interface Provider {
+export interface Provider {
   methods: {
     [key: string]: (unknown) => Promise<unknown>;
   };
diff --git a/src/common/fidgets/FidgetWrapper.tsx b/src/common/fidgets/FidgetWrapper.tsx
index 1952d03f..245b7a24 100644
--- a/src/common/fidgets/FidgetWrapper.tsx
+++ b/src/common/fidgets/FidgetWrapper.tsx
@@ -14,7 +14,7 @@ export type FidgetWrapperProps = {
 };
 
 export function FidgetWrapper({ fidget, config, saveConfig }: FidgetWrapperProps) {
-  const [saving, setSaving] = useState(false);
+  const [_saving, setSaving] = useState(false);
   const [editing, setEditing] = useState(false);
   const [viewEditor, setViewEditor] = useState(false);
   const [localConfig, setLocalConfig] = useState<FidgetConfig<FidgetSettings>>({
diff --git a/src/common/fidgets/index.d.ts b/src/common/fidgets/index.d.ts
index b4d7123a..f56e9ddd 100644
--- a/src/common/fidgets/index.d.ts
+++ b/src/common/fidgets/index.d.ts
@@ -50,7 +50,7 @@ interface LayoutFigetProps {
   isEditable: boolean;
 }
 
-const LayoutFidgetDefaultProps = {
+type LayoutFidgetDefaultProps = {
   fidgets: object,
   layoutConfig: object,
   isEditable: false,
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index db6ad3c5..7ff584b6 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,10 +1,10 @@
-import React, { useEffect } from "react";
-import { useRouter } from "next/router";
-import { createClient } from "@/common/data/database/supabase/clients/component";
+import React from "react";
+// import { useRouter } from "next/router";
+// import { createClient } from "@/common/data/database/supabase/clients/component";
 
 const Index = () => {
-  const router = useRouter();
-  const supabaseClient = createClient();
+  // const router = useRouter();
+  // const supabaseClient = createClient();
 
   // useEffect(() => {
   //   supabaseClient.auth.getSession().then(({ data: { session } }) => {
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index c8ea8cc7..7d2902d3 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -3,6 +3,7 @@ import { Button } from "@/common/ui/atoms/button";
 import Spinner from "@/common/ui/atoms/spinner";
 import { useLogin, usePrivy } from "@privy-io/react-auth";
 import { isUndefined } from "lodash";
+import Image from "next/image";
 import { useRouter } from "next/router";
 import React, { useState } from "react";
 
@@ -106,7 +107,7 @@ export default function Login() {
                   <div className="mx-auto mt-20 flex max-w-2xl lg:mr-10 lg:ml-0 lg:mt-12 lg:max-w-none lg:flex-none xl:mr-32">
                     <div className="mx-auto max-w-3xl flex-none sm:max-w-5xl lg:max-w-none">
                       <div className="-m-2 rounded-xl bg-gray-900/5 p-2 ring-1 ring-inset ring-gray-900/10 lg:-m-4 lg:rounded-2xl lg:p-4">
-                        <img
+                        <Image
                           src="/images/app-screenshot.png"
                           alt="App screenshot"
                           width={2432}
diff --git a/src/pages/setup/index.tsx b/src/pages/setup/index.tsx
index bc369c90..c7555010 100644
--- a/src/pages/setup/index.tsx
+++ b/src/pages/setup/index.tsx
@@ -34,7 +34,7 @@ export default function Setup() {
     currentSpaceIdentityPublicKey: state.currentSpaceIdentityPublicKey,
   }));
   const [currentStep, setCurrentStep] = useState(SETUP_STATES.wallet);
-  const [selectedIdentity, setSelectedIdentity] = useState("");
+  // const [selectedIdentity, setSelectedIdentity] = useState("");
  
   // Redirect if not logged in with Privy
   useEffect(() => {