diff --git a/.semgrepignore b/.semgrepignore
index 7f5d2839b..dc078c0c5 100644
--- a/.semgrepignore
+++ b/.semgrepignore
@@ -1 +1,2 @@
-.devcontainer/docker-compose.yml
\ No newline at end of file
+.devcontainer/docker-compose.yml
+frontend/
\ No newline at end of file
diff --git a/README.md b/README.md
index e2b334d73..70919118b 100644
--- a/README.md
+++ b/README.md
@@ -136,8 +136,11 @@ Since Raven is a Frappe app, it can be installed via [frappe-bench](https://frap
 Once you have [setup your bench](https://frappeframework.com/docs/v14/user/en/installation) and your [site](https://frappeframework.com/docs/v14/user/en/tutorial/install-and-setup-bench), you can install the app via the following commands:
 
 ```bash
-bench get-app https://github.com/The-Commit-Company/Raven.git
-bench --site yoursite.name install-app raven
+bench get-app https://github.com/The-Commit-Company/raven.git
+```
+
+```bash
+bench --site <yoursite.name> install-app raven
 ```
 
 Post this, you can access Raven on your Frappe site at the `/raven` endpoint (e.g. https://yoursite.com/raven). 
diff --git a/frontend/package.json b/frontend/package.json
index df464669b..f8d407adc 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -2,7 +2,7 @@
   "name": "raven-ui",
   "private": true,
   "license": "AGPL-3.0-only",
-  "version": "1.7.1",
+  "version": "2.0.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -47,6 +47,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-dropzone": "^14.2.3",
+    "react-error-boundary": "^4.0.13",
     "react-hook-form": "^7.52.2",
     "react-icons": "^5.3.0",
     "react-idle-timer": "^5.7.2",
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index fd37bb9bc..a78a28945 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -9,7 +9,15 @@ import { ThemeProvider } from './ThemeProvider'
 import { Toaster } from 'sonner'
 import { useStickyState } from './hooks/useStickyState'
 import MobileTabsPage from './pages/MobileTabsPage'
-import { UserProfile } from './components/feature/userSettings/UserProfile/UserProfile'
+import Cookies from 'js-cookie'
+
+/** Following keys will not be cached in app cache */
+const NO_CACHE_KEYS = [
+  "frappe.desk.form.load.getdoctype",
+  "frappe.desk.search.search_link",
+  "frappe.model.workflow.get_transitions",
+  "frappe.desk.reportview.get_count"
+]
 
 
 const router = createBrowserRouter(
@@ -28,11 +36,36 @@ const router = createBrowserRouter(
             </Route>
             <Route path="saved-messages" lazy={() => import('./components/feature/saved-messages/SavedMessages')} />
             <Route path="settings" lazy={() => import('./pages/settings/Settings')}>
-              <Route index element={<UserProfile />} />
-              <Route path="profile" element={<UserProfile />} />
+              <Route index lazy={() => import('./components/feature/userSettings/UserProfile/UserProfile')} />
+              <Route path="profile" lazy={() => import('./components/feature/userSettings/UserProfile/UserProfile')} />
               <Route path="users" lazy={() => import('./components/feature/userSettings/Users/AddUsers')} />
-              <Route path="frappe-hr" lazy={() => import('./pages/settings/Integrations/FrappeHR')} />
-              {/* <Route path="bots" lazy={() => import('./components/feature/userSettings/Bots')} /> */}
+              <Route path="hr" lazy={() => import('./pages/settings/Integrations/FrappeHR')} />
+              <Route path="bots" >
+                <Route index lazy={() => import('./pages/settings/AI/BotList')} />
+                <Route path="create" lazy={() => import('./pages/settings/AI/CreateBot')} />
+                <Route path=":ID" lazy={() => import('./pages/settings/AI/ViewBot')} />
+              </Route>
+
+              <Route path="functions">
+                <Route index lazy={() => import('./pages/settings/AI/FunctionList')} />
+                <Route path="create" lazy={() => import('./pages/settings/AI/CreateFunction')} />
+                <Route path=":ID" lazy={() => import('./pages/settings/AI/ViewFunction')} />
+              </Route>
+
+
+              <Route path="instructions">
+                <Route index lazy={() => import('./pages/settings/AI/InstructionTemplateList')} />
+                <Route path="create" lazy={() => import('./pages/settings/AI/CreateInstructionTemplate')} />
+                <Route path=":ID" lazy={() => import('./pages/settings/AI/ViewInstructionTemplate')} />
+              </Route>
+
+              <Route path="commands">
+                <Route index lazy={() => import('./pages/settings/AI/SavedPromptsList')} />
+                <Route path="create" lazy={() => import('./pages/settings/AI/CreateSavedPrompt')} />
+                <Route path=":ID" lazy={() => import('./pages/settings/AI/ViewSavedPrompt')} />
+              </Route>
+
+              <Route path="openai-settings" lazy={() => import('./pages/settings/AI/OpenAISettings')} />
             </Route>
             <Route path=":channelID" lazy={() => import('@/pages/ChatSpace')}>
               <Route path="thread/:threadID" lazy={() => import('./components/feature/threads/ThreadDrawer/ThreadDrawer')} />
@@ -102,12 +135,52 @@ function App() {
 
 function localStorageProvider() {
   // When initializing, we restore the data from `localStorage` into a map.
-  const map = new Map<string, any>(JSON.parse(localStorage.getItem('app-cache') || '[]'))
+  // Check if local storage is recent (less than a week). Else start with a fresh cache.
+  const timestamp = localStorage.getItem('app-cache-timestamp')
+  let cache = '[]'
+  if (timestamp && Date.now() - parseInt(timestamp) < 7 * 24 * 60 * 60 * 1000) {
+    const localCache = localStorage.getItem('app-cache')
+    if (localCache) {
+      cache = localCache
+    }
+  }
+  const map = new Map<string, any>(JSON.parse(cache))
 
   // Before unloading the app, we write back all the data into `localStorage`.
   window.addEventListener('beforeunload', () => {
-    const appCache = JSON.stringify(Array.from(map.entries()))
-    localStorage.setItem('app-cache', appCache)
+
+
+    // Check if the user is logged in
+    const user_id = Cookies.get('user_id')
+    if (!user_id || user_id === 'Guest') {
+      localStorage.removeItem('app-cache')
+      localStorage.removeItem('app-cache-timestamp')
+    } else {
+      const entries = map.entries()
+
+      const cacheEntries = []
+
+      for (const [key, value] of entries) {
+
+        let hasCacheKey = false
+        for (const cacheKey of NO_CACHE_KEYS) {
+          if (key.includes(cacheKey)) {
+            hasCacheKey = true
+            break
+          }
+        }
+
+        //Do not cache doctype meta and search link
+        if (hasCacheKey) {
+          continue
+        }
+        cacheEntries.push([key, value])
+      }
+      const appCache = JSON.stringify(cacheEntries)
+      localStorage.setItem('app-cache', appCache)
+      localStorage.setItem('app-cache-timestamp', Date.now().toString())
+    }
+
   })
 
   // We still use the map for write & read for performance.
diff --git a/frontend/src/components/common/Form.tsx b/frontend/src/components/common/Form.tsx
index 37f56ef3a..466c2dae3 100644
--- a/frontend/src/components/common/Form.tsx
+++ b/frontend/src/components/common/Form.tsx
@@ -18,12 +18,12 @@ export const Label = ({ children, isRequired, ...props }: LabelProps) => {
 
 export const HelperText = (props: TextProps) => {
     return (
-        <Text as='span' size='1' color='gray' {...props} />
+        <Text as='span' size='2' color='gray' {...props} />
     )
 }
 
 export const ErrorText = (props: TextProps) => {
     return (
-        <Text as='p' size='1' color='red' {...props} />
+        <Text as='p' size='2' color='red' {...props} />
     )
 }
\ No newline at end of file
diff --git a/frontend/src/components/common/LinkField/LinkField.tsx b/frontend/src/components/common/LinkField/LinkField.tsx
index 34d3837ee..480fafdab 100644
--- a/frontend/src/components/common/LinkField/LinkField.tsx
+++ b/frontend/src/components/common/LinkField/LinkField.tsx
@@ -24,7 +24,7 @@ export interface LinkFieldProps {
 
 const LinkField = ({ doctype, filters, label, placeholder, value, required, setValue, disabled, autofocus, dropdownClass }: LinkFieldProps) => {
 
-    const [searchText, setSearchText] = useState('')
+    const [searchText, setSearchText] = useState(value ?? '')
 
     const isDesktop = useIsDesktop()
 
@@ -49,14 +49,15 @@ const LinkField = ({ doctype, filters, label, placeholder, value, required, setV
         itemToString(item) {
             return item ? item.value : ''
         },
-        selectedItem: items.find(item => item.value === value),
         onSelectedItemChange({ selectedItem }) {
+
             setValue(selectedItem?.value ?? '')
         },
+        defaultInputValue: value,
+        defaultIsOpen: isDesktop && autofocus,
+        defaultSelectedItem: items.find(item => item.value === value),
     })
 
-    console.log(isOpen)
-
     return <div className="w-full">
         <div className="flex flex-col">
             <Label className="w-fit" isRequired={required} {...getLabelProps()}>
diff --git a/frontend/src/components/common/LinkField/LinkFormField.tsx b/frontend/src/components/common/LinkField/LinkFormField.tsx
index 3d1fc386c..c1d50460d 100644
--- a/frontend/src/components/common/LinkField/LinkFormField.tsx
+++ b/frontend/src/components/common/LinkField/LinkFormField.tsx
@@ -3,7 +3,7 @@ import LinkField, { LinkFieldProps } from './LinkField'
 
 interface LinkFormFieldProps extends Omit<LinkFieldProps, 'value' | 'setValue'> {
     name: string,
-    rules: ControllerProps['rules'],
+    rules?: ControllerProps['rules'],
     disabled?: boolean
 }
 
diff --git a/frontend/src/components/feature/CommandMenu/CommandMenu.tsx b/frontend/src/components/feature/CommandMenu/CommandMenu.tsx
index e4b1a42e9..cb505be87 100644
--- a/frontend/src/components/feature/CommandMenu/CommandMenu.tsx
+++ b/frontend/src/components/feature/CommandMenu/CommandMenu.tsx
@@ -1,5 +1,5 @@
 import { DIALOG_CONTENT_CLASS } from '@/utils/layout/dialog'
-import { Dialog } from '@radix-ui/themes'
+import { Dialog, VisuallyHidden } from '@radix-ui/themes'
 import { Command } from 'cmdk'
 import { useEffect } from 'react'
 import './commandMenu.styles.css'
@@ -11,6 +11,7 @@ import ArchivedChannelList from './ArchivedChannelList'
 import { atom, useAtom } from 'jotai'
 import { useIsDesktop } from '@/hooks/useMediaQuery'
 import { Drawer, DrawerContent } from '@/components/layout/Drawer'
+import SettingsList from './SettingsList'
 
 export const commandMenuOpenAtom = atom(false)
 
@@ -21,7 +22,7 @@ const CommandMenu = () => {
     useEffect(() => {
 
         const down = (e: KeyboardEvent) => {
-            if (e.key === 'k' && (e.metaKey || e.ctrlKey)) {
+            if (e.key === 'k' && (e.metaKey || e.ctrlKey) && !e.shiftKey) {
                 e.preventDefault()
                 setOpen((open) => !open)
             }
@@ -37,6 +38,12 @@ const CommandMenu = () => {
         return (
             <Dialog.Root open={open} onOpenChange={setOpen}>
                 <Dialog.Content className={clsx(DIALOG_CONTENT_CLASS, 'p-4 rounded-md')}>
+                    <VisuallyHidden>
+                        <Dialog.Title>Command Menu</Dialog.Title>
+                        <Dialog.Description>
+                            Search or type a command
+                        </Dialog.Description>
+                    </VisuallyHidden>
                     <CommandList />
                 </Dialog.Content>
             </Dialog.Root>
@@ -69,6 +76,7 @@ export const CommandList = () => {
             <Command.Empty>No results found.</Command.Empty>
             <ChannelList />
             <UserList />
+            <SettingsList />
 
             {/* TODO: Make these commands work */}
             {/* <Command.Group heading="Commands">
diff --git a/frontend/src/components/feature/CommandMenu/SettingsList.tsx b/frontend/src/components/feature/CommandMenu/SettingsList.tsx
new file mode 100644
index 000000000..2aecfc335
--- /dev/null
+++ b/frontend/src/components/feature/CommandMenu/SettingsList.tsx
@@ -0,0 +1,77 @@
+import { Command } from 'cmdk'
+import { useSetAtom } from 'jotai'
+import { BiBot, BiFile, BiGroup, BiMessageSquareDots, BiUserCircle } from 'react-icons/bi'
+import { useNavigate } from 'react-router-dom'
+import { commandMenuOpenAtom } from './CommandMenu'
+import { PiOpenAiLogo } from 'react-icons/pi'
+import { LuFunctionSquare } from 'react-icons/lu'
+
+type Props = {}
+
+const ICON_SIZE = 16
+
+const SettingsList = (props: Props) => {
+
+    const navigate = useNavigate()
+
+    const setOpen = useSetAtom(commandMenuOpenAtom)
+
+    const onSelect = (value: string) => {
+        navigate(`/channel/settings/${value}`)
+        setOpen(false)
+    }
+    return (
+        <Command.Group heading='Settings'>
+            <Command.Item value='profile' onSelect={onSelect}>
+                <BiUserCircle size={ICON_SIZE} />
+                Profile
+            </Command.Item>
+            <Command.Item value='users' onSelect={onSelect}>
+                <BiGroup size={ICON_SIZE} />
+                Users
+            </Command.Item>
+            <Command.Item value='hr' onSelect={onSelect}>
+                <svg fill="none" viewBox="0 0 32 32" width={18} height={18} xmlns="http://www.w3.org/2000/svg">
+                    <g clipPath="url(#clip0_2850_17380)">
+                        <path d="M25.5561 0H6.44394C2.88505 0 0 2.88505 0 6.44394V25.5561C0 29.115 2.88505 32 6.44394 32H25.5561C29.115 32 32 29.115 32 25.5561V6.44394C32 2.88505 29.115 0 25.5561 0Z" fill="#A1EEC9"></path>
+                        <path d="M15.4061 18.5995C12.4184 18.5995 9.97265 16.1684 9.97265 13.1661V12.6974L12.8724 12.7267L12.8431 13.1661C12.8431 14.572 13.9855 15.729 15.4061 15.729H16.5777C17.9836 15.729 19.1406 14.5867 19.1406 13.1661V11.9944C19.1406 10.5885 17.9983 9.43151 16.5777 9.43151H9.94336L9.97265 6.53174L16.5777 6.56103C19.5653 6.56103 22.0111 8.99215 22.0111 11.9944V13.1661C22.0111 16.1537 19.58 18.5995 16.5777 18.5995H15.4061Z" fill="#0B313A"></path>
+                        <path d="M8.78613 23.2714C10.7779 21.5286 13.3408 20.5474 16.0063 20.5474C18.6717 20.5474 21.2346 21.5286 23.2264 23.3153L21.2932 25.4389C19.8287 24.1355 17.9541 23.4178 16.0063 23.4178C14.0584 23.4178 12.1692 24.1355 10.7047 25.4535L8.80078 23.2714H8.78613Z" fill="#0B313A"></path>
+                    </g>
+                    <defs>
+                        <clipPath id="clip0_2850_17380">
+                            <rect fill="white" height="32" width="32"></rect>
+                        </clipPath>
+                    </defs>
+                </svg>
+                HR
+            </Command.Item>
+
+            <Command.Item value='bots' onSelect={onSelect}>
+                <BiBot size={ICON_SIZE} />
+                Bots
+            </Command.Item>
+
+            <Command.Item value='functions' onSelect={onSelect}>
+                <LuFunctionSquare size={ICON_SIZE} />
+                Functions
+            </Command.Item>
+
+            <Command.Item value='instructions' onSelect={onSelect}>
+                <BiFile size={ICON_SIZE} />
+                Instructions
+            </Command.Item>
+
+            <Command.Item value='commands' onSelect={onSelect}>
+                <BiMessageSquareDots size={ICON_SIZE} />
+                Commands
+            </Command.Item>
+
+            <Command.Item value='openai-settings' onSelect={onSelect}>
+                <PiOpenAiLogo size={ICON_SIZE} />
+                OpenAI Settings
+            </Command.Item>
+        </Command.Group>
+    )
+}
+
+export default SettingsList
\ No newline at end of file
diff --git a/frontend/src/components/feature/ai/AIEvent.tsx b/frontend/src/components/feature/ai/AIEvent.tsx
new file mode 100644
index 000000000..84d112f75
--- /dev/null
+++ b/frontend/src/components/feature/ai/AIEvent.tsx
@@ -0,0 +1,49 @@
+import { Loader } from '@/components/common/Loader'
+import { Text } from '@radix-ui/themes'
+import clsx from 'clsx'
+import { useFrappeEventListener } from 'frappe-react-sdk'
+import { useEffect, useState } from 'react'
+
+type Props = {
+    channelID: string
+}
+
+const AIEvent = ({ channelID }: Props) => {
+    const [aiEvent, setAIEvent] = useState("")
+    const [showAIEvent, setShowAIEvent] = useState(false)
+
+    useFrappeEventListener("ai_event", (data) => {
+        if (data.channel_id === channelID) {
+            setAIEvent(data.text)
+            setShowAIEvent(true)
+        }
+    })
+
+    useFrappeEventListener("ai_event_clear", (data) => {
+        if (data.channel_id === channelID) {
+            setAIEvent("")
+        }
+    })
+
+    useEffect(() => {
+        if (!aiEvent) {
+            setTimeout(() => {
+                setShowAIEvent(false)
+            }, 300)
+        }
+    }, [aiEvent])
+
+    return (
+        <div className={clsx(
+            'w-full transition-all duration-300 ease-ease-out-quart',
+            showAIEvent ? 'translate-y-0 opacity-100 z-50' : 'translate-y-full opacity-0 h-0'
+        )}>
+            <div className="flex items-center gap-2 py-2 px-2 bg-white dark:bg-gray-2">
+                <Loader />
+                <Text size='2'>{aiEvent}</Text>
+            </div>
+        </div>
+    )
+}
+
+export default AIEvent
\ No newline at end of file
diff --git a/frontend/src/components/feature/channel-details/edit-channel-description/EditChannelDescriptionModal.tsx b/frontend/src/components/feature/channel-details/edit-channel-description/EditChannelDescriptionModal.tsx
index d64ddd9b0..d5ed2e5ad 100644
--- a/frontend/src/components/feature/channel-details/edit-channel-description/EditChannelDescriptionModal.tsx
+++ b/frontend/src/components/feature/channel-details/edit-channel-description/EditChannelDescriptionModal.tsx
@@ -6,6 +6,7 @@ import { Box, Dialog, Flex, Button, TextArea, Text } from "@radix-ui/themes"
 import { Loader } from "@/components/common/Loader"
 import { ErrorText, Label } from "@/components/common/Form"
 import { toast } from 'sonner'
+import { __ } from "@/utils/translations"
 
 interface RenameChannelForm {
     channel_description: string
@@ -30,7 +31,7 @@ export const EditChannelDescriptionModalContent = ({ channelData, onClose }: Ren
         updateDoc("Raven Channel", channelData?.name ?? null, {
             channel_description: data.channel_description
         }).then(() => {
-            toast.success("Channel description updated")
+            toast.success(__("Channel description updated"))
             onClose()
         })
     }
@@ -39,36 +40,36 @@ export const EditChannelDescriptionModalContent = ({ channelData, onClose }: Ren
         <FormProvider {...methods}>
             <form onSubmit={handleSubmit(onSubmit)}>
 
-                <Dialog.Title>{channelData && channelData?.channel_description && channelData?.channel_description.length > 0 ? 'Edit description' : 'Add description'}</Dialog.Title>
+                <Dialog.Title>{channelData && channelData?.channel_description && channelData?.channel_description.length > 0 ? __('Edit description') : __('Add description')}</Dialog.Title>
 
                 <Flex gap='2' direction='column' width='100%'>
                     <ErrorBanner error={error} />
                     <Box width='100%'>
-                        <Label htmlFor='channel_description'>Channel description</Label>
+                        <Label htmlFor='channel_description'>{__("Channel description")}</Label>
                         <TextArea
                             maxLength={140}
                             id='channel_description'
-                            placeholder='Add description'
+                            placeholder={__('Add description')}
                             {...register('channel_description', {
                                 maxLength: {
                                     value: 140,
-                                    message: "Channel description cannot be more than 200 characters."
+                                    message: __("Channel description cannot be more than 200 characters.")
                                 }
                             })}
                             aria-invalid={errors.channel_description ? 'true' : 'false'}
                         />
-                        <Text size='1' weight='light'>This is how people will know what this channel is about.</Text>
+                        <Text size='1' weight='light'>{__("This is how people will know what this channel is about.")}</Text>
                         {errors?.channel_description && <ErrorText>{errors.channel_description?.message}</ErrorText>}
                     </Box>
                 </Flex>
 
                 <Flex gap="3" mt="6" justify="end" align='center'>
                     <Dialog.Close disabled={updatingDoc}>
-                        <Button variant="soft" color="gray">Cancel</Button>
+                        <Button variant="soft" color="gray">{__("Cancel")}</Button>
                     </Dialog.Close>
                     <Button type='submit' disabled={updatingDoc}>
                         {updatingDoc && <Loader />}
-                        {updatingDoc ? "Saving" : "Save"}
+                        {updatingDoc ? __("Saving") : __("Save")}
                     </Button>
                 </Flex>
 
diff --git a/frontend/src/components/feature/channels/ChannelList.tsx b/frontend/src/components/feature/channels/ChannelList.tsx
index 633fee032..5b7007997 100644
--- a/frontend/src/components/feature/channels/ChannelList.tsx
+++ b/frontend/src/components/feature/channels/ChannelList.tsx
@@ -12,6 +12,7 @@ import { RiPushpinLine, RiUnpinLine } from "react-icons/ri"
 import { FrappeConfig, FrappeContext } from "frappe-react-sdk"
 import { RavenUser } from "@/types/Raven/RavenUser"
 import clsx from "clsx"
+import { __ } from "@/utils/translations"
 
 export const ChannelList = ({ unread_count }: { unread_count?: UnreadCountData }) => {
 
@@ -64,7 +65,7 @@ export const ChannelList = ({ unread_count }: { unread_count?: UnreadCountData }
             <SidebarGroupItem className={'gap-1 pl-1'}>
                 <Flex width='100%' justify='between' align='center' gap='2' pr='2' className="group">
                     <Flex align='center' gap='2' width='100%' onClick={toggle} className="cursor-default select-none">
-                        <SidebarGroupLabel>Channels</SidebarGroupLabel>
+                        <SidebarGroupLabel>{__("Channels")}</SidebarGroupLabel>
                         <Box className={clsx('transition-opacity ease-in-out duration-200',
                             !showData && unread_count && totalUnreadCount > 0 ? 'opacity-100' : 'opacity-0')}>
                             <SidebarBadge>
@@ -177,7 +178,7 @@ const PinButton = ({ channelID }: { channelID: string }) => {
             className='flex justify-start gap-2 min-w-24'
         >
             <RiUnpinLine size='18' />
-            Remove Pin
+            {__("Remove Pin")}
         </ContextMenu.Item>
     }
     return <ContextMenu.Item
@@ -185,7 +186,7 @@ const PinButton = ({ channelID }: { channelID: string }) => {
         className='flex justify-start gap-2 min-w-24'
     >
         <RiPushpinLine size='18' />
-        Pin
+        {__("Pin")}
     </ContextMenu.Item>
 
 }
\ No newline at end of file
diff --git a/frontend/src/components/feature/channels/CreateChannelModal.tsx b/frontend/src/components/feature/channels/CreateChannelModal.tsx
index 30734905a..981bc7ca8 100644
--- a/frontend/src/components/feature/channels/CreateChannelModal.tsx
+++ b/frontend/src/components/feature/channels/CreateChannelModal.tsx
@@ -12,6 +12,7 @@ import { toast } from 'sonner'
 import { FiPlus } from 'react-icons/fi'
 import { useIsDesktop } from '@/hooks/useMediaQuery'
 import { Drawer, DrawerContent, DrawerTrigger } from '@/components/layout/Drawer'
+import { __ } from '@/utils/translations'
 
 interface ChannelCreationForm {
     channel_name: string,
@@ -102,7 +103,7 @@ const CreateChannelContent = ({ updateChannelList, isOpen, setIsOpen }: { update
     const onSubmit = (data: ChannelCreationForm) => {
         createDoc('Raven Channel', data).then(result => {
             if (result) {
-                toast.success('Channel created')
+                toast.success(__("Channel created"))
                 onClose(result.name)
             }
         })
@@ -117,20 +118,20 @@ const CreateChannelContent = ({ updateChannelList, isOpen, setIsOpen }: { update
             case 'Private':
                 return {
                     channelIcon: <BiLockAlt />,
-                    header: 'Create a private channel',
-                    helperText: 'When a channel is set to private, it can only be viewed or joined by invitation.'
+                    header: __("Create a private channel"),
+                    helperText: __('When a channel is set to private, it can only be viewed or joined by invitation.')
                 }
             case 'Open':
                 return {
                     channelIcon: <BiGlobe />,
-                    header: 'Create an open channel',
-                    helperText: 'When a channel is set to open, everyone is a member.'
+                    header: __("Create an open channel"),
+                    helperText: __('When a channel is set to open, everyone is a member.')
                 }
             default:
                 return {
                     channelIcon: <BiHash />,
-                    header: 'Create a public channel',
-                    helperText: 'When a channel is set to public, anyone can join the channel and read messages, but only members can post messages.'
+                    header: __('Create a public channel'),
+                    helperText: __('When a channel is set to public, anyone can join the channel and read messages, but only members can post messages.')
                 }
         }
     }, [channelType])
@@ -143,32 +144,32 @@ const CreateChannelContent = ({ updateChannelList, isOpen, setIsOpen }: { update
             {header}
         </Dialog.Title>
         <Dialog.Description size='2'>
-            Channels are where your team communicates. They are best when organized around a topic - #development, for example.
+            {__("Channels are where your team communicates. They are best when organized around a topic - #development, for example.")}
         </Dialog.Description>
         <FormProvider {...methods}>
             <form onSubmit={handleSubmit(onSubmit)}>
                 <Flex direction='column' gap='4' py='4'>
                     <ErrorBanner error={channelCreationError} />
                     <Box>
-                        <Label htmlFor='channel_name' isRequired>Name</Label>
+                        <Label htmlFor='channel_name' isRequired>{__("Name")}</Label>
                         <Controller
                             name='channel_name'
                             control={control}
                             rules={{
-                                required: "Please add a channel name",
+                                required: __("Please add a channel name"),
                                 maxLength: {
                                     value: 50,
-                                    message: "Channel name cannot be more than 50 characters."
+                                    message: __("Channel name cannot be more than {0} characters.", ["50"])
                                 },
                                 minLength: {
                                     value: 3,
-                                    message: "Channel name cannot be less than 3 characters."
+                                    message: __("Channel name cannot be less than {0} characters.", ["3"])
                                 },
                                 pattern: {
                                     // no special characters allowed
                                     // cannot start with a space
                                     value: /^[a-zA-Z0-9][a-zA-Z0-9-]*$/,
-                                    message: "Channel name can only contain letters, numbers and hyphens."
+                                    message: __("Channel name can only contain letters, numbers and hyphens.")
                                 }
                             }}
                             render={({ field, fieldState: { error } }) => (
@@ -194,7 +195,7 @@ const CreateChannelContent = ({ updateChannelList, isOpen, setIsOpen }: { update
                     </Box>
 
                     <Box>
-                        <Label htmlFor='channel_description'>Description <Text as='span' weight='light'>(optional)</Text></Label>
+                        <Label htmlFor='channel_description'>{__("Description")} <Text as='span' weight='light'>({__("optional")})</Text></Label>
                         <TextArea
                             maxLength={140}
                             id='channel_description'
@@ -202,7 +203,7 @@ const CreateChannelContent = ({ updateChannelList, isOpen, setIsOpen }: { update
                             {...register('channel_description', {
                                 maxLength: {
                                     value: 140,
-                                    message: "Channel description cannot be more than 140 characters."
+                                    message: __("Channel description cannot be more than {0} characters.", ["140"])
                                 }
                             })}
                             aria-invalid={errors.channel_description ? 'true' : 'false'}
@@ -225,17 +226,17 @@ const CreateChannelContent = ({ updateChannelList, isOpen, setIsOpen }: { update
                                     <Flex gap="4">
                                         <Text as="label" size="2">
                                             <Flex gap="2">
-                                                <RadioGroup.Item value="Public" /> Public
+                                                <RadioGroup.Item value="Public" /> {__("Public")}
                                             </Flex>
                                         </Text>
                                         <Text as="label" size="2">
                                             <Flex gap="2">
-                                                <RadioGroup.Item value="Private" /> Private
+                                                <RadioGroup.Item value="Private" /> {__("Private")}
                                             </Flex>
                                         </Text>
                                         <Text as="label" size="2">
                                             <Flex gap="2">
-                                                <RadioGroup.Item value="Open" /> Open
+                                                <RadioGroup.Item value="Open" /> {__("Open")}
                                             </Flex>
                                         </Text>
                                     </Flex>
@@ -243,20 +244,20 @@ const CreateChannelContent = ({ updateChannelList, isOpen, setIsOpen }: { update
                             )}
                         />
                         {/* Added min height to avoid layout shift when two lines of text are shown */}
-                        <Text size='1' weight='light' className='min-h-[2rem]'>
+                        <HelperText className='min-h-[3rem]'>
                             {helperText}
-                        </Text>
+                        </HelperText>
                     </Flex>
                 </Flex>
                 <Flex gap="3" mt="4" justify="end">
                     <Dialog.Close disabled={creatingChannel}>
                         <Button variant="soft" color="gray">
-                            Cancel
+                            {__("Cancel")}
                         </Button>
                     </Dialog.Close>
                     <Button type='submit' disabled={creatingChannel}>
                         {creatingChannel && <Loader />}
-                        {creatingChannel ? "Saving" : "Save"}
+                        {creatingChannel ? __("Saving") : __("Save")}
                     </Button>
                 </Flex>
             </form>
diff --git a/frontend/src/components/feature/chat/ChatInput/AISavedPromptsButton.tsx b/frontend/src/components/feature/chat/ChatInput/AISavedPromptsButton.tsx
new file mode 100644
index 000000000..71797fc7e
--- /dev/null
+++ b/frontend/src/components/feature/chat/ChatInput/AISavedPromptsButton.tsx
@@ -0,0 +1,109 @@
+
+import { Box, Button, Dialog, IconButton, Text, Tooltip } from '@radix-ui/themes'
+import { useCurrentEditor } from '@tiptap/react'
+import { BiSolidMagicWand } from 'react-icons/bi'
+import { DEFAULT_BUTTON_STYLE, ICON_PROPS } from './ToolPanel'
+import { DIALOG_CONTENT_CLASS } from '@/utils/layout/dialog'
+import { useEffect, useState } from 'react'
+import { Command } from 'cmdk'
+import { useIsDesktop } from '@/hooks/useMediaQuery'
+import { useFrappeGetCall } from 'frappe-react-sdk'
+import { RavenBotAIPrompt } from '@/types/RavenAI/RavenBotAIPrompt'
+import { getKeyboardMetaKeyString } from '@/utils/layout/keyboardKey'
+import { Stack } from '@/components/layout/Stack'
+import { useNavigate } from 'react-router-dom'
+
+const AISavedPromptsButton = () => {
+    const { editor } = useCurrentEditor()
+
+    const [open, setOpen] = useState(false)
+
+    // Toggle the menu when ⌘K is pressed
+    useEffect(() => {
+
+        const down = (e: KeyboardEvent) => {
+            if (e.key === 'k' && (e.metaKey || e.ctrlKey) && e.shiftKey) {
+                e.preventDefault()
+                setOpen((open) => !open)
+            }
+        }
+
+        document.addEventListener('keydown', down)
+        return () => document.removeEventListener('keydown', down)
+    }, [])
+
+    if (!editor) {
+        return null
+    }
+
+    return <Dialog.Root open={open} onOpenChange={setOpen}>
+        <Tooltip content={`Insert a command (${getKeyboardMetaKeyString()} + Shift + K)`}>
+            <IconButton
+                size='1'
+                variant='ghost'
+                className={DEFAULT_BUTTON_STYLE}
+                onClick={() => setOpen(true)}
+                title='Insert a Command'
+                aria-label={"insert a command"}>
+                <BiSolidMagicWand {...ICON_PROPS} />
+            </IconButton>
+        </Tooltip>
+
+        <Dialog.Content className={DIALOG_CONTENT_CLASS}>
+            <Dialog.Title>Insert a command</Dialog.Title>
+            <Dialog.Description size='2'>
+                Select a saved command to insert into your message.
+            </Dialog.Description>
+            <SavedPrompts onClose={() => setOpen(false)} />
+        </Dialog.Content>
+    </Dialog.Root>
+}
+
+type SavedPrompt = Pick<RavenBotAIPrompt, 'name' | 'raven_bot' | 'prompt' | 'is_global'>
+const SavedPrompts = ({ onClose }: { onClose: () => void }) => {
+
+    const { editor } = useCurrentEditor()
+
+    const isDesktop = useIsDesktop()
+
+    const { data, isLoading } = useFrappeGetCall<{ message: SavedPrompt[] }>('raven.api.ai_features.get_saved_prompts', {
+    })
+
+    const navigate = useNavigate()
+
+
+    return <Command label="Global Command Menu" className='command-menu'>
+        <Command.Input
+            autoFocus={isDesktop}
+            className='ml-0 my-2 text-base italic'
+            placeholder='Search saved prompts' />
+        <Command.List>
+            <Command.Empty className='py-4'>
+
+                <Stack align='center' justify='center' gap='2'>
+                    <Text size='2' color='gray' weight='medium'>No saved prompts found</Text>
+                    <Box>
+                        <Button className='not-cal'
+                            variant='soft'
+                            onClick={() => navigate('/channel/settings/commands')}>Create</Button>
+                    </Box>
+                </Stack>
+            </Command.Empty>
+            {isLoading && <Command.Loading>Loading...</Command.Loading>}
+            {data?.message.map((prompt) => (
+                <Command.Item key={prompt.name}
+                    onSelect={() => {
+                        editor?.chain().focus().insertContent(prompt.prompt).run()
+                        onClose()
+                    }}
+                    keywords={[prompt.prompt]}
+                    value={prompt.prompt}>
+                    {prompt.prompt}
+                </Command.Item>
+            ))}
+        </Command.List>
+    </Command>
+
+}
+
+export default AISavedPromptsButton
\ No newline at end of file
diff --git a/frontend/src/components/feature/chat/ChatInput/MobileActions/AttachFile.tsx b/frontend/src/components/feature/chat/ChatInput/MobileActions/AttachFile.tsx
index 6adb3a889..63cfca119 100644
--- a/frontend/src/components/feature/chat/ChatInput/MobileActions/AttachFile.tsx
+++ b/frontend/src/components/feature/chat/ChatInput/MobileActions/AttachFile.tsx
@@ -11,7 +11,7 @@ const AttachFile = ({ fileProps }: { fileProps: ToolbarFileProps }) => {
         }
     }
     return (
-        <DropdownMenu.Item onClick={fileButtonClicked} disabled={editor?.isEditable === false}>
+        <DropdownMenu.Item onClick={fileButtonClicked} disabled={editor?.isEditable === false} className='text-base !h-10'>
             <Flex gap='2' className='items-center'>
                 <BiPaperclip />
                 File
diff --git a/frontend/src/components/feature/chat/ChatInput/MobileActions/MobileInputActions.tsx b/frontend/src/components/feature/chat/ChatInput/MobileActions/MobileInputActions.tsx
index 00b5cdf5f..87c4f2fff 100644
--- a/frontend/src/components/feature/chat/ChatInput/MobileActions/MobileInputActions.tsx
+++ b/frontend/src/components/feature/chat/ChatInput/MobileActions/MobileInputActions.tsx
@@ -16,19 +16,19 @@ const MobileInputActions = ({ fileProps }: RightToolbarButtonsProps) => {
         <>
             <DropdownMenu.Root>
                 <DropdownMenu.Trigger>
-                    <IconButton radius='full' color='gray' variant='soft' size='1' className='mb-2'>
-                        <BiPlus size='18' />
+                    <IconButton radius='full' color='gray' variant='soft' size='2' className='mb-1'>
+                        <BiPlus size='20' />
                     </IconButton>
                 </DropdownMenu.Trigger>
-                <DropdownMenu.Content className='min-w-32' size='2'>
-                    <DropdownMenu.Item onClick={onPollOpen}>
+                <DropdownMenu.Content className='min-w-48' size='2'>
+                    <DropdownMenu.Item onClick={onPollOpen} className='text-base !h-10'>
                         <Flex gap='2' className='items-center'>
                             <MdOutlineBarChart />
                             Poll
                         </Flex>
                     </DropdownMenu.Item>
                     {fileProps && <AttachFile fileProps={fileProps} />}
-                    <DropdownMenu.Item onClick={onGIFPickerOpen}>
+                    <DropdownMenu.Item onClick={onGIFPickerOpen} className='text-base !h-10'>
                         <Flex gap='2' className='items-center'>
                             <HiOutlineGif />
                             GIF
diff --git a/frontend/src/components/feature/chat/ChatInput/RightToolbarButtons.tsx b/frontend/src/components/feature/chat/ChatInput/RightToolbarButtons.tsx
index 6131ebee3..8d4dc2455 100644
--- a/frontend/src/components/feature/chat/ChatInput/RightToolbarButtons.tsx
+++ b/frontend/src/components/feature/chat/ChatInput/RightToolbarButtons.tsx
@@ -10,6 +10,7 @@ import { IconButtonProps } from '@radix-ui/themes/dist/cjs/components/icon-butto
 import { useBoolean } from '@/hooks/useBoolean'
 import { MdOutlineBarChart } from 'react-icons/md'
 import { DIALOG_CONTENT_CLASS } from '@/utils/layout/dialog'
+import AISavedPromptsButton from './AISavedPromptsButton'
 
 
 const EmojiPicker = lazy(() => import('@/components/common/EmojiPicker/EmojiPicker'))
@@ -36,8 +37,10 @@ export type RightToolbarButtonsProps = {
 export const RightToolbarButtons = ({ fileProps, ...sendProps }: RightToolbarButtonsProps) => {
     return (
         <Flex gap='2' align='center' px='1' py='1'>
+
             <MentionButtons />
             <Separator orientation='vertical' />
+            <AISavedPromptsButton />
             <CreatePollButton />
             <Separator orientation='vertical' />
             <Flex gap='3' align='center'>
diff --git a/frontend/src/components/feature/chat/ChatInput/TextFormattingMenu.tsx b/frontend/src/components/feature/chat/ChatInput/TextFormattingMenu.tsx
index 18ed29114..7316137db 100644
--- a/frontend/src/components/feature/chat/ChatInput/TextFormattingMenu.tsx
+++ b/frontend/src/components/feature/chat/ChatInput/TextFormattingMenu.tsx
@@ -1,5 +1,5 @@
 import { useCurrentEditor } from '@tiptap/react'
-import { BiBold, BiCodeAlt, BiCodeBlock ,BiHighlight, BiItalic, BiListOl, BiListUl, BiStrikethrough, BiUnderline, BiSolidQuoteAltRight } from 'react-icons/bi'
+import { BiBold, BiCodeAlt, BiCodeBlock, BiHighlight, BiItalic, BiListOl, BiListUl, BiStrikethrough, BiUnderline, BiSolidQuoteAltRight } from 'react-icons/bi'
 import { DEFAULT_BUTTON_STYLE, ICON_PROPS } from './ToolPanel'
 import { Box, Flex, IconButton, Separator, Tooltip } from '@radix-ui/themes'
 import { getKeyboardMetaKeyString } from '@/utils/layout/keyboardKey'
@@ -14,7 +14,7 @@ export const TextFormattingMenu = () => {
         return <Box></Box>
     }
     return (
-        <Flex gap='2' align='center' px='1' py='1'>
+        <Flex gap='2' align='center' px='1' py='1' className='max-w-[60%] overflow-x-auto'>
             <Flex gap='3' align='center'>
                 <Tooltip content={getKeyboardMetaKeyString() + ' + B'} aria-label={getKeyboardMetaKeyString() + ' + B'}>
                     <IconButton
@@ -93,7 +93,7 @@ export const TextFormattingMenu = () => {
                         <BiCodeAlt {...ICON_PROPS} />
                     </IconButton>
                 </Tooltip>
-                <Tooltip content={getKeyboardMetaKeyString() +'+ Shift + E'} aria-label={getKeyboardMetaKeyString() +'+ Shift + E'}>
+                <Tooltip content={getKeyboardMetaKeyString() + '+ Shift + E'} aria-label={getKeyboardMetaKeyString() + '+ Shift + E'}>
                     <IconButton
                         onClick={() => editor.chain().focus().toggleCodeBlock().run()}
                         aria-label='code block'
diff --git a/frontend/src/components/feature/chat/ChatInput/Tiptap.tsx b/frontend/src/components/feature/chat/ChatInput/Tiptap.tsx
index 28c576057..bbfb16deb 100644
--- a/frontend/src/components/feature/chat/ChatInput/Tiptap.tsx
+++ b/frontend/src/components/feature/chat/ChatInput/Tiptap.tsx
@@ -492,15 +492,15 @@ const Tiptap = ({ isEdit, slotBefore, fileProps, onMessageSend, channelMembers,
         )
     } else {
         return <Box className={clsx('pt-2 pb-8 w-full bg-white dark:bg-gray-2 z-50 border-t border-t-gray-3 dark:border-t-gray-3',
-            isEdit ? '' : 'fixed bottom-0 left-0 px-4'
+            isEdit ? 'bg-transparent dark:bg-transparent' : 'fixed bottom-0 left-0 px-4'
         )}>
             <EditorContext.Provider value={{ editor }}>
                 {slotBefore}
                 <Flex align='end' gap='2' className='relative'>
                     {!isEdit &&
-                        <div className='w-6'>
-                            <Suspense fallback={<IconButton radius='full' color='gray' variant='soft' size='1' className='mb-2'>
-                                <BiPlus size='18' />
+                        <div className='w-8'>
+                            <Suspense fallback={<IconButton radius='full' color='gray' variant='soft' size='2' className='mb-1'>
+                                <BiPlus size='20' />
                             </IconButton>}>
                                 <MobileInputActions fileProps={fileProps} setContent={setContent} sendMessage={onMessageSend} messageSending={messageSending} />
                             </Suspense>
@@ -519,9 +519,9 @@ const Tiptap = ({ isEdit, slotBefore, fileProps, onMessageSend, channelMembers,
                     </BubbleMenu>
                     <EditorContent editor={editor} />
                     <SendButton
-                        size='1'
+                        size='2'
                         variant='soft'
-                        className='bg-transparent mb-2 absolute right-1'
+                        className='bg-transparent mb-1 absolute right-2'
                         sendMessage={onMessageSend}
                         messageSending={messageSending}
                         setContent={setContent} />
diff --git a/frontend/src/components/feature/chat/ChatInput/ToolPanel.tsx b/frontend/src/components/feature/chat/ChatInput/ToolPanel.tsx
index b469e66c7..f3abdef7a 100644
--- a/frontend/src/components/feature/chat/ChatInput/ToolPanel.tsx
+++ b/frontend/src/components/feature/chat/ChatInput/ToolPanel.tsx
@@ -12,7 +12,7 @@ export const ToolPanel = (props: FlexProps) => {
         <Flex
             justify='between'
             align='center'
-            className='border-t border-t-slate-5 bg-slate-2 rounded-b-radius4'
+            className='border-t border-t-slate-5 bg-slate-2 rounded-b-radius4 overflow-hidden'
             p='1'
             {...props}
         >
diff --git a/frontend/src/components/feature/chat/ChatInput/tiptap.styles.css b/frontend/src/components/feature/chat/ChatInput/tiptap.styles.css
index d7ef5bbf3..fe76aac3f 100644
--- a/frontend/src/components/feature/chat/ChatInput/tiptap.styles.css
+++ b/frontend/src/components/feature/chat/ChatInput/tiptap.styles.css
@@ -39,14 +39,14 @@
     .tiptap-editor.ProseMirror {
         min-height: 20px;
         padding: 8px;
-        width: calc(100vw - 80px);
+        width: calc(100vw - 96px);
         max-height: 300px;
         border: 1.5px solid var(--gray-4);
         border-radius: var(--radius-3);
     }
 
     .tiptap-editor.editing-message.ProseMirror {
-        width: calc(100vw - 48px);
+        width: calc(100vw - 96px);
     }
 
     .tiptap-editor.ProseMirror * {
diff --git a/frontend/src/components/feature/chat/ChatMessage/ActionModals/DeleteMessageModal.tsx b/frontend/src/components/feature/chat/ChatMessage/ActionModals/DeleteMessageModal.tsx
index 25be3d348..41b7af332 100644
--- a/frontend/src/components/feature/chat/ChatMessage/ActionModals/DeleteMessageModal.tsx
+++ b/frontend/src/components/feature/chat/ChatMessage/ActionModals/DeleteMessageModal.tsx
@@ -19,7 +19,9 @@ export const DeleteMessageModal = ({ onClose, message }: DeleteMessageModalProps
 
     const onSubmit = async () => {
         return deleteDoc('Raven Message', message.name).then(() => {
-            toast('Message deleted')
+            toast('Message deleted', {
+                duration: 800
+            })
             message.is_thread && navigate(`/channel/${message.channel_id}`)
             onClose()
         })
diff --git a/frontend/src/components/feature/chat/ChatMessage/Renderers/DoctypeLinkRenderer.tsx b/frontend/src/components/feature/chat/ChatMessage/Renderers/DoctypeLinkRenderer.tsx
index 8cb6d148b..3ef529ff7 100644
--- a/frontend/src/components/feature/chat/ChatMessage/Renderers/DoctypeLinkRenderer.tsx
+++ b/frontend/src/components/feature/chat/ChatMessage/Renderers/DoctypeLinkRenderer.tsx
@@ -1,16 +1,19 @@
 import { useDoctypePreview } from "@/hooks/useDoctypePreview"
-import { AspectRatio, Badge, DataList, Flex, Heading, IconButton, Skeleton, Tooltip } from "@radix-ui/themes"
-import { FrappeConfig, FrappeContext } from "frappe-react-sdk"
-import { useContext } from "react"
+import { AspectRatio, Badge, DataList, DropdownMenu, Flex, Heading, IconButton, Skeleton, Tooltip } from "@radix-ui/themes"
+import { FrappeConfig, FrappeContext, useFrappeGetCall } from "frappe-react-sdk"
+import { useContext, useState } from "react"
 import { Grid, Text, Box, Card } from "@radix-ui/themes"
 import { toast } from "sonner"
-import { BiCopy, BiLinkExternal } from "react-icons/bi"
+import { BiCopy, BiDotsHorizontalRounded, BiGitPullRequest, BiLinkExternal, BiPrinter, BiRightArrowAlt } from "react-icons/bi"
+import useDoctypeMeta from "@/hooks/useDoctypeMeta"
+import { HStack } from "@/components/layout/Stack"
+import { getErrorMessage } from "@/components/layout/AlertBanner/ErrorBanner"
 
 
 export const DoctypeLinkRenderer = ({ doctype, docname }: { doctype: string, docname: string }) => {
 
     const { call } = useContext(FrappeContext) as FrappeConfig
-    const { data, error, isLoading } = useDoctypePreview(doctype, docname)
+    const { data, error, isLoading, mutate } = useDoctypePreview(doctype, docname)
 
     const getRoute = async (doctype: string, docname: string): Promise<string> => {
 
@@ -50,7 +53,7 @@ export const DoctypeLinkRenderer = ({ doctype, docname }: { doctype: string, doc
                     error ?
                         <Card>
                             <Grid gap='2' align='center'>
-                                <Heading as='h3' size='4'>Error occurred while loading Doctype</Heading>
+                                <Heading as='h3' size='4'>Error occurred while loading {doctype} - {docname}</Heading>
                                 <Text
                                     size='2'
                                     color='gray'
@@ -59,18 +62,20 @@ export const DoctypeLinkRenderer = ({ doctype, docname }: { doctype: string, doc
                                 </Text>
                             </Grid>
                         </Card> :
-                        <DoctypeCard data={data} doctype={doctype} copyLink={copyLink} openLink={openLink} />
+                        <DoctypeCard data={data} doctype={doctype} docname={docname} copyLink={copyLink} openLink={openLink} mutate={mutate} />
             }
         </Box>
     )
 }
 
 
-const DoctypeCard = ({ data, doctype, copyLink, openLink }: {
+const DoctypeCard = ({ data, doctype, copyLink, openLink, docname, mutate }: {
     data: Record<string, any>,
     doctype: string,
+    docname: string,
     copyLink: () => Promise<void>,
-    openLink: () => Promise<void>
+    openLink: () => Promise<void>,
+    mutate: () => void
 }) => {
 
     // utility func to remove known preview fields in order to map rest of them
@@ -110,8 +115,8 @@ const DoctypeCard = ({ data, doctype, copyLink, openLink }: {
                     <Flex gap='2' align='center' width={'100%'}>
                         {
                             data?.preview_image &&
-                            <Box width={'20%'} className="pl-0.5">
-                                <AspectRatio ratio={16 / 12}>
+                            <Box width={'12%'} className="pl-0.5">
+                                <AspectRatio ratio={1 / 1}>
                                     <img
                                         src={data.preview_image}
                                         alt={data?.preview_title}
@@ -144,7 +149,7 @@ const DoctypeCard = ({ data, doctype, copyLink, openLink }: {
                                     {data?.id}
                                 </Text>
                             </Flex>
-                            <Heading as='h3' size='3' className="leading-4 pl-0.5 my-0">{data?.preview_title}</Heading>
+                            <Heading as='h3' size='3' className="leading-4 pl-0.5 my-0">{data?.preview_title ?? docname}</Heading>
                         </Grid>
                     </Flex>
                     <Flex gap='3' align='center'>
@@ -152,25 +157,65 @@ const DoctypeCard = ({ data, doctype, copyLink, openLink }: {
                             <IconButton
                                 size='1'
                                 title='Open in new tab'
+                                aria-label="Open in new tab"
                                 color='gray'
                                 onClick={openLink}
                                 variant='ghost'
                             >
-                                <BiLinkExternal size='14' />
+                                <BiLinkExternal size='18' />
                             </IconButton>
                         </Tooltip>
 
-                        <Tooltip content='Copy link' delayDuration={800}>
+                        {/* <IconButton
+                            size='1'
+                            title='Open in new tab'
+                            aria-label="Open in new tab"
+                            color='gray'
+                            onClick={openLink}
+                            variant='ghost'
+                        >
+                            <BiDotsVerticalRounded size='18' />
+                        </IconButton> */}
+
+                        {/* <Tooltip content='Copy link' delayDuration={800}>
                             <IconButton
                                 size='1'
                                 title='Copy link'
+                                aria-label="Copy link"
                                 color='gray'
                                 onClick={onCopyLinkClick}
                                 variant='ghost'
                             >
-                                <BiCopy size='14' />
+                                <BiCopy size='16' />
+                            </IconButton>
+                        </Tooltip> */}
+
+                        <DoctypeActionMenu doctype={doctype} docname={docname} onCopyLinkClick={onCopyLinkClick} mutate={mutate} />
+
+                        {/* <Tooltip content='Print' delayDuration={800}>
+                            <IconButton
+                                size='1'
+                                title='Print'
+                                aria-label="Print"
+                                color='gray'
+                                onClick={onCopyLinkClick}
+                                variant='ghost'
+                            >
+                                <BiPrinter size='16' />
                             </IconButton>
                         </Tooltip>
+                        <Tooltip content='Workflow' delayDuration={800}>
+                            <IconButton
+                                size='1'
+                                title='Print'
+                                aria-label="Print"
+                                color='gray'
+                                onClick={onCopyLinkClick}
+                                variant='ghost'
+                            >
+                                <BiGitMerge size='16' />
+                            </IconButton>
+                        </Tooltip> */}
                     </Flex>
                 </Flex>
 
@@ -178,7 +223,7 @@ const DoctypeCard = ({ data, doctype, copyLink, openLink }: {
                     {
                         data && Object.keys(removePreviewFields(data))?.map((item, index) => (
                             <DataList.Item align='center' key={item}>
-                                <DataList.Label minWidth="88px" className="font-semibold pr-2">
+                                <DataList.Label minWidth="88px" className="font-medium pr-2">
                                     {item}
                                 </DataList.Label>
                                 <DataList.Value>
@@ -191,4 +236,154 @@ const DoctypeCard = ({ data, doctype, copyLink, openLink }: {
             </Grid>
         </Card>
     )
+}
+
+const DoctypeActionMenu = ({ doctype, docname, onCopyLinkClick, mutate }: { doctype: string, docname: string, onCopyLinkClick: VoidFunction, mutate: VoidFunction }) => {
+
+
+    return <DropdownMenu.Root>
+        <DropdownMenu.Trigger>
+            <IconButton
+                size='1'
+                title='More actions'
+                aria-label="More actions"
+                color='gray'
+                variant='ghost'
+            >
+                <BiDotsHorizontalRounded size='20' />
+            </IconButton>
+        </DropdownMenu.Trigger>
+        <DropdownMenu.Content>
+            <DropdownMenu.Item onSelect={onCopyLinkClick}>
+                <Flex gap='2' align='center' pr={'4'}>
+                    <BiCopy size={'16'} />
+                    Copy Link
+                </Flex>
+            </DropdownMenu.Item>
+            <PrintSubMenu doctype={doctype} docname={docname} />
+
+            <WorkflowSubMenu doctype={doctype} docname={docname} mutate={mutate} />
+
+        </DropdownMenu.Content>
+    </DropdownMenu.Root>
+}
+
+const WorkflowSubMenu = ({ doctype, docname, mutate }: { doctype: string, docname: string, mutate: VoidFunction }) => {
+    const { doc } = useDoctypeMeta(doctype)
+    const [open, setOpen] = useState(false)
+
+    if (!doc) return null
+
+    if (!doc?.__workflow_docs || doc?.__workflow_docs.length === 0) return null
+
+    return <DropdownMenu.Sub open={open} onOpenChange={setOpen}>
+        <DropdownMenu.SubTrigger>
+            <Flex gap='2' align='center'>
+                <BiGitPullRequest size={'16'} />
+                Workflow
+            </Flex>
+        </DropdownMenu.SubTrigger>
+        <DropdownMenu.SubContent>
+            <WorkflowTransitionOptions doctype={doctype} docname={docname} workflow={doc?.__workflow_docs?.[0]} mutate={mutate} />
+        </DropdownMenu.SubContent>
+    </DropdownMenu.Sub>
+
+}
+
+export interface WorkFlowButtonData {
+    action: string;
+    doctype: string;
+    state: string;
+    next_state: string;
+    name: string;
+    condition: string;
+}
+
+const WorkflowTransitionOptions = ({ doctype, docname, mutate }: { doctype: string, docname: string, workflow: any, mutate: VoidFunction }) => {
+
+    const { data: transitions, mutate: refreshTransitions } = useFrappeGetCall<{ message: WorkFlowButtonData[] }>('frappe.model.workflow.get_transitions', {
+        'doc': {
+            'doctype': doctype,
+            'name': docname
+        }
+    }, `workflow.get_transitions.${doctype}.${docname}`, {
+        revalidateIfStale: false,
+        revalidateOnFocus: false,
+        shouldRetryOnError: false,
+    })
+
+    const { call } = useContext(FrappeContext) as FrappeConfig
+
+    const applyTransition = (action: string) => {
+        call.post('frappe.model.workflow.apply_workflow', {
+            'doc': {
+                'doctype': doctype,
+                'name': docname
+            },
+            'action': action
+        }).then(() => {
+            mutate()
+            refreshTransitions()
+
+            toast.success('Workflow transition applied successfully')
+        }).catch(error => {
+            toast.error('Failed to apply workflow transition', {
+                description: getErrorMessage(error)
+            })
+        })
+    }
+
+    if (transitions?.message.length === 0) return <DropdownMenu.Item disabled>No transitions available</DropdownMenu.Item>
+
+    return <>
+        {transitions?.message.map((transition) => {
+            return <DropdownMenu.Item key={transition.name} onClick={() => applyTransition(transition.action)}>
+                <Text size='2' weight='medium'>
+                    {transition.action}
+                </Text>
+                <HStack gap='1'>
+                    <Text size='1' className="font-light">{transition.state}</Text>
+                    <BiRightArrowAlt size='16' opacity={0.7} />
+                    <Text size='1' className="font-light">{transition.next_state}</Text>
+                </HStack></DropdownMenu.Item>
+        })}
+    </>
+
+}
+
+const PrintSubMenu = ({ doctype, docname }: { doctype: string, docname: string }) => {
+
+    const { doc } = useDoctypeMeta(doctype)
+
+    const printit = (format?: string) => {
+
+        let params = `doctype=${encodeURIComponent(doctype)}&name=${encodeURIComponent(docname)}`
+
+        if (format) {
+            params += `&format=${format}`
+        }
+
+        params += `&trigger_print=0`
+
+        window.open(`http://localhost:8000/printview?${params}`, '_blank')
+
+    }
+
+    return <DropdownMenu.Sub>
+        <DropdownMenu.SubTrigger>
+            <Flex gap='2' align='center'>
+                <BiPrinter size={'16'} />
+                Print
+            </Flex>
+        </DropdownMenu.SubTrigger>
+        <DropdownMenu.SubContent>
+            {doc?.__print_formats?.map((format: any) => (
+                <DropdownMenu.Item onClick={() => printit(format.name)} key={format.name}>
+                    {format.name}
+                </DropdownMenu.Item>
+            ))
+            }
+            <DropdownMenu.Item onClick={() => printit()}>Standard</DropdownMenu.Item>
+        </DropdownMenu.SubContent>
+    </DropdownMenu.Sub>
 }
\ No newline at end of file
diff --git a/frontend/src/components/feature/chat/ChatMessage/Renderers/FileMessage.tsx b/frontend/src/components/feature/chat/ChatMessage/Renderers/FileMessage.tsx
index c5c9612b0..cdc583f85 100644
--- a/frontend/src/components/feature/chat/ChatMessage/Renderers/FileMessage.tsx
+++ b/frontend/src/components/feature/chat/ChatMessage/Renderers/FileMessage.tsx
@@ -1,8 +1,7 @@
 import { FileMessage } from "../../../../../../../types/Messaging/Message"
 import { getFileExtension, getFileName, isVideoFile } from "../../../../../utils/operations"
 import { UserFields } from "@/utils/users/UserListProvider"
-import { Box, Button, Dialog, Flex, IconButton, Link, Text } from "@radix-ui/themes"
-import { BoxProps } from "@radix-ui/themes/dist/cjs/components/box"
+import { Box, BoxProps, Button, Dialog, Flex, IconButton, Link, Text } from "@radix-ui/themes"
 import { BiDownload, BiLink, BiShow } from "react-icons/bi"
 import { DIALOG_CONTENT_CLASS } from "@/utils/layout/dialog"
 import { DateMonthAtHourMinuteAmPm } from "@/utils/dateConversions"
@@ -12,7 +11,7 @@ import { memo } from "react"
 import { toast } from "sonner"
 import { useIsDesktop } from "@/hooks/useMediaQuery"
 
-interface FileMessageBlockProps extends BoxProps {
+type FileMessageBlockProps = BoxProps & {
     message: FileMessage,
     user?: UserFields,
 }
@@ -60,7 +59,7 @@ export const FileMessageBlock = memo(({ message, user, ...props }: FileMessageBl
                 align='center'
                 gap='4'
                 p='4'
-                className="border-2 bg-gray-2 dark:bg-gray-4 rounded-md border-gray-4  dark:border-gray-6 shadow-sm">
+                className="border bg-gray-1 dark:bg-gray-3 rounded-md border-gray-4 dark:border-gray-6 w-fit">
                 <Flex align='center' gap='2'>
                     <FileExtensionIcon ext={fileExtension} />
                     <Text as='span' size='2' className="text-ellipsis overflow-hidden line-clamp-1">{fileName}</Text>
diff --git a/frontend/src/components/feature/chat/ChatMessage/Renderers/ImageMessage.tsx b/frontend/src/components/feature/chat/ChatMessage/Renderers/ImageMessage.tsx
index db116832b..3578605c3 100644
--- a/frontend/src/components/feature/chat/ChatMessage/Renderers/ImageMessage.tsx
+++ b/frontend/src/components/feature/chat/ChatMessage/Renderers/ImageMessage.tsx
@@ -44,18 +44,18 @@ export const ImageMessageBlock = memo(({ message, isScrolling = false, user }: I
 
     return (
         <Flex direction='column' gap='1'>
-            <Flex className='p-1 items-center'>
+            <Flex className='py-1 items-center'>
                 <IconButton
                     size='1'
                     variant="ghost"
                     color="gray"
                     radius='large'
-                    className='pl-0 mr-[1px] cursor-pointer font-bold hover:bg-transparent text-accent-a11 hover:text-gray-12'
+                    className='pl-0 pr-[6px] font-bold hover:bg-transparent text-accent-a11 hover:text-gray-12'
                     aria-label={`Click to ${isVisible ? "hide" : "show"} image`}
                     title={`${isVisible ? "Hide" : "Show"} image`}
                     onClick={() => isVisible ? setIsVisible(false) : showImage()}
                 >
-                    {isVisible ? <BiChevronDown size='18' /> : <BiChevronRight size='18' />}
+                    {isVisible ? <BiChevronDown size='20' className='pt-[1px]' /> : <BiChevronRight size='20' className='pt-[1px]' />}
                 </IconButton>
                 <Link
                     href={message.file}
diff --git a/frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/Details.tsx b/frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/Details.tsx
new file mode 100644
index 000000000..e5275f5fe
--- /dev/null
+++ b/frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/Details.tsx
@@ -0,0 +1,50 @@
+import { mergeAttributes, Node } from '@tiptap/core'
+import { NodeViewWrapper, ReactNodeViewRenderer, NodeViewRendererProps, NodeViewContent } from '@tiptap/react'
+
+export default Node.create({
+    name: 'details',
+
+    group: 'block',
+
+    content: 'block+',
+
+    atom: true,
+
+    addAttributes() {
+        return {
+            'data-summary': {
+                default: '',
+            },
+        }
+    },
+
+    parseHTML() {
+        return [
+            {
+                tag: 'details',
+            },
+        ]
+    },
+
+    renderHTML({ HTMLAttributes, node }) {
+        return ['details', mergeAttributes(HTMLAttributes)]
+    },
+
+    addNodeView() {
+        return ReactNodeViewRenderer(DetailsComponent)
+    },
+})
+
+const DetailsComponent = ({ node }: NodeViewRendererProps) => {
+
+    return <NodeViewWrapper>
+        <details>
+            <summary className='text-gray-11 text-sm'>
+                {node.attrs['data-summary']}
+            </summary>
+            <div className='font-mono pl-4'>
+                <NodeViewContent />
+            </div>
+        </details>
+    </NodeViewWrapper>
+}
\ No newline at end of file
diff --git a/frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/TiptapRenderer.tsx b/frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/TiptapRenderer.tsx
index 578992551..183563372 100644
--- a/frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/TiptapRenderer.tsx
+++ b/frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/TiptapRenderer.tsx
@@ -1,4 +1,4 @@
-import { EditorContent, EditorContext, ReactNodeViewRenderer, useEditor } from '@tiptap/react'
+import { EditorContent, EditorContext, mergeAttributes, ReactNodeViewRenderer, useEditor } from '@tiptap/react'
 import { TextMessage } from '../../../../../../../../types/Messaging/Message'
 import { UserFields } from '@/utils/users/UserListProvider'
 import { BoxProps } from '@radix-ui/themes/dist/cjs/components/box'
@@ -27,6 +27,7 @@ import Table from '@tiptap/extension-table'
 import TableCell from '@tiptap/extension-table-cell'
 import TableHeader from '@tiptap/extension-table-header'
 import TableRow from '@tiptap/extension-table-row'
+import Details from './Details'
 
 const lowlight = createLowlight(common)
 
@@ -104,6 +105,13 @@ export const TiptapRenderer = ({ message, user, isScrolling = false, showMiniIma
         HTMLAttributes: {
           class: 'rt-TableRootTable border-l border-r border-t border-gray-4 dark:border-gray-7 my-2'
         }
+      }).extend({
+        renderHTML({ node, HTMLAttributes }) {
+          // Wrap the table in a div with a class that will be styled in CSS
+          return ['div', { class: 'table-wrapper rt-TableRoot rt-r-size-1 rt-variant-ghost' }, ['table', mergeAttributes(HTMLAttributes, node.attrs, {
+            class: 'rt-TableRootTable border-l border-r border-t border-gray-4 dark:border-gray-7 my-2'
+          }), 0]]
+        }
       }),
       TableRow.configure({
         HTMLAttributes: {
@@ -151,6 +159,7 @@ export const TiptapRenderer = ({ message, user, isScrolling = false, showMiniIma
           pluginKey: new PluginKey('channelMention'),
         },
       }),
+      Details
     ]
   })
 
diff --git a/frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/tiptap-renderer.styles.css b/frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/tiptap-renderer.styles.css
index faf9d2861..6f6ac9213 100644
--- a/frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/tiptap-renderer.styles.css
+++ b/frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/tiptap-renderer.styles.css
@@ -7,4 +7,9 @@
 .tiptap-renderer a,
 .tiptap-renderer .mention {
     color: var(--accent-11);
+}
+
+.tiptap-renderer .table-wrapper {
+    overflow-x: auto;
+    padding-right: 4rem;
 }
\ No newline at end of file
diff --git a/frontend/src/components/feature/chat/ChatStream/ChatBoxBody.tsx b/frontend/src/components/feature/chat/ChatStream/ChatBoxBody.tsx
index fc8e5d59e..df861a062 100644
--- a/frontend/src/components/feature/chat/ChatStream/ChatBoxBody.tsx
+++ b/frontend/src/components/feature/chat/ChatStream/ChatBoxBody.tsx
@@ -90,6 +90,7 @@ export const ChatBoxBody = ({ channelData }: ChatBoxBodyProps) => {
                 files={files}
                 ref={fileInputRef}
                 onFileChange={setFiles}
+                width={threadID ? 'w-[calc((100vw-var(--sidebar-width)-var(--space-8))/2)]' : undefined}
                 maxFiles={10}
                 maxFileSize={10000000}>
                 <ChatStream
diff --git a/frontend/src/components/feature/chat/chat-footer/ArchivedChannelBox.tsx b/frontend/src/components/feature/chat/chat-footer/ArchivedChannelBox.tsx
index ec1d1a142..9ee25aedb 100644
--- a/frontend/src/components/feature/chat/chat-footer/ArchivedChannelBox.tsx
+++ b/frontend/src/components/feature/chat/chat-footer/ArchivedChannelBox.tsx
@@ -37,7 +37,7 @@ export const ArchivedChannelBox = ({ channelData, channelMembers }: ArchivedChan
                 <ErrorBanner error={error} />
                 <Flex justify='center' align='center' gap='4'>
                     <Text as='span'>This channel has been archived.</Text>
-                    {channelMembers[currentUser].is_admin === 1 && <Button
+                    {channelMembers[currentUser]?.is_admin === 1 && <Button
                         size='1'
                         disabled={loading}
                         onClick={unArchiveChannel}>
diff --git a/frontend/src/components/feature/direct-messages/DirectMessageList.tsx b/frontend/src/components/feature/direct-messages/DirectMessageList.tsx
index 6859756e7..932d16911 100644
--- a/frontend/src/components/feature/direct-messages/DirectMessageList.tsx
+++ b/frontend/src/components/feature/direct-messages/DirectMessageList.tsx
@@ -15,6 +15,7 @@ import { useStickyState } from "@/hooks/useStickyState"
 import clsx from "clsx"
 import { UserFields, UserListContext } from "@/utils/users/UserListProvider"
 import { replaceCurrentUserFromDMChannelName } from "@/utils/operations"
+import { __ } from "@/utils/translations"
 
 export const DirectMessageList = ({ unread_count }: { unread_count?: UnreadCountData }) => {
 
@@ -37,7 +38,7 @@ export const DirectMessageList = ({ unread_count }: { unread_count?: UnreadCount
             <SidebarGroupItem className={'gap-1 pl-1'}>
                 <Flex width='100%' justify='between' align='center' gap='2' pr='2' className="group">
                     <Flex align='center' gap='2' width='100%' onClick={toggle} className="cursor-default select-none">
-                        <SidebarGroupLabel className="pt-0.5">Members</SidebarGroupLabel>
+                        <SidebarGroupLabel className="pt-0.5">{__("Members")}</SidebarGroupLabel>
                         <Box className={clsx('transition-opacity ease-in-out duration-200', !showData && unread_count && unread_count?.total_unread_count_in_dms > 0 ? 'opacity-100' : 'opacity-0')}>
                             <SidebarBadge>{unread_count?.total_unread_count_in_dms}</SidebarBadge>
                         </Box>
@@ -137,7 +138,7 @@ const ExtraUsersItemList = () => {
                 mutate()
             })
             .catch((e) => {
-                toast.error('Could not create channel', {
+                toast.error(__("Could not create channel"), {
                     description: getErrorMessage(e)
                 })
             })
diff --git a/frontend/src/components/feature/file-upload/FileDrop.tsx b/frontend/src/components/feature/file-upload/FileDrop.tsx
index e6fc1411d..7d3feff86 100644
--- a/frontend/src/components/feature/file-upload/FileDrop.tsx
+++ b/frontend/src/components/feature/file-upload/FileDrop.tsx
@@ -22,7 +22,12 @@ export interface FileDropProps extends FlexProps {
     accept?: Accept,
     /** Maximum file size in mb that can be selected */
     maxFileSize?: number,
-    children?: React.ReactNode
+    children?: React.ReactNode,
+    /** This is used inside a style prop for the outer div */
+    height?: string,
+    width?: string,
+    /** This is a Tailwind class that is applied to the area inside the dropzone */
+    areaHeight?: string,
 }
 
 /**
@@ -31,7 +36,7 @@ export interface FileDropProps extends FlexProps {
  */
 export const FileDrop = forwardRef((props: FileDropProps, ref) => {
 
-    const { files, onFileChange, maxFiles, accept, maxFileSize, children, ...compProps } = props
+    const { files, onFileChange, maxFiles, accept, maxFileSize, children, height, width, areaHeight, ...compProps } = props
 
     const [onDragEnter, setOnDragEnter] = useState(false)
 
@@ -77,7 +82,7 @@ export const FileDrop = forwardRef((props: FileDropProps, ref) => {
         <Flex
             direction='column'
             style={{
-                height: 'calc(100vh - 80px)',
+                height: height ?? 'calc(100vh - 80px)',
             }}
             width='100%'
             {...getRootProps()}
@@ -89,8 +94,8 @@ export const FileDrop = forwardRef((props: FileDropProps, ref) => {
                     align='center'
                     justify='center'
                     className={clsx("fixed top-14 border-2 border-dashed rounded-md border-gray-6 dark:bg-[#171923AA] bg-[#F7FAFCAA]",
-                        "h-[calc(100vh-72px)]",
-                        "w-[calc(100vw-var(--sidebar-width)-var(--space-6))]",
+                        areaHeight ?? "h-[calc(100vh-72px)]",
+                        width ?? "w-[calc(100vw-var(--sidebar-width)-var(--space-6))]",
                     )}
                     style={{
                         zIndex: 9999
diff --git a/frontend/src/components/feature/settings/ai/AINotEnabledCallout.tsx b/frontend/src/components/feature/settings/ai/AINotEnabledCallout.tsx
new file mode 100644
index 000000000..0cbfb29f2
--- /dev/null
+++ b/frontend/src/components/feature/settings/ai/AINotEnabledCallout.tsx
@@ -0,0 +1,24 @@
+import { BiInfoCircle } from "react-icons/bi"
+import { Link } from "react-router-dom"
+import { Link as RadixLink, Text } from "@radix-ui/themes"
+import useRavenSettings from "@/hooks/fetchers/useRavenSettings"
+import { CustomCallout } from "@/components/common/Callouts/CustomCallout"
+
+const AINotEnabledCallout = () => {
+
+    const { ravenSettings } = useRavenSettings()
+
+    if (ravenSettings?.enable_ai_integration === 1) {
+        return null
+    }
+
+    return (
+        <CustomCallout
+            iconChildren={<BiInfoCircle size='18' />}
+            rootProps={{ color: 'blue', variant: 'surface' }}
+            textChildren={<Text>Raven AI is not enabled. Please enable it in <RadixLink asChild color='blue' underline='always'><Link to='/channel/settings/openai-settings'>OpenAI Settings</Link></RadixLink></Text>}
+        />
+    )
+}
+
+export default AINotEnabledCallout
\ No newline at end of file
diff --git a/frontend/src/components/feature/settings/ai/InstructionField.tsx b/frontend/src/components/feature/settings/ai/InstructionField.tsx
new file mode 100644
index 000000000..1cbba710a
--- /dev/null
+++ b/frontend/src/components/feature/settings/ai/InstructionField.tsx
@@ -0,0 +1,376 @@
+import { ErrorText, HelperText, Label } from '@/components/common/Form'
+import { ErrorBanner } from '@/components/layout/AlertBanner'
+import { HStack, Stack } from '@/components/layout/Stack'
+import { RavenBotInstructionTemplate } from '@/types/RavenAI/RavenBotInstructionTemplate'
+import { Badge, Box, Button, Checkbox, Code, Flex, Popover, RadioCards, SegmentedControl, Separator, Table, Text, TextArea, TextAreaProps, Tooltip } from '@radix-ui/themes'
+import { useFrappeGetCall, useFrappeGetDocList } from 'frappe-react-sdk'
+import { useState } from 'react'
+import { Controller, useFormContext } from 'react-hook-form'
+import { RiSparkling2Fill } from 'react-icons/ri'
+import { toast } from 'sonner'
+
+type Props = {
+    allowUsingTemplate?: boolean,
+    instructionRequired?: boolean,
+    autoFocus?: boolean
+}
+
+interface InstructionFieldForm {
+    instruction: string
+    dynamic_instructions: 0 | 1
+}
+const InstructionField = ({ allowUsingTemplate, instructionRequired, autoFocus }: Props) => {
+
+    const { watch, control } = useFormContext<InstructionFieldForm>()
+
+    const isDynamic = watch('dynamic_instructions')
+
+    return (
+        <Stack gap='4'>
+            <Flex direction={'column'} gap='2'>
+                <Text as="label" size="2">
+                    <Flex gap="2">
+                        <Controller
+                            control={control}
+                            name='dynamic_instructions'
+                            render={({ field }) => (
+                                <Checkbox
+                                    checked={field.value ? true : false}
+                                    onCheckedChange={(v) => field.onChange(v ? 1 : 0)}
+                                />
+                            )} />
+
+                        Dynamic Instructions
+                    </Flex>
+                </Text>
+                <HelperText size='2'>
+                    Dynamic Instructions allow you to embed Jinja tags in your instruction to the bot.
+                    <br /><br />
+                    Instructions would be different based on the user who is calling the bot or the data in your system as they are computed every time the bot is called.
+                </HelperText>
+            </Flex>
+
+            {isDynamic ? <DynamicInstructionField autoFocus={autoFocus} instructionRequired={instructionRequired} allowUsingTemplate={allowUsingTemplate} /> : <StaticInstructionField autoFocus={autoFocus} instructionRequired={instructionRequired} allowUsingTemplate={allowUsingTemplate} />}
+        </Stack>
+    )
+}
+
+const variables = [
+    { variable: 'first_name', description: 'The first name of the user' },
+    { variable: 'full_name', description: 'The full name of the user' },
+    { variable: 'email', description: 'The email of the user' },
+    { variable: 'user_id', description: 'The ID of the user' },
+    { variable: 'company', description: "The default company in the system" },
+    { variable: 'employee_id', description: 'The ID of the employee' },
+    { variable: "employee_company", description: "The company of the employee (value in Employee DocType)" },
+    { variable: 'department', description: 'The department of the employee' },
+]
+
+const DynamicInstructionField = ({ allowUsingTemplate, instructionRequired, autoFocus }: Props) => {
+
+    const [view, setView] = useState('editor')
+
+    // const ref = useRef<HTMLTextAreaElement>(null)
+
+    // const { setValue } = useFormContext<InstructionFieldForm>()
+
+    // TODO: Make it smarter
+    // const onPaste = (e: React.ClipboardEvent<HTMLTextAreaElement>) => {
+
+    //     /** When the user pastes, we need to check where the user is pasting the text. 
+    //      * 
+    //      * If the text has {{ }} then we need to remove it first.
+    //      * 
+    //      * Then, we need to check if the user has already typed either {{ or }} in the text area based on the current cursor position.
+    //      * According to the cursor position, we need to add the missing {{ or }} in the text area.
+    //      * 
+    //      * 
+    //      */
+
+    //     console.log(e)
+
+    //     let textAreaText = e.target.value
+    //     let copiedText = e.clipboardData.getData('text/plain')
+
+    //     if (copiedText.includes('{{') || copiedText.includes('}}')) {
+    //         copiedText = copiedText.replace('{{', '').replace('}}', '')
+    //     }
+
+    //     // Add the copied text to the text area based on the cursor position
+    //     const start = e.target.selectionStart
+    //     const end = e.target.selectionEnd
+
+    //     // Check if there's a {{ before the cursor position - and the {{ should not be before any text
+    //     // Since checking for {{ is difficult, we can check if there's a character before the cursor position
+
+    //     let hasCharacterBefore = false
+
+    //     for (let i = start - 1; i >= 0; i--) {
+    //         console.log("text", textAreaText[i], start, textAreaText.length)
+    //         if (textAreaText[i] !== ' ' && textAreaText[i] !== '\n' && textAreaText[i] !== '\t' && textAreaText[i] !== '\r') {
+    //             hasCharacterBefore = true
+    //             break
+    //         }
+
+    //         if (textAreaText[i] === '{' && i > 0 && textAreaText[i - 1] === '{') {
+    //             hasCharacterBefore = false
+    //             break
+    //         }
+    //     }
+
+    //     if (start === 0) {
+    //         hasCharacterBefore = true
+    //     }
+
+    //     if (hasCharacterBefore) {
+    //         copiedText = '{{ ' + copiedText
+    //     }
+
+    //     let hasCharacterAfter = false
+
+    //     for (let i = end; i < textAreaText.length; i++) {
+    //         if (textAreaText[i] !== ' ' && textAreaText[i] !== '\n' && textAreaText[i] !== '\t' && textAreaText[i] !== '\r') {
+    //             hasCharacterAfter = true
+    //             break
+    //         }
+    //         if (textAreaText[i] === '}' && i < textAreaText.length - 1 && textAreaText[i + 1] === '}') {
+    //             hasCharacterAfter = false
+    //             break
+    //         }
+    //     }
+
+    //     if (end === textAreaText.length) {
+    //         hasCharacterAfter = true
+    //     }
+
+    //     if (hasCharacterAfter) {
+    //         copiedText = copiedText + ' }}'
+    //     }
+
+    //     const newText = textAreaText.slice(0, start) + copiedText + textAreaText.slice(end)
+
+    //     e.preventDefault()
+
+    //     setValue('instruction', newText)
+
+    //     // Set the cursor to the end of the pasted text for better user experience
+    //     setTimeout(() => {
+    //         ref.current?.setSelectionRange(start + copiedText.length, start + copiedText.length)
+    //     }, 50)
+    // }
+
+    return <Stack gap='4'>
+        <SegmentedControl.Root defaultValue="editor" value={view} onValueChange={setView}>
+            <SegmentedControl.Item value="editor">Editor</SegmentedControl.Item>
+            <SegmentedControl.Item value="preview">Preview</SegmentedControl.Item>
+        </SegmentedControl.Root>
+        {view === 'editor' ? <StaticInstructionField className='w-full'
+            allowUsingTemplate={allowUsingTemplate}
+            autoFocus={autoFocus}
+            instructionRequired={instructionRequired}
+        // onPaste={onPaste} 
+        /> : <InstructionPreview />}
+
+        <Separator className='w-full' />
+        <Text size='2'>
+            Here are some variables you can use in your instruction. Simple copy by clicking on the variable.
+            <br />You can also use standard Jinja variables available in the system.
+        </Text>
+        <Table.Root variant='surface'>
+            <Table.Header>
+                <Table.Row>
+                    <Table.ColumnHeaderCell>Variable</Table.ColumnHeaderCell>
+                    <Table.ColumnHeaderCell>Description</Table.ColumnHeaderCell>
+                </Table.Row>
+            </Table.Header>
+            <Table.Body>
+                {variables.map((v) => <VariableRow key={v.variable} variable={v.variable} description={v.description} />)}
+            </Table.Body>
+        </Table.Root>
+    </Stack >
+}
+
+const VariableRow = ({ variable, description }: { variable: string, description: string }) => {
+    return <Table.Row>
+        <Table.Cell><VariableTooltip text={variable} /></Table.Cell>
+        <Table.Cell>{description}</Table.Cell>
+    </Table.Row>
+}
+
+const VariableTooltip = ({ text }: { text: string }) => {
+
+    const [tooltip, setTooltip] = useState('')
+
+
+    const copyText = (e: React.MouseEvent<HTMLDivElement>) => {
+        e.preventDefault()
+        window.navigator.clipboard.writeText("{{ " + text + " }}")
+            .then(() => {
+                setTooltip('Copied!')
+                setTimeout(() => {
+                    setTooltip('')
+                }, 1000)
+            })
+            .catch(() => {
+                toast.error('Failed to copy to clipboard')
+            })
+    }
+
+
+    return <Tooltip
+        content={tooltip}
+        open={tooltip !== ''}
+        onOpenChange={(o) => {
+            if (o) {
+                setTooltip('Copy to clipboard')
+
+                setTimeout(() => {
+                    setTooltip('')
+                }, 1000)
+            }
+        }}
+    >
+
+        <Code
+            role='button'
+            onClick={copyText}
+            aria-label='Copy to clipboard'
+            className='cursor-pointer'
+        >
+            {text}</Code>
+    </Tooltip>
+}
+
+const InstructionPreview = () => {
+
+    const { watch } = useFormContext<InstructionFieldForm>()
+
+    const instruction = watch('instruction')
+
+    const { data } = useFrappeGetCall('raven.api.ai_features.get_instruction_preview', {
+        instruction
+    })
+
+    return <Box className='border-2 px-2 py-1 rounded-md bg-gray-3'>
+        {data ? <Text size='2' className='whitespace-pre-wrap'>{data.message}</Text> : null}
+    </Box>
+}
+
+const StaticInstructionField = ({ allowUsingTemplate, instructionRequired, ...props }: TextAreaProps & { allowUsingTemplate?: boolean, instructionRequired?: boolean }) => {
+
+    const { register, watch, formState: { errors } } = useFormContext<InstructionFieldForm>()
+
+
+    const isDynamic = watch('dynamic_instructions')
+
+    const placeholder = isDynamic ? "You are an assistant running on an ERP. The current user's name is {{ first_name }} and the current company is {{ company }}." : 'You are an assistant running on an ERP. You can answer questions about the company.'
+
+    return <Stack>
+        <Box>
+            <HStack justify={'between'}>
+                <Label htmlFor='instruction' isRequired>Instruction</Label>
+                {allowUsingTemplate && <ImportTemplate />}
+            </HStack>
+            <TextArea
+                id='instruction'
+                {...register('instruction', {
+                    required: instructionRequired ? 'Instruction is required' : false,
+                    validate: (value) => {
+                        if (!isDynamic && value.includes('{{')) {
+                            return 'You cannot include Jinja tags without enabling dynamic instructions.'
+                        }
+                        return true
+                    }
+                })}
+                rows={10}
+                resize='vertical'
+                placeholder={placeholder}
+                aria-invalid={errors.instruction ? 'true' : 'false'}
+                {...props}
+            />
+        </Box>
+        {errors.instruction && <ErrorText size={'2'}>{errors.instruction?.message}</ErrorText>}
+
+    </Stack>
+}
+
+const ImportTemplate = () => {
+
+    const { setValue, getValues, watch } = useFormContext<InstructionFieldForm>()
+
+    const isDynamic = watch('dynamic_instructions')
+
+    const { data, error } = useFrappeGetDocList<RavenBotInstructionTemplate>("Raven Bot Instruction Template", {
+        fields: ["template_name", "dynamic_instructions", "instruction"],
+        // If status, do not show dynamic templates
+        filters: isDynamic ? undefined : [["dynamic_instructions", "=", 0]]
+    })
+
+    const [selectedTemplate, setSelectedTemplate] = useState<string>("")
+
+    const onSelectTemplate = (type: 'replace' | 'append') => {
+        if (type === 'replace') {
+            setValue('instruction', selectedTemplate)
+        } else {
+            setValue('instruction', getValues('instruction') + selectedTemplate)
+        }
+    }
+
+    return <Popover.Root onOpenChange={() => setSelectedTemplate("")}>
+        <Popover.Trigger>
+            <Button variant='ghost' size={'1'} className='not-cal font-medium'>Import from Template</Button>
+        </Popover.Trigger>
+        <Popover.Content width={'300px'} className='z-50'>
+            <Stack gap='6'>
+                <ErrorBanner error={error} />
+                <Box>
+                    <Label htmlFor='template'>Select a template</Label>
+                    {data && data.length === 0 && <Text size='2' color='gray'>No templates found</Text>}
+
+
+                    {/* <Select.Root>
+                        <Select.Trigger placeholder='Select a template' className='w-full' />
+                        <Select.Content>
+                            {data?.map((t) => <Select.Item key={t.name} value={t.instruction}>
+                                <Text>{t.template_name}</Text> {t.dynamic_instructions ? <Badge color='purple'>Dynamic</Badge> : null}
+                            </Select.Item>)}
+                        </Select.Content>
+                    </Select.Root> */}
+
+
+                    <RadioCards.Root
+                        columns={'1'}
+                        name='template'
+                        value={selectedTemplate}
+                        onValueChange={setSelectedTemplate}
+                        className='max-h-96 overflow-y-auto'
+                        gap={'2'}>
+                        {data?.map((t) => <RadioCards.Item key={t.name} value={t.instruction} className='px-3 py-3'>
+                            <HStack width="100%">
+                                <Text>{t.template_name}</Text>
+                                {t.dynamic_instructions ? <Box><Badge color='purple'><RiSparkling2Fill /> Dynamic</Badge></Box> : null}
+                            </HStack>
+                        </RadioCards.Item>
+                        )}
+                    </RadioCards.Root>
+                </Box>
+                <HStack justify={'end'}>
+                    <Button type='button'
+                        color='gray'
+                        variant='soft'
+                        onClick={() => onSelectTemplate('replace')}
+                        disabled={!selectedTemplate}>Replace</Button>
+                    <Button type='button' variant='soft'
+                        disabled={!selectedTemplate}
+                        onClick={() => onSelectTemplate('append')}
+                    >Add</Button>
+                </HStack>
+            </Stack>
+
+        </Popover.Content>
+    </Popover.Root>
+
+
+}
+
+export default InstructionField
\ No newline at end of file
diff --git a/frontend/src/components/feature/settings/ai/InstructionTemplateForm.tsx b/frontend/src/components/feature/settings/ai/InstructionTemplateForm.tsx
new file mode 100644
index 000000000..ed04dcba8
--- /dev/null
+++ b/frontend/src/components/feature/settings/ai/InstructionTemplateForm.tsx
@@ -0,0 +1,41 @@
+import { Stack } from '@/components/layout/Stack'
+import InstructionField from './InstructionField'
+import { useFormContext } from 'react-hook-form'
+import { RavenBotInstructionTemplate } from '@/types/RavenAI/RavenBotInstructionTemplate'
+import { Box, TextField } from '@radix-ui/themes'
+import { ErrorText, Label } from '@/components/common/Form'
+import AINotEnabledCallout from './AINotEnabledCallout'
+
+type Props = {
+    isEdit?: boolean
+}
+
+const InstructionTemplateForm = ({ isEdit }: Props) => {
+
+    const { register, formState: { errors } } = useFormContext<RavenBotInstructionTemplate>()
+    return (
+        <Stack gap='4'>
+            <AINotEnabledCallout />
+            <Stack maxWidth={'480px'}>
+                <Box>
+                    <Label htmlFor='template_name' isRequired>Template Name</Label>
+                    <TextField.Root
+                        readOnly={isEdit}
+                        autoFocus={!isEdit}
+                        id='template_name'
+                        {...register('template_name', {
+                            required: 'Name is required',
+                        })}
+                        placeholder="Create Document Template"
+                        aria-invalid={errors.template_name ? 'true' : 'false'}
+                    />
+                </Box>
+                {errors.template_name && <ErrorText>{errors.template_name?.message}</ErrorText>}
+            </Stack>
+
+            <InstructionField autoFocus={isEdit} />
+        </Stack>
+    )
+}
+
+export default InstructionTemplateForm
\ No newline at end of file
diff --git a/frontend/src/components/feature/settings/ai/SavedPromptForm.tsx b/frontend/src/components/feature/settings/ai/SavedPromptForm.tsx
new file mode 100644
index 000000000..ce4a37bc3
--- /dev/null
+++ b/frontend/src/components/feature/settings/ai/SavedPromptForm.tsx
@@ -0,0 +1,70 @@
+import { ErrorText, HelperText, Label } from '@/components/common/Form'
+import LinkFormField from '@/components/common/LinkField/LinkFormField'
+import { HStack, Stack } from '@/components/layout/Stack'
+import { RavenBotAIPrompt } from '@/types/RavenAI/RavenBotAIPrompt'
+import { Box, Checkbox, Text, TextArea } from '@radix-ui/themes'
+import { Controller, useFormContext } from 'react-hook-form'
+import AINotEnabledCallout from './AINotEnabledCallout'
+
+const SavedPromptForm = () => {
+
+    const { register, control, formState: { errors } } = useFormContext<RavenBotAIPrompt>()
+
+    return (
+        <Stack gap='4'>
+            <AINotEnabledCallout />
+            <Stack>
+                <Box>
+                    <Label htmlFor='prompt' isRequired>Prompt</Label>
+                    <TextArea
+                        id='prompt'
+                        {...register('prompt', {
+                            required: 'Prompt is required',
+                        })}
+                        autoFocus
+                        rows={5}
+                        resize='vertical'
+                        placeholder="Can you create purchase invoices from these files?"
+                        aria-invalid={errors.prompt ? 'true' : 'false'}
+                    />
+                </Box>
+                {errors.prompt && <ErrorText>{errors.prompt?.message}</ErrorText>}
+            </Stack>
+            <Stack maxWidth={'480px'}>
+                <Text as="label" size="2">
+                    <HStack>
+                        <Controller
+                            control={control}
+                            name='is_global'
+                            render={({ field }) => (
+                                <Checkbox
+                                    checked={field.value ? true : false}
+                                    onCheckedChange={(v) => field.onChange(v ? 1 : 0)}
+                                />
+                            )} />
+
+                        Is Global
+                    </HStack>
+                </Text>
+                <HelperText>
+                    If checked, this prompt will be available to all users on Raven
+                </HelperText>
+            </Stack>
+            <Stack maxWidth={'480px'}>
+                <LinkFormField
+                    name='raven_bot'
+                    dropdownClass='max-w-[480px]'
+                    label='Bot'
+                    filters={[["is_ai_bot", "=", 1]]}
+                    doctype="Raven Bot"
+                />
+                <HelperText>
+                    If added, this prompt will only be shown when interacting with the bot
+                </HelperText>
+                <ErrorText>{errors.raven_bot?.message}</ErrorText>
+            </Stack>
+        </Stack>
+    )
+}
+
+export default SavedPromptForm
\ No newline at end of file
diff --git a/frontend/src/components/feature/settings/ai/bots/AIFeaturesBotForm.tsx b/frontend/src/components/feature/settings/ai/bots/AIFeaturesBotForm.tsx
new file mode 100644
index 000000000..0b95868e8
--- /dev/null
+++ b/frontend/src/components/feature/settings/ai/bots/AIFeaturesBotForm.tsx
@@ -0,0 +1,142 @@
+import { Label, ErrorText, HelperText } from '@/components/common/Form'
+import { Stack, HStack } from '@/components/layout/Stack'
+import { RavenBot } from '@/types/RavenBot/RavenBot'
+import { Box, TextField, Checkbox, Text, Separator, Tooltip, Heading } from '@radix-ui/themes'
+import { useFormContext, Controller } from 'react-hook-form'
+import { BiInfoCircle } from 'react-icons/bi'
+
+type Props = {}
+
+const AIFeaturesBotForm = (props: Props) => {
+    const { register, control, formState: { errors }, watch } = useFormContext<RavenBot>()
+
+    const isAiBot = watch('is_ai_bot')
+
+    const openAIAssistantID = watch('openai_assistant_id')
+
+    return (
+        <Stack gap='4'>
+            <Stack maxWidth={'480px'}>
+                <Box hidden={!openAIAssistantID}>
+                    <Label htmlFor='openai_assistant_id'>OpenAI Assistant ID</Label>
+                    <TextField.Root
+                        id='openai_assistant_id'
+                        {...register('openai_assistant_id')}
+                        readOnly
+                        placeholder="asst_*******************"
+                        aria-invalid={errors.openai_assistant_id ? 'true' : 'false'}
+                    />
+                </Box>
+                {errors.openai_assistant_id && <ErrorText>{errors.openai_assistant_id?.message}</ErrorText>}
+            </Stack>
+            <Stack maxWidth={'480px'}>
+                <Text as="label" size="2">
+                    <HStack>
+                        <Controller
+                            control={control}
+                            name='allow_bot_to_write_documents'
+                            render={({ field }) => (
+                                <Checkbox
+                                    checked={field.value ? true : false}
+                                    onCheckedChange={(v) => field.onChange(v ? 1 : 0)}
+                                />
+                            )} />
+
+                        Allow Bot to Write Documents
+                    </HStack>
+                </Text>
+                <HelperText>
+                    Checking this will allow the bot to create/update/delete documents in the system.
+                </HelperText>
+            </Stack>
+            <Separator className='w-full' />
+            <Stack maxWidth={'560px'}>
+                <Text as="label" size="2">
+                    <HStack align='center'>
+                        <Controller
+                            control={control}
+                            name='enable_file_search'
+                            render={({ field }) => (
+                                <Checkbox
+                                    checked={field.value ? true : false}
+                                    onCheckedChange={(v) => field.onChange(v ? 1 : 0)}
+                                />
+                            )} />
+                        <span>Enable File Search</span>
+                        <Tooltip content='View OpenAI documentation about File Search'>
+                            <a href='https://platform.openai.com/docs/assistants/tools/file-search'
+                                title='View OpenAI documentation about File Search'
+                                aria-label='View OpenAI documentation about File Search'
+                                target='_blank' className='text-gray-11 -mb-1'>
+                                <BiInfoCircle size={16} /></a>
+                        </Tooltip>
+
+                    </HStack>
+                </Text>
+                <HelperText>
+                    Enable this if you want the bot to be able to read PDF files and scan them.
+                    <br /><br />
+                    File search enables the assistant with knowledge from files that you upload.
+                    <br /><br />
+                    Once a file is uploaded, the assistant automatically decides when to retrieve content based on user requests.
+                </HelperText>
+            </Stack>
+            <Separator className='w-full' />
+            <Stack maxWidth={'560px'}>
+                <Text as="label" size="2">
+                    <HStack align='center'>
+                        <Controller
+                            control={control}
+                            name='enable_code_interpreter'
+                            render={({ field }) => (
+                                <Checkbox
+                                    checked={field.value ? true : false}
+                                    onCheckedChange={(v) => field.onChange(v ? 1 : 0)}
+                                />
+                            )} />
+                        <span>Enable Code Interpreter</span>
+                        <Tooltip content='View OpenAI documentation about Code Interpreter'>
+                            <a href='https://platform.openai.com/docs/assistants/tools/code-interpreter'
+                                title='View OpenAI documentation about Code Interpreter'
+                                aria-label='View OpenAI documentation about Code Interpreter'
+                                target='_blank' className='text-gray-11 -mb-1'>
+                                <BiInfoCircle size={16} /></a>
+                        </Tooltip>
+
+                    </HStack>
+                </Text>
+                <HelperText>
+                    Enable this if you want the bot to be able to process files like Excel sheets or data from Insights.
+                    <br />
+                    OpenAI Assistants run code in a sandboxed environment (on OpenAI servers) to do this.
+                </HelperText>
+            </Stack>
+            <Separator className='w-full' />
+            <Heading as='h5' size='2' className='not-cal' weight='medium'>Advanced</Heading>
+            <Stack maxWidth={'560px'}>
+                <Text as="label" size="2">
+                    <HStack align='center'>
+                        <Controller
+                            control={control}
+                            name='debug_mode'
+                            render={({ field }) => (
+                                <Checkbox
+                                    checked={field.value ? true : false}
+                                    onCheckedChange={(v) => field.onChange(v ? 1 : 0)}
+                                />
+                            )} />
+                        <span>Enable Debug Mode</span>
+                    </HStack>
+                </Text>
+                <HelperText>
+                    If enabled, stack traces of errors will be sent as messages by the bot during runs.
+                    <br />
+                    This is helpful when you're testing your bots and want to know where things are going wrong.
+                </HelperText>
+            </Stack>
+
+        </Stack>
+    )
+}
+
+export default AIFeaturesBotForm
\ No newline at end of file
diff --git a/frontend/src/components/feature/settings/ai/bots/BotForm.tsx b/frontend/src/components/feature/settings/ai/bots/BotForm.tsx
new file mode 100644
index 000000000..723b7fa01
--- /dev/null
+++ b/frontend/src/components/feature/settings/ai/bots/BotForm.tsx
@@ -0,0 +1,48 @@
+import { Box, Tabs } from '@radix-ui/themes'
+import { LuFunctionSquare, LuSparkles } from 'react-icons/lu'
+import InstructionField from '../InstructionField'
+import { BiBot, BiFile } from 'react-icons/bi'
+import GeneralBotForm from './GeneralBotForm'
+import AIFeaturesBotForm from './AIFeaturesBotForm'
+import BotFunctionsForm from './BotFunctionsForm'
+import { useFormContext } from 'react-hook-form'
+import { RavenBot } from '@/types/RavenBot/RavenBot'
+
+type Props = {}
+
+const ICON_PROPS = {
+    size: 18,
+    className: 'mr-1.5'
+}
+
+const BotForm = ({ isEdit }: { isEdit: boolean }) => {
+
+    const { watch } = useFormContext<RavenBot>()
+    const isAiBot = watch('is_ai_bot') ? true : false
+    return (
+        <Tabs.Root defaultValue='general'>
+            <Tabs.List>
+                <Tabs.Trigger value='general'><BiBot {...ICON_PROPS} /> General</Tabs.Trigger>
+                {isAiBot ? <Tabs.Trigger value='ai'><LuSparkles {...ICON_PROPS} /> AI</Tabs.Trigger> : null}
+                {isAiBot ? <Tabs.Trigger value='instructions'><BiFile {...ICON_PROPS} /> Instructions</Tabs.Trigger> : null}
+                {isAiBot ? <Tabs.Trigger value='functions'><LuFunctionSquare {...ICON_PROPS} /> Functions</Tabs.Trigger> : null}
+            </Tabs.List>
+            <Box pt='4'>
+                <Tabs.Content value='general'>
+                    <GeneralBotForm />
+                </Tabs.Content>
+                <Tabs.Content value='ai'>
+                    <AIFeaturesBotForm />
+                </Tabs.Content>
+                <Tabs.Content value='instructions'>
+                    <InstructionField allowUsingTemplate instructionRequired={isAiBot ? true : false} />
+                </Tabs.Content>
+                <Tabs.Content value='functions'>
+                    <BotFunctionsForm />
+                </Tabs.Content>
+            </Box>
+        </Tabs.Root>
+    )
+}
+
+export default BotForm
\ No newline at end of file
diff --git a/frontend/src/components/feature/settings/ai/bots/BotFunctionsForm.tsx b/frontend/src/components/feature/settings/ai/bots/BotFunctionsForm.tsx
new file mode 100644
index 000000000..735663b55
--- /dev/null
+++ b/frontend/src/components/feature/settings/ai/bots/BotFunctionsForm.tsx
@@ -0,0 +1,108 @@
+import { HStack, Stack } from '@/components/layout/Stack'
+import { RavenBot } from '@/types/RavenBot/RavenBot'
+import { Badge, Box, Button, Card, IconButton, Link, Popover, Text } from '@radix-ui/themes'
+import React, { useContext } from 'react'
+import { Link as RouterLink } from 'react-router-dom'
+import { useFieldArray, useFormContext } from 'react-hook-form'
+import { BiTrashAlt } from 'react-icons/bi'
+import LinkField from '@/components/common/LinkField/LinkField'
+import { FrappeConfig, FrappeContext } from 'frappe-react-sdk'
+
+type Props = {}
+
+const BotFunctionsForm = (props: Props) => {
+
+    const { control } = useFormContext<RavenBot>()
+
+    const { fields, append, remove } = useFieldArray({
+        control,
+        name: 'bot_functions'
+    })
+
+    const { call } = useContext(FrappeContext) as FrappeConfig
+
+    const [aiFunction, setAiFunction] = React.useState<string>('')
+
+    const onSelect = () => {
+        if (aiFunction) {
+            call.get('frappe.client.get_value', {
+                doctype: 'Raven AI Function',
+                filters: { name: aiFunction },
+                fieldname: ['type', 'description']
+            }).then((res) => {
+                //@ts-expect-error
+                append({
+                    function: aiFunction,
+                    type: res.message.type,
+                    description: res.message.description
+                })
+                setAiFunction('')
+            })
+        }
+
+    }
+    return (
+        <Stack gap='4'>
+            <HStack justify={'between'} align='center'>
+                <Text color='gray' size='2'>
+                    Add functions that the bot can use to create or update documents in the system.
+                    <br />
+                    Create functions in the <Link asChild><RouterLink to='/channel/settings/functions'>function builder</RouterLink></Link> and then add them here.
+                </Text>
+                <Box>
+                    <Popover.Root>
+                        <Popover.Trigger>
+                            <Button size='2' variant='soft'>Add Function</Button>
+                        </Popover.Trigger>
+                        <Popover.Content width="380px" className='relative overflow-visible'>
+                            <Stack>
+                                <LinkField
+                                    doctype='Raven AI Function'
+                                    value={aiFunction}
+                                    filters={[['name', 'not in', fields.map(field => field.function) ?? []] as any]}
+                                    dropdownClass='sm:w-[350px]'
+                                    label='Function'
+                                    setValue={setAiFunction}
+                                />
+                                <HStack justify='end'>
+                                    <Popover.Close>
+                                        <Button type='button' onClick={onSelect}>Add</Button>
+                                    </Popover.Close>
+                                </HStack>
+                            </Stack>
+                        </Popover.Content>
+                    </Popover.Root>
+                </Box>
+            </HStack>
+
+            <Stack>
+
+                {fields?.map((field, index) => (
+                    <Card key={field.id} size='2'>
+                        <HStack justify='between' align='center'>
+                            <Stack gap='1'>
+                                <HStack gap='2' align='center'>
+                                    <Link asChild size='2' weight='bold' className='text-gray-12'>
+                                        <RouterLink to={`/channel/settings/functions/${field.function}`}>{field.function}</RouterLink>
+                                    </Link>
+                                    <Badge color='purple'>{field.type}</Badge>
+                                </HStack>
+                                <Text as='div' size='2' color='gray'>{field.description}</Text>
+                            </Stack>
+                            <IconButton size='2' color='red' variant='ghost'
+                                type='button'
+                                title='Remove'
+                                aria-label='Remove'
+                                mr='1'
+                                onClick={() => remove(index)}><BiTrashAlt size='16' /></IconButton>
+                        </HStack>
+                    </Card>
+                ))}
+            </Stack>
+
+
+        </Stack>
+    )
+}
+
+export default BotFunctionsForm
\ No newline at end of file
diff --git a/frontend/src/components/feature/settings/ai/bots/GeneralBotForm.tsx b/frontend/src/components/feature/settings/ai/bots/GeneralBotForm.tsx
new file mode 100644
index 000000000..5e3b9cf38
--- /dev/null
+++ b/frontend/src/components/feature/settings/ai/bots/GeneralBotForm.tsx
@@ -0,0 +1,77 @@
+import { Label, ErrorText, HelperText } from '@/components/common/Form'
+import { Stack, HStack } from '@/components/layout/Stack'
+import useRavenSettings from '@/hooks/fetchers/useRavenSettings'
+import { RavenBot } from '@/types/RavenBot/RavenBot'
+import { Box, TextArea, Checkbox, Text, TextField } from '@radix-ui/themes'
+import { Controller, useFormContext } from 'react-hook-form'
+import AINotEnabledCallout from '../AINotEnabledCallout'
+
+const GeneralBotForm = () => {
+    const { register, control, formState: { errors } } = useFormContext<RavenBot>()
+
+    const { ravenSettings } = useRavenSettings()
+
+    return (
+        <Stack gap='4'>
+            <Stack maxWidth={'480px'}>
+                <Box>
+                    <Label htmlFor='bot_name' isRequired>Name</Label>
+                    <TextField.Root
+                        id='bot_name'
+                        {...register('bot_name', {
+                            required: 'Name is required',
+                        })}
+                        autoFocus
+                        placeholder="accounts-bot"
+                        aria-invalid={errors.bot_name ? 'true' : 'false'}
+                    />
+                </Box>
+                {errors.bot_name && <ErrorText>{errors.bot_name?.message}</ErrorText>}
+            </Stack>
+
+
+            <Stack>
+                <Box>
+                    <Label htmlFor='description'>Description</Label>
+                    <TextArea
+                        id='description'
+                        {...register('description')}
+                        rows={5}
+                        resize='vertical'
+                        placeholder="A bot to handle accounts"
+                        aria-invalid={errors.description ? 'true' : 'false'}
+                    />
+                </Box>
+                {errors.description && <ErrorText>{errors.description?.message}</ErrorText>}
+            </Stack>
+
+            <AINotEnabledCallout />
+            <Stack maxWidth={'480px'}>
+
+                <Text as="label" size="2">
+                    <HStack>
+                        <Controller
+                            control={control}
+                            disabled={!ravenSettings?.enable_ai_integration}
+                            name='is_ai_bot'
+                            render={({ field }) => (
+                                <Checkbox
+                                    checked={field.value ? true : false}
+                                    disabled={field.disabled}
+                                    onCheckedChange={(v) => field.onChange(v ? 1 : 0)}
+                                />
+                            )} />
+
+                        Is AI Bot
+                    </HStack>
+                </Text>
+                <HelperText>
+                    Check to enable AI features for this bot
+                </HelperText>
+            </Stack>
+
+        </Stack>
+    )
+}
+
+export default GeneralBotForm
\ No newline at end of file
diff --git a/frontend/src/components/feature/settings/ai/functions/DoctypeVariableBuilder.tsx b/frontend/src/components/feature/settings/ai/functions/DoctypeVariableBuilder.tsx
new file mode 100644
index 000000000..c6d8d3bd6
--- /dev/null
+++ b/frontend/src/components/feature/settings/ai/functions/DoctypeVariableBuilder.tsx
@@ -0,0 +1,312 @@
+import { HStack, Stack } from '@/components/layout/Stack'
+import useDoctypeMeta from '@/hooks/useDoctypeMeta'
+import { RavenAIFunction } from '@/types/RavenAI/RavenAIFunction'
+import { RavenAIFunctionParams } from '@/types/RavenAI/RavenAIFunctionParams'
+import { in_list } from '@/utils/validations'
+import { Badge, Button, Card, Dialog, IconButton, Separator, Text, Tooltip, VisuallyHidden } from '@radix-ui/themes'
+import { useFieldArray, UseFieldArrayUpdate, useFormContext } from 'react-hook-form'
+import { BiTrashAlt } from 'react-icons/bi'
+import { FiEdit } from 'react-icons/fi'
+import DocTypeVariableForm from './DoctypeVariableDialogForm'
+import { useMemo, useState } from 'react'
+import { getTextAndColorForFieldType } from './utils'
+import { DocField } from '@/types/Core/DocField'
+import clsx from 'clsx'
+
+type Props = {}
+
+const DoctypeVariableBuilder = (props: Props) => {
+
+    const { control, getValues, setValue, watch } = useFormContext<RavenAIFunction>()
+
+    const type = watch('type')
+    const doctype = watch('reference_doctype')
+
+    if (in_list(["Create Document", "Update Document", "Create Multiple Documents", "Update Multiple Documents"], type) && doctype) {
+        return (
+            <VariableList doctype={doctype} />
+        )
+    }
+
+    return null
+}
+
+export default DoctypeVariableBuilder
+
+
+const VariableList = ({ doctype }: { doctype: string }) => {
+
+    const { control } = useFormContext<RavenAIFunction>()
+
+    const { fields, append, remove, update } = useFieldArray({
+        control,
+        name: 'parameters'
+    })
+
+    const addField = (data: Partial<RavenAIFunctionParams>) => {
+        // @ts-expect-error
+        append(data)
+    }
+
+    return <Stack>
+        <HStack justify='end' align='center'>
+            <ImportDoctypeVariables doctype={doctype} append={addField} />
+            <AddDoctypeVariableDialog onAdd={addField} doctype={doctype} />
+        </HStack>
+
+        <Stack>
+            {fields.map((field, index) => {
+                return <FieldRow key={field.id} field={field} index={index}
+                    update={update}
+                    remove={remove} doctype={doctype} />
+            })}
+        </Stack>
+    </Stack>
+
+}
+
+const FieldRow = ({ field, index, remove, doctype, update }: { field: RavenAIFunctionParams, index: number, remove: (index: number) => void, doctype: string, update: UseFieldArrayUpdate<RavenAIFunction, "parameters"> }) => {
+
+    const { doc: doctypeMeta } = useDoctypeMeta(doctype)
+    const onEdit = (data: Partial<RavenAIFunctionParams>) => {
+        update(index, data as RavenAIFunctionParams)
+    }
+
+
+
+    const { options, type } = useMemo(() => {
+
+        if (field.child_table_name) {
+            const docfield = doctypeMeta?.fields?.find(f => f.fieldname === field.child_table_name)
+
+            return {
+                options: docfield?.options,
+                type: docfield?.fieldtype
+            }
+        } else {
+            const docfield = doctypeMeta?.fields?.find(f => f.fieldname === field.fieldname)
+
+            return {
+                label: docfield?.label,
+                options: docfield?.options,
+                type: docfield?.fieldtype
+            }
+
+        }
+
+
+
+    }, [field.child_table_name, field.fieldname, doctypeMeta])
+
+    return <Card className={clsx({
+        'bg-gray-6': field.do_not_ask_ai,
+    })}>
+        <HStack justify={'between'}>
+            <Stack>
+                <HStack align='center' gap='2'>
+                    <Text className='font-semibold' size='2'>{field.fieldname}</Text>
+                    <Separator orientation='vertical' />
+                    <HStack align='center'>
+                        <Badge {...getTextAndColorForFieldType(field.type)} className='rounded-md' />
+                        {field.required ? <Badge color='red' className='rounded-md'>Required</Badge> : null}
+                        {field.options ?
+                            <Tooltip content={field.options.split('\n').join(', ')}>
+                                <Badge color='blue' className='rounded-md'>{field.options.split('\n').length} Options</Badge>
+                            </Tooltip>
+                            : null}
+                        {field.do_not_ask_ai ? <Badge color='gray' className='rounded-md'>Do not ask AI</Badge> : null}
+                    </HStack>
+                </HStack>
+                <Text size='2'>{field.description}</Text>
+
+                <HStack align='center' gap='2'>
+                    {field.default_value ? <Text size='2' color='gray'>Default Value: {field.default_value}</Text> : null}
+                    {field.default_value && field.child_table_name ? <Separator orientation='vertical' /> : null}
+                    {field.child_table_name && in_list(['Table', 'Table MultiSelect'], type) ? <Text size='2' color='gray'>Child Table: {options} ({field.child_table_name})</Text> : null}
+                </HStack>
+            </Stack>
+
+            <HStack align='center' pr='2' gap='4'>
+                <EditDoctypeVariableDialog onEdit={onEdit} field={field} doctype={doctype} />
+                <IconButton
+                    size='2'
+                    color='red'
+                    variant='ghost'
+                    type='button'
+                    onClick={() => remove(index)}>
+                    <BiTrashAlt size='16' />
+                </IconButton>
+            </HStack>
+        </HStack>
+
+
+    </Card>
+}
+
+const AddDoctypeVariableDialog = ({ onAdd, doctype }: { onAdd: (data: Partial<RavenAIFunctionParams>) => void, doctype: string }) => {
+
+    const [open, setOpen] = useState(false)
+
+    const onAddField = (data: Partial<RavenAIFunctionParams>) => {
+        onAdd(data)
+        setOpen(false)
+    }
+
+
+    return <Dialog.Root open={open} onOpenChange={setOpen}>
+        <Dialog.Trigger>
+            <Button variant='solid' type='button' className='not-cal'>Add</Button>
+        </Dialog.Trigger>
+        <Dialog.Content>
+            <Dialog.Title>Add Variable</Dialog.Title>
+            <VisuallyHidden>
+                <Dialog.Description>Add a new variable in the function.</Dialog.Description>
+            </VisuallyHidden>
+            <DocTypeVariableForm doctype={doctype} onAdd={onAddField} />
+        </Dialog.Content>
+    </Dialog.Root>
+}
+
+const EditDoctypeVariableDialog = ({ onEdit, field, doctype }: { onEdit: (data: Partial<RavenAIFunctionParams>) => void, field: RavenAIFunctionParams, doctype: string }) => {
+
+    const [open, setOpen] = useState(false)
+
+    const onEditField = (data: Partial<RavenAIFunctionParams>) => {
+        onEdit(data)
+        setOpen(false)
+    }
+
+
+
+    return <Dialog.Root open={open} onOpenChange={setOpen}>
+        <Dialog.Trigger>
+            <IconButton
+                size='2'
+                color='gray'
+                variant='ghost'
+                type='button'
+            >
+                <FiEdit size='16' className='text-gray-10' />
+            </IconButton>
+        </Dialog.Trigger>
+        <Dialog.Content>
+            <Dialog.Title>Edit Variable</Dialog.Title>
+            <VisuallyHidden>
+                <Dialog.Description>Edit variable - {field.fieldname} in the function.</Dialog.Description>
+            </VisuallyHidden>
+            <DocTypeVariableForm doctype={doctype} onAdd={onEditField} defaultValues={field} />
+        </Dialog.Content>
+    </Dialog.Root>
+}
+
+
+const ImportDoctypeVariables = ({ doctype, append }: { doctype: string, append: (data: Partial<RavenAIFunctionParams>) => void }) => {
+
+    const { getValues, setValue } = useFormContext<RavenAIFunction>()
+
+    const { doc: doctypeMeta, childDocs } = useDoctypeMeta(doctype)
+
+    const getFieldInfoFromDocField = (field: DocField, childDoctypeName?: string) => {
+        let description = field.label ?? field.fieldname ?? ''
+
+        let options = ''
+        let type: RavenAIFunctionParams['type'] = 'string'
+
+        if (field.fieldtype === 'Select') {
+            // Need to set the options
+            options = field.options ?? ''
+        }
+
+        if (in_list(['Int', 'Rating'], field.fieldtype)) {
+            type = 'integer'
+        }
+
+        if (in_list(['Float', 'Currency', 'Percent'], field.fieldtype)) {
+            type = 'number'
+        }
+
+        if (field.fieldtype === 'Percent') {
+            description = `${field.label} in percentage (between 0 and 100)`
+        }
+
+        if (field.fieldtype === 'Check') {
+            type = 'boolean'
+        }
+
+        if (field.fieldtype === 'Date') {
+            description = `${field.label} in YYYY-MM-DD format`
+        }
+
+        if (field.fieldtype === 'Datetime') {
+            description = `${field.label} in YYYY-MM-DD HH:mm:ss format`
+        }
+
+        if (field.fieldtype === 'Time') {
+            description = `${field.label} in HH:mm:ss format`
+        }
+
+        if (childDoctypeName) {
+            description += ` in ${childDoctypeName}`
+        }
+
+        return {
+            fieldname: field.fieldname,
+            description,
+            options,
+            type,
+            required: field.reqd,
+        }
+    }
+
+    const getRequiredFieldsForChildTable = (childTable: string, fieldname: string) => {
+        // Fetch the child table meta
+        const childTableMeta = childDocs?.find(d => d.name === childTable)
+
+        if (childTableMeta) {
+            return childTableMeta.fields?.filter(f => f.reqd).map(f => ({
+                ...getFieldInfoFromDocField(f, childTableMeta.name),
+                child_table_name: fieldname
+            })) || []
+        }
+
+        return []
+    }
+
+    const importFields = () => {
+
+        const fields = getValues('parameters') || []
+
+        // We need to get all required fields from the doctype
+        const requiredFields = doctypeMeta?.fields?.filter(f => f.reqd)
+
+        // Filter out the table fields
+        const nonTableFields = requiredFields?.filter(f => f.fieldtype !== 'Table' && f.fieldtype !== 'Table MultiSelect')
+
+        // We need to check if the field already exists
+        const existingFields = fields.map(f => f.fieldname)
+
+        const regularFieldsToBeAdded = nonTableFields?.filter(f => !existingFields.includes(f.fieldname ?? '')).map((f) => getFieldInfoFromDocField(f)) || []
+
+        const requiredTableFields = requiredFields?.filter(f => f.fieldtype === 'Table' || f.fieldtype === 'Table MultiSelect')
+
+        const requiredTableFieldsFlattened = (requiredTableFields?.map(f => getRequiredFieldsForChildTable(f.options ?? '', f.fieldname ?? '')) ?? []).flat()
+
+        // Filter out the child table fields that are already added
+        const tableFieldsToBeAdded = requiredTableFieldsFlattened?.filter(f => {
+            // Check if the field already exists - use both the fieldname and the child_table_name
+            const exists = fields.some(field => field.fieldname === f.fieldname && field.child_table_name === f.child_table_name)
+            return !exists
+        })
+
+        const allFieldsToBeAdded = [...regularFieldsToBeAdded, ...tableFieldsToBeAdded]
+
+        // We need to add the fields to the form
+        allFieldsToBeAdded?.forEach((field) => {
+            append(field)
+        })
+    }
+
+
+    return <Button variant='outline' type='button' className='not-cal' onClick={importFields}>Import fields from {doctype}</Button>
+
+}
\ No newline at end of file
diff --git a/frontend/src/components/feature/settings/ai/functions/DoctypeVariableDialogForm.tsx b/frontend/src/components/feature/settings/ai/functions/DoctypeVariableDialogForm.tsx
new file mode 100644
index 000000000..29d18bd5f
--- /dev/null
+++ b/frontend/src/components/feature/settings/ai/functions/DoctypeVariableDialogForm.tsx
@@ -0,0 +1,557 @@
+import { ErrorText, HelperText, Label } from "@/components/common/Form"
+import { HStack, Stack } from "@/components/layout/Stack"
+import useDoctypeMeta from "@/hooks/useDoctypeMeta"
+import { DocField } from "@/types/Core/DocField"
+import { RavenAIFunctionParams } from "@/types/RavenAI/RavenAIFunctionParams"
+import { in_list } from "@/utils/validations"
+import { Badge, Box, Button, Callout, Checkbox, Dialog, Popover, ScrollArea, Select, Text, TextArea, TextField } from "@radix-ui/themes"
+import { FrappeConfig, FrappeContext, useFrappeGetCall, useSearch } from "frappe-react-sdk"
+import { useContext, useMemo, useState } from "react"
+import { Controller, FormProvider, useController, useForm, useFormContext } from "react-hook-form"
+import { BiSearch } from "react-icons/bi"
+
+const DocTypeVariableForm = ({ doctype, onAdd, defaultValues }: { doctype: string, onAdd: (data: Partial<RavenAIFunctionParams>) => void, defaultValues?: Partial<RavenAIFunctionParams> }) => {
+
+    const methods = useForm<RavenAIFunctionParams>({
+        defaultValues: {
+            ...defaultValues,
+            child_table_name: defaultValues?.child_table_name ? defaultValues?.child_table_name : doctype
+        }
+    })
+
+    const { handleSubmit } = methods
+
+    const onSubmit = (data: RavenAIFunctionParams) => {
+        if (data.child_table_name === doctype) {
+            onAdd({
+                ...data,
+                child_table_name: ''
+            })
+        } else {
+            onAdd(data)
+        }
+    }
+
+    return <form onSubmit={handleSubmit(onSubmit)}>
+        <FormProvider {...methods}>
+            <Stack gap='4' className='max-h-[75vh] overflow-y-auto px-0.5'>
+                <Stack gap='4'>
+                    <HStack>
+                        <TableSelectionField doctype={doctype} />
+                        <FieldSelectionField doctype={doctype} />
+                    </HStack>
+
+                    <OtherFormFields />
+
+                    <HStack>
+                        <OptionsField doctype={doctype} />
+
+                    </HStack>
+
+                </Stack>
+
+                <HStack justify='end'>
+                    <Dialog.Close>
+                        <Button variant='soft' color='gray'>Close</Button>
+                    </Dialog.Close>
+                    <Button type='button' onClick={handleSubmit(onSubmit)}>Add</Button>
+                </HStack>
+            </Stack>
+        </FormProvider>
+    </form>
+}
+
+export default DocTypeVariableForm
+
+
+const TableSelectionField = ({ doctype }: { doctype: string }) => {
+
+    const { control, setValue } = useFormContext<RavenAIFunctionParams>()
+    const { doc: doctypeMeta } = useDoctypeMeta(doctype)
+
+    const tableFields = useMemo(() => {
+
+        if (!doctypeMeta) return []
+
+        return doctypeMeta.fields?.filter((field) => field.fieldtype === 'Table' || field.fieldtype === "Table MultiSelect")
+
+    }, [doctypeMeta])
+
+    const onChange = () => {
+        setValue('fieldname', '')
+        setValue('description', '')
+        setValue('options', '')
+        setValue('type', 'string')
+        setValue('required', 0)
+    }
+
+    return <Box width='50%'>
+        <Label isRequired htmlFor='child_table_name'>DocType</Label>
+        <Controller
+            control={control}
+            name='child_table_name'
+            rules={{ onChange }}
+            render={({ field }) => (
+                <Select.Root required value={field.value} onValueChange={field.onChange} disabled={tableFields?.length === 0}>
+                    <Select.Trigger className='w-full' />
+                    <Select.Content>
+                        <Select.Item value={doctype}>{doctype}</Select.Item>
+                        {tableFields?.map((field) => (
+                            <Select.Item key={field.fieldname} value={field.fieldname ?? ''}>{field.options ?? ''} ({field.fieldname})</Select.Item>
+                        ))}
+                    </Select.Content>
+                </Select.Root>
+            )}
+        />
+    </Box>
+}
+
+const VALID_FIELD_TYPES: DocField['fieldtype'][] = [
+    'Autocomplete',
+    'Check',
+    'Code',
+    'Currency',
+    'Data',
+    'Date',
+    'Datetime',
+    'Float',
+    'HTML Editor',
+    'Markdown Editor',
+    'Int',
+    'JSON',
+    'Select',
+    'Text',
+    'Text Editor',
+    'Time',
+    'Phone',
+    'Percent',
+    'Long Text',
+    'Small Text',
+    'Rating',
+    'Link',
+    'Dynamic Link'
+]
+
+/** Component to select a field of a doctype and autofill the rest of the form. */
+const FieldSelectionField = ({ doctype }: { doctype: string }) => {
+
+    const { control, watch, setValue } = useFormContext<RavenAIFunctionParams>()
+
+    const tableField = watch('child_table_name')
+
+    const { field: { value, onChange } } = useController({
+        control,
+        name: 'fieldname',
+        rules: {
+            required: 'Field is required'
+        }
+    })
+
+    const { doc: doctypeMeta } = useDoctypeMeta(doctype)
+
+    const doctypeName = useMemo(() => {
+
+        // If the table field is the main doctype, then we need to show the fields of the doctype. Else we need to show the fields of the child table.
+        if (doctype === tableField) {
+            return doctype
+        }
+
+        let childDocTypeName = doctypeMeta?.fields?.find((field) => field.fieldname === tableField)?.options
+
+        if (childDocTypeName) {
+            return childDocTypeName
+        }
+
+        return doctype
+
+    }, [doctypeMeta, doctype, tableField])
+
+
+    const onFieldSelect = (field: DocField) => {
+
+        onChange(field.fieldname ?? '')
+
+        let description = field.label ?? field.fieldname ?? ''
+        let options = ''
+        let type: RavenAIFunctionParams['type'] = 'string'
+
+        if (field.fieldtype === 'Select') {
+            // Need to set the options
+            options = field.options ?? ''
+        }
+
+        if (in_list(['Int', 'Rating'], field.fieldtype)) {
+            type = 'integer'
+        }
+
+        if (in_list(['Float', 'Currency', 'Percent'], field.fieldtype)) {
+            type = 'number'
+        }
+
+        if (field.fieldtype === 'Percent') {
+            description = `${field.label} in percentage (between 0 and 100)`
+        }
+
+        if (field.fieldtype === 'Check') {
+            type = 'boolean'
+        }
+
+        if (field.fieldtype === 'Date') {
+            description = `${field.label} in YYYY-MM-DD format`
+        }
+
+        if (field.fieldtype === 'Datetime') {
+            description = `${field.label} in YYYY-MM-DD HH:mm:ss format`
+        }
+
+        if (field.fieldtype === 'Time') {
+            description = `${field.label} in HH:mm:ss format`
+        }
+
+        setValue('description', description)
+        setValue('options', options)
+        setValue('type', type)
+
+        setValue('required', field.reqd ?? 0)
+
+    }
+
+    // If the table field is the main doctype, then we need to show the fields of the doctype. Else we need to show the fields of the child table.
+
+
+    return <DoctypeFieldSelect
+        doctype={doctypeName}
+        value={value}
+        onFieldSelect={onFieldSelect} />
+}
+
+/**
+ * Component to render a select field for the fields of a doctype. Could be the main doctype or a child table.
+ */
+const DoctypeFieldSelect = ({ doctype, value, onFieldSelect }: { doctype: string, value: string, onFieldSelect: (field: DocField) => void }) => {
+
+    const { doc: doctypeMeta } = useDoctypeMeta(doctype)
+
+    const fields = useMemo(() => {
+
+        if (!doctypeMeta) return []
+
+        return doctypeMeta.fields?.filter((field) => in_list(VALID_FIELD_TYPES, field.fieldtype))
+
+    }, [doctypeMeta])
+
+    const onValueChange = (value: string) => {
+
+        onFieldSelect(fields?.find((field) => field.fieldname === value) as DocField)
+
+    }
+
+    return <Box width='50%'>
+        <Label isRequired htmlFor='fieldname'>Field</Label>
+        <Select.Root value={value} onValueChange={onValueChange} required>
+            <Select.Trigger placeholder="Select Field" className='w-full' name='fieldname' />
+            <Select.Content>
+                {fields?.map((field) => (
+                    <Select.Item key={field.fieldname} value={field.fieldname ?? ''}>{field.label} ({field.fieldname}) <Badge size='1' color='gray'>{field.fieldtype}</Badge></Select.Item>
+                ))}
+            </Select.Content>
+        </Select.Root>
+    </Box>
+
+}
+
+const OtherFormFields = () => {
+    const { control, register, formState: { errors }, watch } = useFormContext<RavenAIFunctionParams>()
+
+    const do_not_ask_ai = watch('do_not_ask_ai')
+
+
+    return <Stack gap='4'>
+
+        <HStack>
+            <Box width='50%'>
+                <Stack gap='4'>
+                    <Stack>
+                        <Box>
+                            <Label isRequired>Variable Type</Label>
+                            <Controller
+                                control={control}
+                                name='type'
+                                rules={{ required: "Type is required" }}
+                                render={({ field }) => (
+                                    <Select.Root required value={field.value} onValueChange={(value) => field.onChange(value as 'object' | 'array' | 'string' | 'number' | 'boolean')}>
+                                        <Select.Trigger placeholder='Select a variable type' className='w-full' />
+                                        <Select.Content>
+                                            <Select.Item value='string'>String</Select.Item>
+                                            <Select.Item value='integer'>Integer</Select.Item>
+                                            <Select.Item value='number'>Number</Select.Item>
+                                            <Select.Item value='boolean'>Boolean</Select.Item>
+                                        </Select.Content>
+                                    </Select.Root>
+                                )}
+                            />
+                        </Box>
+                        {errors.type && <ErrorText>{errors.type?.message}</ErrorText>}
+                    </Stack>
+
+                    <Box>
+                        <Controller
+                            control={control}
+                            name='required'
+                            render={({ field }) => (
+                                <Text as="label" size="2">
+                                    <HStack>
+                                        <Checkbox
+                                            checked={field.value ? true : false}
+                                            onCheckedChange={(v) => field.onChange(v ? 1 : 0)}
+                                        />
+                                        Required
+                                    </HStack>
+                                </Text>
+                            )}
+                        />
+                    </Box>
+
+                    <Box>
+                        <Controller
+                            control={control}
+                            name='do_not_ask_ai'
+                            render={({ field }) => (
+                                <Text as="label" size="2">
+                                    <HStack>
+                                        <Checkbox
+                                            checked={field.value ? true : false}
+                                            onCheckedChange={(v) => field.onChange(v ? 1 : 0)}
+                                        />
+                                        Do not ask AI to fill this field?
+                                    </HStack>
+                                </Text>
+                            )}
+                        />
+                    </Box>
+
+                </Stack>
+
+            </Box>
+            <Box width='50%'>
+                <Stack gap='1'>
+                    <Box>
+                        <Label htmlFor='default_value' isRequired={do_not_ask_ai ? true : false}>Default Value</Label>
+                        <TextField.Root
+                            {...register('default_value', {
+                                required: do_not_ask_ai ? "Default value is required if AI is not asked to fill this field" : false
+                            })}
+                        />
+                    </Box>
+                    {errors.default_value && <ErrorText>{errors.default_value?.message}</ErrorText>}
+                    <HelperText>You can specify a default value for this variable. If the AI does not fill this field, then the default value will be used.</HelperText>
+                </Stack>
+            </Box>
+
+
+        </HStack>
+
+        <Stack gap='1'>
+            <Box>
+                <Label htmlFor='description' isRequired>Description</Label>
+                <TextArea
+                    {...register('description', {
+                        required: true
+                    })}
+                    placeholder='Enter a description for this variable'
+                />
+            </Box>
+            {errors.description && <ErrorText>{errors.description?.message}</ErrorText>}
+            <HelperText>This is used to describe what this variable is used for. A better description will help the AI Bot perform better.</HelperText>
+        </Stack>
+
+    </Stack>
+}
+
+const OptionsField = ({ doctype }: { doctype: string }) => {
+
+    const { register, watch, formState: { errors } } = useFormContext<RavenAIFunctionParams>()
+
+    const fieldname = watch('fieldname')
+
+    const child_table_name = watch('child_table_name')
+
+    const { doc: doctypeMeta } = useDoctypeMeta(doctype)
+
+
+    const doctypeName = useMemo(() => {
+
+        // If the table field is the main doctype, then we need to show the fields of the doctype. Else we need to show the fields of the child table.
+        if (doctype === child_table_name) {
+            return doctype
+        }
+
+        let childDocTypeName = doctypeMeta?.fields?.find((field) => field.fieldname === child_table_name)?.options
+
+        if (childDocTypeName) {
+            return childDocTypeName
+        }
+
+        return doctype
+
+    }, [doctypeMeta, doctype, child_table_name, fieldname])
+
+
+    return <Stack gap='1' width='100%'>
+        <Box width='100%'>
+            <Label htmlFor='options'>Options</Label>
+            <TextArea
+                {...register('options')}
+                rows={5}
+                placeholder={`Add options separated by a new line.`}
+            />
+        </Box>
+        {errors.options && <ErrorText>{errors.options?.message}</ErrorText>}
+        <HelperText>You can limit the values that the bot can fill in this field by adding options.<br />This helps the bot to make less mistakes.</HelperText>
+        <Box pt='2'>
+            {fieldname && <OptionsAutoFill
+
+                doctype={doctypeName}
+                fieldname={fieldname}
+
+            />
+            }
+        </Box>
+
+    </Stack>
+
+}
+
+const OptionsAutoFill = ({ doctype, fieldname }: { doctype: string, fieldname: string }) => {
+
+    const { doc: doctypeMeta } = useDoctypeMeta(doctype)
+
+
+    const linkDoctypeName = useMemo(() => {
+
+        if (!doctypeMeta) return ''
+
+        return doctypeMeta.fields?.find((field) => field.fieldtype === 'Link' && field.fieldname === fieldname)?.options ?? ''
+
+    }, [doctypeMeta, fieldname])
+
+
+    const { setValue } = useFormContext<RavenAIFunctionParams>()
+
+    const { db } = useContext(FrappeContext) as FrappeConfig
+
+    const { data } = useFrappeGetCall<{ message: number }>('frappe.desk.reportview.get_count', {
+        doctype: linkDoctypeName,
+        limit: 21
+    }, linkDoctypeName ? undefined : null)
+
+
+
+    const autoFillOptions = () => {
+
+        db.getDocList(linkDoctypeName, {
+            fields: ['name']
+        }).then((options) => {
+            setValue('options', options.map((option) => option.name).join('\n'))
+        })
+
+    }
+
+    if (!linkDoctypeName || !data || data?.message === 0) {
+        return null
+    }
+
+    // Allow the user to select the options from the list
+    if (data?.message === 21) {
+        return <Callout.Root className="block" size='1'>
+            <HStack align='center' width='100%' justify='between'>
+                <Callout.Text weight={'medium'}>
+                    Quickly import {linkDoctypeName}s?
+                </Callout.Text>
+                <Box>
+                    <QuickImportPopover doctype={linkDoctypeName} />
+                </Box>
+
+            </HStack>
+        </Callout.Root>
+    }
+
+    return <Callout.Root className="block" size='1'>
+        <HStack align='center' width='100%' justify='between'>
+            <Callout.Text>
+                There are only {data?.message} options in {linkDoctypeName}.
+                <br />Do you want to autofill these as options?
+            </Callout.Text>
+            <Box>
+                <Button
+                    type='button'
+                    variant='surface'
+                    className="not-cal"
+                    onClick={autoFillOptions}
+                >
+                    Auto Fill Options
+                </Button>
+            </Box>
+
+        </HStack>
+    </Callout.Root>
+}
+
+const QuickImportPopover = ({ doctype }: { doctype: string }) => {
+
+    const [searchText, setSearchText] = useState('')
+
+    const { data } = useSearch(doctype, searchText, undefined, 15)
+
+    const { setValue, getValues } = useFormContext<RavenAIFunctionParams>()
+
+    const addToList = (value: string) => {
+        const options = getValues('options') || ''
+
+        let optionsArray: string[] = []
+
+        if (options) {
+            optionsArray = options.split('\n')
+        } else {
+            optionsArray = []
+        }
+        // Check if the value is already in the options
+        if (optionsArray.includes(value)) {
+            return
+        } else {
+            const newOptions = [...optionsArray, value]
+            setValue('options', newOptions.join('\n'))
+        }
+    }
+
+    return <Popover.Root>
+        <Popover.Trigger>
+            <Button
+                type='button'
+                variant='surface'
+                className="not-cal"
+            >
+                Select {doctype}s
+            </Button>
+        </Popover.Trigger>
+        <Popover.Content width='360px'>
+            <Stack>
+                <TextField.Root value={searchText} onChange={(e) => setSearchText(e.target.value)}>
+                    <TextField.Slot side='left'>
+                        <BiSearch />
+                    </TextField.Slot>
+                </TextField.Root>
+                <ScrollArea style={{ height: 360 }}>
+                    {data?.message?.slice(0, 15).map((item) => <Stack gap='0'
+                        role='button'
+                        className="hover:bg-gray-2 px-2 py-1.5 rounded-md cursor-pointer"
+                        onClick={() => addToList(item.value)} key={item.value}>
+                        <Text size='2' weight='medium'>{item.value}</Text>
+                        {item.description && <Text size='1' weight='light'>{item.description}</Text>}
+                    </Stack>)}
+                </ScrollArea>
+            </Stack>
+        </Popover.Content>
+    </Popover.Root>
+
+}
\ No newline at end of file
diff --git a/frontend/src/components/feature/settings/ai/functions/FunctionConstants.ts b/frontend/src/components/feature/settings/ai/functions/FunctionConstants.ts
new file mode 100644
index 000000000..2e32737cf
--- /dev/null
+++ b/frontend/src/components/feature/settings/ai/functions/FunctionConstants.ts
@@ -0,0 +1,112 @@
+export const FUNCTION_TYPES = [
+    {
+        value: "Get Document",
+        description: "Fetch any document from the system.",
+        requires_write_permissions: false,
+        type: "Standard"
+    },
+    {
+        value: "Get Multiple Documents",
+        description: "Fetch multiple document from the system",
+        requires_write_permissions: false,
+        type: "Bulk Operations"
+    },
+    // {
+    //     value: "Get List",
+    //     description: "Fetch a list of documents from the system (using filters).",
+    //     requires_write_permissions: false,
+    //     type: "Standard"
+    // },
+    {
+        value: "Create Document",
+        description: "Create any document in the system.",
+        requires_write_permissions: true,
+        type: "Standard"
+    },
+    {
+        value: "Create Multiple Documents",
+        description: "Create multiple documents in the system in one go.",
+        requires_write_permissions: true,
+        type: "Bulk Operations"
+    },
+    {
+        value: "Update Document",
+        description: "Update any document in the system.",
+        requires_write_permissions: true,
+        type: "Standard"
+    },
+    {
+        value: "Update Multiple Documents",
+        description: "Update multiple documents in the system in one go.",
+        requires_write_permissions: true,
+        type: "Bulk Operations"
+    },
+    {
+        value: "Delete Document",
+        description: "Delete any document in the system.",
+        requires_write_permissions: true,
+        type: "Standard"
+    },
+    {
+        value: "Delete Multiple Documents",
+        description: "Delete multiple documents in the system in one go.",
+        requires_write_permissions: true,
+        type: "Bulk Operations"
+    },
+    {
+        value: "Custom Function",
+        description: "Custom function to be used in the system.",
+        type: "Other"
+    },
+    // { 
+    //     value: "Send Message",
+    //     description: "Function allows the bot to send a message to any user or channel in the system.",
+    //     requires_write_permissions: true
+    // },
+    {
+        value: "Attach File to Document",
+        description: "Attach a file to any document.",
+        requires_write_permissions: true,
+        type: "Other"
+    },
+    // {
+    //     value: "Get Report Result",
+    //     description: "Allows the bot to get the result of any report in the system.",
+    //     requires_write_permissions: true
+    // },
+]
+
+export type VariableType = StringVariableType | NumberVariableType | BooleanVariableType | ObjectVariableType | ArrayVariableType
+
+export interface BaseVariableType {
+    type: 'string' | 'number' | 'boolean' | 'object' | 'array' | 'null'
+    description?: string
+
+}
+
+export interface StringVariableType extends BaseVariableType {
+    type: 'string',
+    enum?: string[],
+}
+
+export interface NumberVariableType extends BaseVariableType {
+    type: 'number',
+    enum?: string[]
+}
+
+interface BooleanVariableType extends BaseVariableType {
+    type: 'boolean'
+}
+
+
+export interface ObjectVariableType extends BaseVariableType {
+    type: 'object'
+    properties: Record<string, VariableType>,
+    required?: string[]
+}
+
+export interface ArrayVariableType extends BaseVariableType {
+    type: 'array'
+    items: StringVariableType | NumberVariableType,
+    minItems?: number
+}
\ No newline at end of file
diff --git a/frontend/src/components/feature/settings/ai/functions/FunctionForm.tsx b/frontend/src/components/feature/settings/ai/functions/FunctionForm.tsx
new file mode 100644
index 000000000..fc7d75d88
--- /dev/null
+++ b/frontend/src/components/feature/settings/ai/functions/FunctionForm.tsx
@@ -0,0 +1,359 @@
+import { Label, ErrorText, HelperText } from '@/components/common/Form'
+import { Stack, HStack } from '@/components/layout/Stack'
+import { RavenAIFunction } from '@/types/RavenAI/RavenAIFunction'
+import { Box, Checkbox, Text, TextField, Select, TextArea, Tabs, Grid } from '@radix-ui/themes'
+import { Controller, useFormContext } from 'react-hook-form'
+import { FUNCTION_TYPES } from './FunctionConstants'
+import { ChangeEvent } from 'react'
+import VariableBuilder from './VariableBuilder'
+import LinkFormField from '@/components/common/LinkField/LinkFormField'
+import AINotEnabledCallout from '../AINotEnabledCallout'
+import DoctypeVariableBuilder from './DoctypeVariableBuilder'
+import { LuFunctionSquare, LuVariable } from 'react-icons/lu'
+import { in_list } from '@/utils/validations'
+
+const ICON_PROPS = {
+    size: 18,
+    className: 'mr-1.5'
+}
+
+const FunctionForm = ({ isEdit }: { isEdit?: boolean }) => {
+
+    const { watch } = useFormContext<RavenAIFunction>()
+    const type = watch('type')
+
+    return (
+        <Tabs.Root defaultValue='function_details'>
+            <Tabs.List>
+                <Tabs.Trigger value='function_details'><LuFunctionSquare {...ICON_PROPS} /> Details</Tabs.Trigger>
+                <Tabs.Trigger value='variables' disabled={in_list(["Get Document", "Get Multiple Documents", "Delete Document", "Delete Multiple Documents", "Attach File to Document"], type)}><LuVariable {...ICON_PROPS} /> Variables</Tabs.Trigger>
+            </Tabs.List>
+            <Box pt='4'>
+                <AINotEnabledCallout />
+                <Tabs.Content value='function_details'>
+                    <GeneralFunctionDetails isEdit={isEdit} />
+                </Tabs.Content>
+                <Tabs.Content value='variables'>
+                    <VariableSection />
+                </Tabs.Content>
+            </Box>
+        </Tabs.Root>
+
+    )
+}
+
+const GeneralFunctionDetails = ({ isEdit }: { isEdit?: boolean }) => {
+
+    const { register, control, formState: { errors }, setValue } = useFormContext<RavenAIFunction>()
+
+    const onFunctionChange = (event: ChangeEvent<HTMLSelectElement>) => {
+
+        const functionDef = FUNCTION_TYPES.find(f => f.value === event.target.value)
+
+        if (event.target.value === 'Attach File to Document') {
+            setValue('reference_doctype', '')
+            setValue('function_name', 'attach_file_to_document')
+            setValue('description', "This function attaches a file to a document in the system. Call this function after you have created or updated the document.")
+        }
+
+        if (functionDef) {
+            if (functionDef.requires_write_permissions !== undefined) {
+                setValue('requires_write_permissions', functionDef.requires_write_permissions ? 1 : 0)
+            }
+
+            if (functionDef.value !== 'Custom Function') {
+                setValue('function_path', '')
+            }
+        }
+    }
+    return <Stack gap='4'>
+
+        <Grid columns={'2'} gap='4'>
+            <Stack>
+                <Box>
+                    <Label htmlFor='type' isRequired>Type</Label>
+                    <Controller
+                        control={control}
+                        name='type'
+                        rules={{
+                            required: 'Type is required',
+                            onChange: onFunctionChange
+                        }}
+                        render={({ field }) => (
+                            <Select.Root value={field.value} name={field.name} onValueChange={(value) => field.onChange(value)}>
+                                <Select.Trigger placeholder='Pick a function type' className='w-full' autoFocus />
+                                <Select.Content>
+                                    <Select.Group>
+                                        <Select.Label className='pl-3'>Standard</Select.Label>
+                                        {FUNCTION_TYPES.filter(f => f.type === "Standard").map(f => <Select.Item value={f.value} key={f.value}>{f.value}</Select.Item>)}
+                                    </Select.Group>
+
+                                    <Select.Group>
+                                        <Select.Label className='pl-3'>Miscellaneous</Select.Label>
+                                        {FUNCTION_TYPES.filter(f => f.type === "Other").map(f => <Select.Item value={f.value} key={f.value}>{f.value}</Select.Item>)}
+                                    </Select.Group>
+
+                                    <Select.Group>
+                                        <Select.Label className='pl-3'>Bulk Operations</Select.Label>
+                                        {FUNCTION_TYPES.filter(f => f.type === "Bulk Operations").map(f => <Select.Item value={f.value} key={f.value}>{f.value}</Select.Item>)}
+                                    </Select.Group>
+
+                                </Select.Content>
+                            </Select.Root>
+                        )}
+                    />
+                </Box>
+                <FunctionHelperText />
+                {errors.type && <ErrorText>{errors.type?.message}</ErrorText>}
+            </Stack>
+            <ReferenceDoctypeField />
+            <Stack>
+                <Box>
+                    <Label htmlFor='function_name' isRequired>Name</Label>
+                    <TextField.Root
+                        id='function_name'
+                        {...register('function_name', {
+                            required: 'Name is required',
+                            disabled: isEdit,
+                            validate: (value) => {
+                                if (value.includes(' ')) {
+                                    return 'Name cannot contain spaces'
+                                }
+                                return true
+                            }
+                        })}
+                        readOnly={isEdit}
+                        placeholder="get_purchase_invoice"
+                        aria-invalid={errors.function_name ? 'true' : 'false'}
+                    />
+                </Box>
+                {errors.function_name && <ErrorText>{errors.function_name?.message}</ErrorText>}
+                <HelperText>This needs to be unique and cannot contain spaces.</HelperText>
+            </Stack>
+        </Grid>
+
+
+
+        <Stack>
+            <Box>
+                <Label htmlFor='description' isRequired>Description</Label>
+                <Controller
+                    control={control}
+                    name='description'
+                    render={({ field }) => (
+                        <TextArea id='description' {...field} placeholder='Describe what this function does.' />
+                    )}
+                />
+            </Box>
+            {errors.description && <ErrorText>{errors.description?.message}</ErrorText>}
+            <HelperText>This is used to describe what this function does to the AI Bot.</HelperText>
+        </Stack>
+
+        <CustomFunction />
+        <RequiresWritePermissions />
+    </Stack>
+}
+
+const VariableSection = () => {
+
+    return <>
+        <DoctypeVariableBuilder />
+        <Stack>
+            <PassParamsAsJSON />
+            <VariableBuilder />
+        </Stack>
+
+    </>
+
+}
+const FunctionHelperText = () => {
+
+    const { watch } = useFormContext<RavenAIFunction>()
+    const type = watch('type')
+
+    const functionDef = FUNCTION_TYPES.find(f => f.value === type)
+
+    if (!functionDef) {
+        return <HelperText>Select a function type from the dropdown above.</HelperText>
+    }
+
+    return <HelperText>{functionDef.description}</HelperText>
+
+}
+
+const PassParamsAsJSON = () => {
+    const { watch, control } = useFormContext<RavenAIFunction>()
+    const type = watch('type')
+
+    if (type !== 'Custom Function') {
+        return null
+    }
+
+    return <Stack maxWidth={'480px'}>
+        <Text as="label" size="2">
+            <HStack>
+                <Controller
+                    control={control}
+                    name='pass_parameters_as_json'
+                    render={({ field }) => (
+                        <Checkbox
+                            checked={field.value ? true : false}
+                            onCheckedChange={(v) => field.onChange(v ? 1 : 0)}
+                        />
+                    )} />
+
+                Pass parameters as JSON
+            </HStack>
+        </Text>
+        <HelperText>
+            If checked, the params will be passed as a JSON object instead of named parameters
+        </HelperText>
+    </Stack>
+}
+
+const RequiresWritePermissions = () => {
+    const { watch, control } = useFormContext<RavenAIFunction>()
+    const type = watch('type')
+
+    return <Stack maxWidth={'480px'}>
+        <Text as="label" size="2">
+            <HStack>
+                <Controller
+                    control={control}
+                    name='requires_write_permissions'
+                    render={({ field }) => (
+                        <Checkbox
+                            disabled={!(type === 'Custom Function')}
+                            checked={field.value ? true : false}
+                            onCheckedChange={(v) => field.onChange(v ? 1 : 0)}
+                        />
+                    )} />
+
+                Requires Write Permissions
+            </HStack>
+        </Text>
+        <HelperText>
+            Check this if the function you have selected requires write permissions.
+        </HelperText>
+    </Stack>
+}
+
+const CustomFunction = () => {
+
+    const { register, watch, formState: { errors } } = useFormContext<RavenAIFunction>()
+
+    const type = watch('type')
+
+    if (type !== 'Custom Function') {
+        return null
+    }
+
+    return <Stack>
+        <Box>
+            <Label htmlFor='function_path' isRequired={type === 'Custom Function'}>Custom Function Path</Label>
+            <TextArea
+                id='function_path'
+                {...register('function_path', {
+                    required: type === 'Custom Function' ? 'Path is required' : false,
+                    validate: (value) => {
+                        if (value?.includes(' ')) {
+                            return 'Path cannot contain spaces'
+                        }
+                        return true
+                    }
+                })}
+                placeholder='myapp.api.my_custom_function'
+            />
+        </Box>
+        <HelperText>
+            Dotted path to the custom function/API. Cannot contain spaces.
+        </HelperText>
+        {errors.function_path && <ErrorText>{errors.function_path?.message}</ErrorText>}
+    </Stack>
+}
+
+const ReferenceDoctypeField = () => {
+
+    const { watch, formState: { errors }, setValue, getValues } = useFormContext<RavenAIFunction>()
+
+    const type = watch('type')
+
+    const DOCUMENT_REF_FUNCTIONS = ["Get Document", "Get Multiple Documents", "Get List", "Create Document", "Create Multiple Documents", "Update Document", "Update Multiple Documents", "Delete Document", "Delete Multiple Documents"]
+
+    const onReferenceDoctypeChange = (e: ChangeEvent<HTMLInputElement>) => {
+
+        if (e.target.value) {
+
+            let description = ''
+            const function_name_exists = getValues('function_name') ? true : false
+            let function_name = ''
+            // Set the description if none is set
+            if (type === 'Get Document') {
+                description = `This function fetches a ${e.target.value} document using its name from the system.`
+                function_name = `get_${e.target.value.toLowerCase().replace(/\s/g, '_')}`
+            }
+            if (type === 'Get Multiple Documents') {
+                description = `This function fetches multiple ${e.target.value} documents using their names from the system.`
+                function_name = `get_${e.target.value.toLowerCase().replace(/\s/g, '_')}s`
+            }
+            if (type === 'Get List') {
+                description = `This function fetches a list of ${e.target.value} from the system.`
+                function_name = `get_${e.target.value.toLowerCase().replace(/\s/g, '_')}_list`
+            }
+            if (type === 'Create Document') {
+                description = `This function creates a ${e.target.value} in the system.`
+                function_name = `create_${e.target.value.toLowerCase().replace(/\s/g, '_')}`
+            }
+            if (type === 'Create Multiple Documents') {
+                description = `This function creates multiple ${e.target.value} in the system.`
+                function_name = `create_${e.target.value.toLowerCase().replace(/\s/g, '_')}s`
+            }
+            if (type === 'Update Document') {
+                description = `This function updates a ${e.target.value} in the system.`
+                function_name = `update_${e.target.value.toLowerCase().replace(/\s/g, '_')}`
+            }
+            if (type === 'Update Multiple Documents') {
+                description = `This function updates multiple ${e.target.value} in the system.`
+                function_name = `update_${e.target.value.toLowerCase().replace(/\s/g, '_')}s`
+            }
+            if (type === 'Delete Document') {
+                description = `This function deletes a ${e.target.value} from the system.`
+                function_name = `delete_${e.target.value.toLowerCase().replace(/\s/g, '_')}`
+            }
+            if (type === 'Delete Multiple Documents') {
+                description = `This function deletes multiple ${e.target.value} from the system.`
+                function_name = `delete_${e.target.value.toLowerCase().replace(/\s/g, '_')}s`
+            }
+
+            if (function_name && !function_name_exists) {
+                setValue('function_name', function_name)
+            }
+            if (description) {
+                setValue('description', description)
+            }
+        }
+    }
+
+    if (!DOCUMENT_REF_FUNCTIONS.includes(type)) {
+        return null
+    }
+    return <Stack>
+        <LinkFormField
+            name='reference_doctype'
+            label='Reference Doctype'
+            required
+            filters={[["istable", "=", 0], ["issingle", "=", 0]]}
+            doctype='DocType'
+            rules={{
+                required: DOCUMENT_REF_FUNCTIONS.includes(type) ? 'Reference Doctype is required' : false,
+                onChange: onReferenceDoctypeChange
+            }}
+        />
+        <HelperText>
+            The document you want this function to operate on.
+        </HelperText>
+        {errors.reference_doctype && <ErrorText>{errors.reference_doctype?.message}</ErrorText>}
+    </Stack>
+}
+
+export default FunctionForm
\ No newline at end of file
diff --git a/frontend/src/components/feature/settings/ai/functions/VariableBuilder.tsx b/frontend/src/components/feature/settings/ai/functions/VariableBuilder.tsx
new file mode 100644
index 000000000..7b21a7789
--- /dev/null
+++ b/frontend/src/components/feature/settings/ai/functions/VariableBuilder.tsx
@@ -0,0 +1,259 @@
+import { HStack, Stack } from '@/components/layout/Stack'
+import { RavenAIFunction } from '@/types/RavenAI/RavenAIFunction'
+import { DIALOG_CONTENT_CLASS } from '@/utils/layout/dialog'
+import { Badge, Box, Button, ButtonProps, Dialog, IconButton, Separator, Switch, Text, TextArea, VisuallyHidden } from '@radix-ui/themes'
+import { useState } from 'react'
+import { Controller, useFormContext } from 'react-hook-form'
+import { ObjectVariableType, VariableType } from './FunctionConstants'
+import { BiTrashAlt } from 'react-icons/bi'
+import VariableDialog from './VariableDialog'
+import { ErrorBoundary } from "react-error-boundary";
+import { toast } from 'sonner'
+import { FiEdit } from 'react-icons/fi'
+import { in_list } from '@/utils/validations'
+import { getTextAndColorForFieldType } from './utils'
+
+type Props = {}
+
+/**
+ * This component helps users define their function schema in JSON format and also set required variables + default values for them.
+ * 
+ */
+const VariableBuilder = (props: Props) => {
+
+    const { control, getValues, setValue, watch } = useFormContext<RavenAIFunction>()
+
+    const type = watch('type')
+
+
+    const [viewMode, setViewMode] = useState<'json' | 'builder'>('builder')
+
+    const [error, setError] = useState<string | undefined>(undefined)
+
+    const formatJSON = () => {
+        try {
+            const value = getValues('params')
+            const json = typeof value === 'string' ? JSON.parse(value) : value
+
+            setValue('params', JSON.stringify(json, null, 4))
+        } catch (e) {
+            toast.error('Error formatting JSON. Please check your JSON.')
+            setError((e as Error).message)
+        }
+
+    }
+
+    if (type !== 'Custom Function') {
+        return null
+    }
+
+
+    return (
+        <Box className='py-2'>
+            <Stack>
+                <HStack justify='between' align='start'>
+                    <HStack align='center'>
+                        <Text weight='medium' size='2'>Builder</Text>
+                        <Switch size='2' checked={viewMode === 'json'} onCheckedChange={(checked) => setViewMode(checked ? 'json' : 'builder')} />
+                        <Text weight='medium' size='2'>JSON</Text>
+                    </HStack>
+                    {viewMode === 'json' && <Button color='gray' className='not-cal font-medium' variant='soft' type='button' onClick={formatJSON}>Format JSON</Button>}
+                </HStack>
+                {error && <Text size='2' color='red'>{error}</Text>}
+                <Controller
+                    control={control}
+                    name='params'
+                    render={({ field }) => {
+
+                        if (viewMode === 'builder') {
+                            try {
+                                const json = typeof field.value === 'string' ? JSON.parse(field.value) : field.value
+                                return <ErrorBoundary fallback={<Text size='2' color='red'>Error loading variables in the builder. Please check your JSON structure.</Text>}>
+                                    <VariableBuilderField json={json} onChange={(j) => field.onChange(JSON.stringify(j, null, 4))} />
+                                </ErrorBoundary>
+                            } catch (e) {
+                                return <Text size='2' color='red'>Error loading variables in the builder. Please check your JSON structure.</Text>
+                            }
+                        } else {
+                            return <TextArea
+                                rows={30}
+                                spellCheck={false}
+                                className='font-mono bg-gray-2 dark:bg-gray-1 text-amber-900 dark:text-amber-100'
+                                resize='vertical'
+                                value={field.value}
+                                onChange={(e) => field.onChange(e.target.value)}
+                            />
+                        }
+
+                    }}
+                />
+            </Stack>
+
+        </Box>
+
+    )
+}
+
+const VariableBuilderField = ({ json, onChange, isNested }: { json: ObjectVariableType, onChange: (json: ObjectVariableType) => void, isNested?: boolean }) => {
+
+    const [editingVariable, setEditingVariable] = useState<{ name: string, properties: VariableType } | undefined>(undefined)
+
+    const properties: Record<string, VariableType> = json.properties || {}
+
+    const addVariable = (name: string, newProperty: Partial<VariableType>, required?: boolean) => {
+
+        let newRequired = json.required ?? []
+        // Add to required if it doesn't exist
+        if (required && !in_list(json.required ?? [], name)) {
+            newRequired.push(name)
+        }
+
+        // Remove from required if it exists
+        if (!required && in_list(json.required ?? [], name)) {
+            newRequired = newRequired.filter((n) => n !== name)
+        }
+
+        onChange({
+            type: 'object',
+            properties: {
+                ...properties,
+                [name]: newProperty as VariableType
+            },
+            required: newRequired
+        })
+
+    }
+
+    const removeVariable = (name: string) => {
+
+        const newProperties = { ...properties }
+
+        delete newProperties[name]
+
+        // Remove from required if it exists
+        const newRequired = json.required?.filter((n) => n !== name)
+
+        onChange({
+            type: 'object',
+            properties: newProperties,
+            required: newRequired
+        })
+    }
+
+    return <Stack>
+        <Stack gap='1'>
+            {Object.entries(properties).length === 0 && <Text size='2' color='gray' className='text-center pt-4'>No variables defined</Text>}
+            {Object.entries(properties).map(([key, value]) => {
+                return <Stack key={key} className='bg-gray-2 dark:bg-gray-4 p-2.5 rounded-md shadow-sm hover:bg-gray-3 dark:hover:bg-gray-5'>
+                    <HStack
+                        justify='between'
+                        align='center'
+                    >
+                        <Stack gap='1'>
+                            <HStack align='center'>
+                                <Text className='font-semibold' size='2'>{key}</Text>
+                                <HStack>
+                                    <Badge {...getTextAndColorForFieldType(value.type)} className='rounded-md' />
+                                    {in_list(json.required ?? [], key) && <Badge color='red' className='rounded-md'>Required</Badge>}
+                                </HStack>
+                            </HStack>
+                            <Text size='2' color='gray'>{value.description}</Text>
+                            {(value.type === 'string' || value.type === 'number') && value.enum && value.enum.length > 0 && <Text as='span' size='2' color='gray' weight={'medium'}>Options: {value.enum?.join(', ')}</Text>}
+                        </Stack>
+
+                        <HStack align='center' pr='2' gap='4'>
+                            <IconButton size='2' color='gray' variant='ghost'
+                                type='button'
+                                onClick={() => setEditingVariable({
+                                    name: key,
+                                    properties: value,
+                                })}><FiEdit size='16' className='text-gray-10' /></IconButton>
+                            <IconButton size='2' color='red' variant='ghost'
+                                type='button'
+                                onClick={() => removeVariable(key)}><BiTrashAlt size='16' /></IconButton>
+                        </HStack>
+                    </HStack>
+                    {value.type === 'object' &&
+                        <Stack>
+                            <Separator className='w-full' />
+                            <Box ml='8' p='2' className='bg-white dark:bg-gray-2 rounded-md'>
+                                <VariableBuilderField
+                                    isNested
+                                    json={value}
+                                    onChange={(v) => addVariable(key, v)} />
+                            </Box>
+                        </Stack>
+
+                    }
+                </Stack>
+            })}
+            <HStack py={'3'} justify={isNested ? 'center' : 'start'}>
+                <AddVariablePopover onAdd={addVariable} />
+            </HStack>
+        </Stack>
+        <EditVariableDialog
+            variable={editingVariable}
+            onSubmit={addVariable}
+            isOpen={editingVariable !== undefined}
+            onOpenChange={(v) => !v && setEditingVariable(undefined)} />
+    </Stack>
+}
+
+
+interface AddVariablePopoverProps {
+    onAdd: (name: string, property: Partial<VariableType>, required?: boolean) => void,
+    buttonProps?: ButtonProps
+}
+const AddVariablePopover = ({ onAdd, buttonProps }: AddVariablePopoverProps) => {
+
+    const [isOpen, setIsOpen] = useState(false)
+
+    const onSubmit = (name: string, props: Partial<VariableType>, required?: boolean) => {
+        onAdd(name, props, required)
+        setIsOpen(false)
+    }
+
+    return <Dialog.Root open={isOpen} onOpenChange={setIsOpen}>
+        <Dialog.Trigger>
+            <Button size='2' variant='soft' {...buttonProps}>Add Variable</Button>
+        </Dialog.Trigger>
+        <Dialog.Content className={DIALOG_CONTENT_CLASS}>
+            <Dialog.Title>Add Variable</Dialog.Title>
+            <Dialog.Description>Add a new variable to your function schema.</Dialog.Description>
+            <VariableDialog onAdd={onSubmit} allowNameChange={true} />
+        </Dialog.Content>
+    </Dialog.Root>
+}
+
+interface EditVariableDialogProps {
+    variable?: { name: string, properties: VariableType, required?: boolean },
+    onSubmit: (name: string, properties: Partial<VariableType>, required?: boolean) => void,
+    onOpenChange: (isOpen: boolean) => void
+    isOpen: boolean
+}
+
+const EditVariableDialog = ({ variable, onSubmit, isOpen, onOpenChange }: EditVariableDialogProps) => {
+
+    const onAdd = (name: string, props: Partial<VariableType>, required?: boolean) => {
+        onSubmit(name, props, required)
+        onOpenChange(false)
+    }
+
+    return <Dialog.Root open={isOpen} onOpenChange={onOpenChange}>
+        <Dialog.Content className={DIALOG_CONTENT_CLASS}>
+            <Dialog.Title>Edit Variable</Dialog.Title>
+            <VisuallyHidden>
+                <Dialog.Description>Edit the variable to your function schema.</Dialog.Description>
+            </VisuallyHidden>
+
+            <VariableDialog
+                onAdd={onAdd}
+                allowNameChange={false}
+                defaultValues={variable?.properties}
+                defaultRequired={variable?.required}
+                name={variable?.name} />
+        </Dialog.Content>
+    </Dialog.Root>
+}
+
+export default VariableBuilder
\ No newline at end of file
diff --git a/frontend/src/components/feature/settings/ai/functions/VariableDialog.tsx b/frontend/src/components/feature/settings/ai/functions/VariableDialog.tsx
new file mode 100644
index 000000000..b62de4bc8
--- /dev/null
+++ b/frontend/src/components/feature/settings/ai/functions/VariableDialog.tsx
@@ -0,0 +1,137 @@
+import { useState } from 'react'
+import { NumberVariableType, StringVariableType, VariableType } from './FunctionConstants'
+import { Label, HelperText } from '@/components/common/Form'
+import { Stack, HStack } from '@/components/layout/Stack'
+import { Box, Select, TextField, Checkbox, TextArea, Dialog, Button, Text } from '@radix-ui/themes'
+
+type Props = {
+    defaultValues?: VariableType
+    defaultRequired?: boolean
+    onAdd: (name: string, variable: Partial<VariableType>, required?: boolean) => void
+    allowNameChange: boolean
+    name?: string
+}
+
+const VariableDialog = ({ defaultValues, onAdd, allowNameChange, name: defaultName, defaultRequired }: Props) => {
+
+    const [type, setType] = useState<'object' | 'array' | 'string' | 'number' | 'boolean'>(defaultValues?.type || 'string')
+    const [name, setName] = useState(defaultName ?? '')
+    const [description, setDescription] = useState(defaultValues?.description ?? '')
+    const [required, setRequired] = useState<boolean>(defaultRequired ?? false)
+    const [enumValues, setEnumValues] = useState<string[]>(defaultValues?.type === 'string' || defaultValues?.type === 'number' ? defaultValues?.enum ?? [] : [])
+
+    const [items, setItems] = useState<StringVariableType | NumberVariableType | undefined>(defaultValues?.type === 'array' ? defaultValues?.items ?? [] : undefined)
+
+    const areAllFieldsFilled = !name || !type || !description
+
+    const onSubmit = () => {
+
+        onAdd(name, {
+            type,
+            description,
+            enum: enumValues.length > 0 ? enumValues : undefined,
+            items: type === 'array' ? items : undefined,
+        }, required)
+
+    }
+    return (
+        <Stack gap='4' pt='2'>
+            <Stack gap='4' className='max-h-[75vh] overflow-y-auto'>
+                <HStack>
+                    <Stack width='50%' gap='4'>
+                        <Box>
+                            <Label isRequired>Type</Label>
+                            <Select.Root required value={type} onValueChange={(value) => setType(value as 'object' | 'array' | 'string' | 'number' | 'boolean')}>
+                                <Select.Trigger placeholder='Select a variable type' className='w-full' />
+                                <Select.Content>
+                                    <Select.Item value='string'>String</Select.Item>
+                                    <Select.Item value='array'>Array</Select.Item>
+                                    <Select.Item value='number'>Number</Select.Item>
+                                    <Select.Item value='boolean'>Boolean</Select.Item>
+                                    <Select.Item value='object'>Object</Select.Item>
+                                </Select.Content>
+                            </Select.Root>
+                        </Box>
+                        <Box>
+                            <Text as="label" size="2">
+                                <HStack>
+                                    <Checkbox
+                                        checked={required}
+                                        onCheckedChange={(v) => setRequired(v ? true : false)}
+                                    />
+                                    Required
+                                </HStack>
+                            </Text>
+                        </Box>
+                    </Stack>
+
+                    <Stack width='50%'>
+                        <Box>
+                            <Label isRequired>Name</Label>
+                            <TextField.Root name='name' value={name} required
+                                readOnly={!allowNameChange}
+                                onChange={(e) => setName(e.target.value?.replace(/\s/g, '_'))} />
+                        </Box>
+                        <HelperText>
+                            Variable name must be unique, and cannot have spaces.
+                        </HelperText>
+                    </Stack>
+                </HStack>
+
+                {type === 'array' &&
+                    <Box width='50%'>
+                        <Label isRequired>Type of items in the array</Label>
+                        <Select.Root value={items?.type}
+                            onValueChange={(value) => setItems(v => ({ ...v, type: value as 'string' | 'number' }))}
+                        >
+                            <Select.Trigger placeholder='Select a variable type' className='w-full' />
+                            <Select.Content>
+                                <Select.Item value='string'>String</Select.Item>
+                                <Select.Item value='number'>Number</Select.Item>
+                            </Select.Content>
+                        </Select.Root>
+                    </Box>
+                }
+
+
+                <Box>
+                    <Label htmlFor='description' isRequired>Description</Label>
+                    <TextArea
+                        name='description'
+                        required
+                        value={description}
+                        onChange={(e) => setDescription(e.target.value)}
+                        placeholder='Enter a description for this variable'
+                    />
+                </Box>
+
+                {(type === 'string' || type === 'number') &&
+                    <Stack>
+                        <Stack>
+                            <Box>
+                                <Label htmlFor='enumValues'>Options</Label>
+                                <TextArea
+                                    rows={7}
+                                    resize='vertical'
+                                    name='enumValues' value={enumValues.join('\n')} onChange={(e) => setEnumValues(e.target.value.split('\n'))} />
+                            </Box>
+                            <HelperText>
+                                Add a new option on a new line.
+
+                                If you want this variable to have a default value, just add one option.
+                            </HelperText>
+                        </Stack>
+                    </Stack>
+                }
+            </Stack>
+            <HStack justify='end'>
+                <Dialog.Close>
+                    <Button variant='soft' color='gray'>Close</Button>
+                </Dialog.Close>
+                <Button onClick={onSubmit} disabled={areAllFieldsFilled}>Add</Button>
+            </HStack>
+        </Stack >
+    )
+}
+
+export default VariableDialog
\ No newline at end of file
diff --git a/frontend/src/components/feature/settings/ai/functions/utils.ts b/frontend/src/components/feature/settings/ai/functions/utils.ts
new file mode 100644
index 000000000..173652a67
--- /dev/null
+++ b/frontend/src/components/feature/settings/ai/functions/utils.ts
@@ -0,0 +1,25 @@
+import { RavenAIFunctionParams } from "@/types/RavenAI/RavenAIFunctionParams"
+import { BadgeProps } from "@radix-ui/themes"
+import { ReactNode } from "react"
+import { BaseVariableType } from "./FunctionConstants"
+
+export const getTextAndColorForFieldType = (type: RavenAIFunctionParams['type'] | BaseVariableType['type']): { children: ReactNode, color: BadgeProps['color'] } => {
+    switch (type) {
+        case 'integer':
+            return { children: 'Integer', color: 'blue' }
+        case 'number':
+            return { children: 'Number', color: 'purple' }
+        case 'float':
+            return { children: 'Float', color: 'violet' }
+        case 'string':
+            return { children: 'String', color: 'green' }
+        case 'boolean':
+            return { children: 'Boolean', color: 'pink' }
+        case 'object':
+            return { children: 'Object', color: 'orange' }
+        case 'array':
+            return { children: 'Array', color: 'sky' }
+        case 'null':
+            return { children: 'Null', color: 'gray' }
+    }
+}
\ No newline at end of file
diff --git a/frontend/src/components/feature/threads/ThreadDrawer/ThreadHeader.tsx b/frontend/src/components/feature/threads/ThreadDrawer/ThreadHeader.tsx
index f8f11c879..88394e550 100644
--- a/frontend/src/components/feature/threads/ThreadDrawer/ThreadHeader.tsx
+++ b/frontend/src/components/feature/threads/ThreadDrawer/ThreadHeader.tsx
@@ -1,14 +1,15 @@
 import { useNavigate, useParams } from "react-router-dom"
 import { DropdownMenu, Flex, Heading, IconButton } from "@radix-ui/themes"
-import { BiBell, BiBellOff, BiDotsVerticalRounded, BiExit } from "react-icons/bi"
-import { useFrappePostCall, useSWRConfig } from "frappe-react-sdk"
+import { BiBell, BiBellOff, BiDotsVerticalRounded, BiExit, BiTrash } from "react-icons/bi"
+import { useFrappeDeleteDoc, useFrappePostCall, useSWRConfig } from "frappe-react-sdk"
 import { toast } from "sonner"
 import { getErrorMessage } from "@/components/layout/AlertBanner/ErrorBanner"
 import { AiOutlineClose } from "react-icons/ai"
 import { useUserData } from "@/hooks/useUserData"
 import useFetchChannelMembers, { Member } from "@/hooks/fetchers/useFetchChannelMembers"
-import { useMemo } from "react"
+import { useContext, useMemo } from "react"
 import useIsPushNotificationEnabled from "@/hooks/fetchers/useIsPushNotificationEnabled"
+import { UserContext } from "@/utils/auth/UserProvider"
 
 export const ThreadHeader = () => {
 
@@ -18,6 +19,7 @@ export const ThreadHeader = () => {
 
     const { name: user } = useUserData()
     const { channelMembers } = useFetchChannelMembers(threadID ?? '')
+    const { currentUser } = useContext(UserContext)
 
     const channelMember = useMemo(() => {
         if (user && channelMembers) {
@@ -26,7 +28,6 @@ export const ThreadHeader = () => {
         return null
     }, [user, channelMembers])
 
-
     return (
         <header className='dark:bg-gray-2 bg-white fixed top-0 px-3 sm:w-[calc((100vw-var(--sidebar-width)-var(--space-8))/2)] w-screen' style={{ zIndex: 999 }}>
             <Flex direction={'column'} gap='2' className='pt-3'>
@@ -43,6 +44,7 @@ export const ThreadHeader = () => {
                                 <DropdownMenu.Content className='min-w-48'>
                                     <ToggleNotificationButton channelMember={channelMember} />
                                     <LeaveThreadButton />
+                                    {channelMembers[currentUser].is_admin === 1 && <DeleteThreadButton />}
                                 </DropdownMenu.Content>
                             </DropdownMenu.Root>
                         }
@@ -63,6 +65,38 @@ export const ThreadHeader = () => {
 }
 
 
+const DeleteThreadButton = () => {
+
+    const { threadID } = useParams()
+    const navigate = useNavigate()
+
+    const { deleteDoc } = useFrappeDeleteDoc()
+
+    const onDeleteThread = () => {
+
+        const promise = deleteDoc('Raven Channel', threadID)
+            .then(() => {
+                navigate('../')
+                return Promise.resolve()
+            })
+
+        toast.promise(promise, {
+            success: 'You have deleted the thread',
+            error: (e) => `Could not delete thread - ${getErrorMessage(e)}`
+        })
+    }
+
+    return (
+        <DropdownMenu.Item color="red" onClick={onDeleteThread}>
+            <Flex gap='2' align='center'>
+                <BiTrash size={'16'} />
+                Delete Thread
+            </Flex>
+        </DropdownMenu.Item>
+    )
+}
+
+
 const LeaveThreadButton = () => {
 
     const { threadID } = useParams()
diff --git a/frontend/src/components/feature/threads/ThreadDrawer/ThreadMessages.tsx b/frontend/src/components/feature/threads/ThreadDrawer/ThreadMessages.tsx
index 776d0fac2..354bb0a7a 100644
--- a/frontend/src/components/feature/threads/ThreadDrawer/ThreadMessages.tsx
+++ b/frontend/src/components/feature/threads/ThreadDrawer/ThreadMessages.tsx
@@ -5,7 +5,7 @@ import useFileUpload from "../../chat/ChatInput/FileInput/useFileUpload"
 import Tiptap from "../../chat/ChatInput/Tiptap"
 import { useSendMessage } from "../../chat/ChatInput/useSendMessage"
 import { ReplyMessageBox } from "../../chat/ChatMessage/ReplyMessageBox/ReplyMessageBox"
-import { CustomFile } from "../../file-upload/FileDrop"
+import { CustomFile, FileDrop } from "../../file-upload/FileDrop"
 import { FileListItem } from "../../file-upload/FileListItem"
 import { useParams } from "react-router-dom"
 import { Message } from "../../../../../../types/Messaging/Message"
@@ -14,6 +14,7 @@ import { JoinChannelBox } from "../../chat/chat-footer/JoinChannelBox"
 import { useUserData } from "@/hooks/useUserData"
 import useFetchChannelMembers from "@/hooks/fetchers/useFetchChannelMembers"
 import ThreadFirstMessage from "./ThreadFirstMessage"
+import AIEvent from "../../ai/AIEvent"
 
 export const ThreadMessages = ({ threadMessage }: { threadMessage: Message }) => {
 
@@ -32,7 +33,7 @@ export const ThreadMessages = ({ threadMessage }: { threadMessage: Message }) =>
         setSelectedMessage(null)
     }
 
-    const { fileInputRef, files, removeFile, uploadFiles, addFile, fileUploadProgress } = useFileUpload(threadID ?? '')
+    const { fileInputRef, files, setFiles, removeFile, uploadFiles, addFile, fileUploadProgress } = useFileUpload(threadID ?? '')
 
     const { sendMessage, loading } = useSendMessage(threadID ?? '', files.length, uploadFiles, handleCancelReply, selectedMessage)
 
@@ -70,34 +71,45 @@ export const ThreadMessages = ({ threadMessage }: { threadMessage: Message }) =>
 
     return (
         <Flex direction='column' justify={'between'} gap='0' className="h-full p-4">
-            <ThreadFirstMessage message={threadMessage} />
-            <ChatStream
-                channelID={threadID ?? ''}
-                replyToMessage={handleReplyAction}
-                showThreadButton={false}
-            />
-            {!isUserInChannel && <JoinChannelBox
-                channelMembers={threadMembers}
-                user={user} />}
-            {isUserInChannel && <Tiptap
-                key={threadID}
-                fileProps={{
-                    fileInputRef,
-                    addFile
-                }}
-                channelMembers={channelMembers}
-                clearReplyMessage={handleCancelReply}
-                replyMessage={selectedMessage}
-                sessionStorageKey={`tiptap-${threadID}`}
-                onMessageSend={sendMessage}
-                messageSending={loading}
-                slotBefore={<Flex direction='column' justify='center' hidden={!selectedMessage && !files.length}>
-                    {selectedMessage && <PreviousMessagePreview selectedMessage={selectedMessage} />}
-                    {files && files.length > 0 && <Flex gap='2' width='100%' align='end' px='2' p='2' wrap='wrap'>
-                        {files.map((f: CustomFile) => <Box className="grow-0" key={f.fileID}><FileListItem file={f} uploadProgress={fileUploadProgress} removeFile={() => removeFile(f.fileID)} /></Box>)}
+            <FileDrop
+                files={files}
+                areaHeight="h-[calc(100vh-72px)]"
+                height="100%"
+                width={'w-[calc((100vw-var(--sidebar-width)-var(--space-8)-var(--space-5))/2)]'}
+                ref={fileInputRef}
+                onFileChange={setFiles}
+                maxFiles={10}
+                maxFileSize={10000000}>
+                <ThreadFirstMessage message={threadMessage} />
+                <ChatStream
+                    channelID={threadID ?? ''}
+                    replyToMessage={handleReplyAction}
+                    showThreadButton={false}
+                />
+                <AIEvent channelID={threadID ?? ''} />
+                {!isUserInChannel && <JoinChannelBox
+                    channelMembers={threadMembers}
+                    user={user} />}
+                {isUserInChannel && <Tiptap
+                    key={threadID}
+                    fileProps={{
+                        fileInputRef,
+                        addFile
+                    }}
+                    channelMembers={channelMembers}
+                    clearReplyMessage={handleCancelReply}
+                    replyMessage={selectedMessage}
+                    sessionStorageKey={`tiptap-${threadID}`}
+                    onMessageSend={sendMessage}
+                    messageSending={loading}
+                    slotBefore={<Flex direction='column' justify='center' hidden={!selectedMessage && !files.length}>
+                        {selectedMessage && <PreviousMessagePreview selectedMessage={selectedMessage} />}
+                        {files && files.length > 0 && <Flex gap='2' width='100%' align='end' px='2' p='2' wrap='wrap'>
+                            {files.map((f: CustomFile) => <Box className="grow-0" key={f.fileID}><FileListItem file={f} uploadProgress={fileUploadProgress} removeFile={() => removeFile(f.fileID)} /></Box>)}
+                        </Flex>}
                     </Flex>}
-                </Flex>}
-            />}
+                />}
+            </FileDrop>
         </Flex>
     )
 }
\ No newline at end of file
diff --git a/frontend/src/components/feature/threads/Threads.tsx b/frontend/src/components/feature/threads/Threads.tsx
index c8bd1a523..13907bb1e 100644
--- a/frontend/src/components/feature/threads/Threads.tsx
+++ b/frontend/src/components/feature/threads/Threads.tsx
@@ -1,11 +1,8 @@
-import { ErrorBanner } from "@/components/layout/AlertBanner"
-import { EmptyStateForThreads } from "@/components/layout/EmptyState/EmptyState"
 import { PageHeader } from "@/components/layout/Heading/PageHeader"
 import { Box, Flex, Heading } from "@radix-ui/themes"
-import { useFrappeGetCall } from "frappe-react-sdk"
 import { BiChevronLeft } from "react-icons/bi"
 import { Link } from "react-router-dom"
-import { ThreadPreviewBox } from "./ThreadPreviewBox"
+import ThreadsList from "./ThreadsList"
 
 export type ThreadMessage = {
     bot: string,
@@ -32,10 +29,6 @@ export type ThreadMessage = {
 
 const Threads = () => {
 
-    const { data, error } = useFrappeGetCall<{ message: ThreadMessage[] }>("raven.api.threads.get_all_threads", {
-        revalidateOnFocus: false
-    })
-
     return (
         <Flex direction='column' gap='0'>
             <PageHeader>
@@ -46,17 +39,21 @@ const Threads = () => {
                     <Heading size='5'>Threads</Heading>
                 </Flex>
             </PageHeader>
-            <Box className="min-h-screen w-full pt-16 pb-8">
-                <div className={'px-2'}><ErrorBanner error={error} /></div>
-                {data && <>
-                    {data.message?.length === 0 ?
-                        <EmptyStateForThreads /> :
-                        <Flex direction='column' gap='3' justify='start' px='4' pt='2'>
-                            {data.message.map((thread) => {
-                                return <ThreadPreviewBox key={thread.name} thread={thread} />
-                            })}
-                        </Flex>}
-                </>}
+            <Box className="min-h-screen w-full pt-16 pb-8 px-4">
+                <ThreadsList />
+                {/* Show only regular threads now since this needs pagination */}
+                {/* <Tabs.Root defaultValue="Threads">
+                    <Tabs.List>
+                        <Tabs.Trigger value="Threads">My Threads</Tabs.Trigger>
+                        <Tabs.Trigger value="AI Threads">AI Threads</Tabs.Trigger>
+                    </Tabs.List>
+                    <Tabs.Content value="Threads">
+                        <ThreadsList />
+                    </Tabs.Content>
+                    <Tabs.Content value="AI Threads">
+                        <ThreadsList aiThreads={1} />
+                    </Tabs.Content>
+                </Tabs.Root> */}
             </Box>
         </Flex>
     )
diff --git a/frontend/src/components/feature/threads/ThreadsList.tsx b/frontend/src/components/feature/threads/ThreadsList.tsx
new file mode 100644
index 000000000..ec6ffb2a9
--- /dev/null
+++ b/frontend/src/components/feature/threads/ThreadsList.tsx
@@ -0,0 +1,36 @@
+import { ThreadPreviewBox } from './ThreadPreviewBox'
+import { ThreadMessage } from './Threads'
+import { useFrappeGetCall } from 'frappe-react-sdk'
+import { Flex } from '@radix-ui/themes'
+import { ErrorBanner } from '@/components/layout/AlertBanner'
+import { EmptyStateForThreads } from '@/components/layout/EmptyState/EmptyState'
+
+type Props = {
+    aiThreads?: 0 | 1
+}
+
+const ThreadsList = ({ aiThreads }: Props) => {
+
+    const { data, error } = useFrappeGetCall<{ message: ThreadMessage[] }>("raven.api.threads.get_all_threads", {
+        is_ai_thread: aiThreads
+    }, undefined, {
+        revalidateOnFocus: false
+    })
+
+    if (error) {
+        return <ErrorBanner error={error} />
+    }
+
+    if (data?.message?.length === 0) {
+        return <EmptyStateForThreads />
+    }
+
+    return <Flex direction='column' gap='3' justify='start' pt='2'>
+        {data?.message?.map((thread) => {
+            return <ThreadPreviewBox key={thread.name} thread={thread} />
+        })}
+    </Flex>
+
+}
+
+export default ThreadsList
\ No newline at end of file
diff --git a/frontend/src/components/feature/userSettings/AvailabilityStatus/SetUserAvailabilityMenu.tsx b/frontend/src/components/feature/userSettings/AvailabilityStatus/SetUserAvailabilityMenu.tsx
index 57fe670ac..c4288dbcd 100644
--- a/frontend/src/components/feature/userSettings/AvailabilityStatus/SetUserAvailabilityMenu.tsx
+++ b/frontend/src/components/feature/userSettings/AvailabilityStatus/SetUserAvailabilityMenu.tsx
@@ -8,6 +8,7 @@ import { DropdownMenu, Flex } from '@radix-ui/themes'
 import { useUserData } from '@/hooks/useUserData'
 import { GrPowerReset } from 'react-icons/gr'
 import useCurrentRavenUser from '@/hooks/useCurrentRavenUser'
+import { __ } from '@/utils/translations'
 
 export type AvailabilityStatus = 'Available' | 'Away' | 'Do not disturb' | 'Invisible' | ''
 
@@ -24,7 +25,7 @@ export const SetUserAvailabilityMenu = () => {
             fieldname: 'availability_status',
             value: status
         }).then(() => {
-            toast.success("User availability updated")
+            toast.success(__("User availability updated"))
             mutate()
         })
     }, [userData.name])
@@ -49,7 +50,7 @@ export const SetUserAvailabilityMenu = () => {
                     {getStatusText('Invisible')}
                 </DropdownMenu.Item>
                 <DropdownMenu.Item className={'flex justify-normal gap-2'} color='gray' onClick={() => setAvailabilityStatus('')}>
-                    <GrPowerReset fontSize={'0.7rem'} /> Reset
+                    <GrPowerReset fontSize={'0.7rem'} /> {__("Reset")}
                 </DropdownMenu.Item>
             </DropdownMenu.SubContent>
         </DropdownMenu.Sub>
@@ -59,14 +60,14 @@ export const SetUserAvailabilityMenu = () => {
 export const getStatusText = (status: AvailabilityStatus) => {
     switch (status) {
         case 'Available':
-            return <><BiSolidCircle color={'green'} fontSize={'0.7rem'} /> Available</>
+            return <><BiSolidCircle color={'green'} fontSize={'0.7rem'} /> {__("Available")}</>
         case 'Away':
-            return <><MdWatchLater color={'#FFAA33'} fontSize={'0.8rem'} /> Away</>
+            return <><MdWatchLater color={'#FFAA33'} fontSize={'0.8rem'} /> {__("Away")}</>
         case 'Do not disturb':
-            return <><FaCircleMinus color={'#D22B2B'} fontSize={'0.7rem'} /> Do not disturb</>
+            return <><FaCircleMinus color={'#D22B2B'} fontSize={'0.7rem'} /> {__("Do not disturb")}</>
         case 'Invisible':
-            return <><FaCircleDot className={'text-gray-400'} fontSize={'0.7rem'} /> Invisible</>
+            return <><FaCircleDot className={'text-gray-400'} fontSize={'0.7rem'} /> {__("Invisible")}</>
         default:
-            return <><BiSolidCircle color={'green'} fontSize={'0.7rem'} /> Available</>
+            return <><BiSolidCircle color={'green'} fontSize={'0.7rem'} /> {__("Available")}</>
     }
 }
\ No newline at end of file
diff --git a/frontend/src/components/feature/userSettings/CustomStatus/SetCustomStatusContent.tsx b/frontend/src/components/feature/userSettings/CustomStatus/SetCustomStatusContent.tsx
index 52b481eaf..2ae4015e8 100644
--- a/frontend/src/components/feature/userSettings/CustomStatus/SetCustomStatusContent.tsx
+++ b/frontend/src/components/feature/userSettings/CustomStatus/SetCustomStatusContent.tsx
@@ -4,7 +4,8 @@ import { Loader } from '@/components/common/Loader'
 import { ErrorBanner } from '@/components/layout/AlertBanner'
 import useCurrentRavenUser from '@/hooks/useCurrentRavenUser'
 import { useUserData } from '@/hooks/useUserData'
-import { Button, Dialog, Flex, TextField, Text, IconButton } from '@radix-ui/themes'
+import { __ } from '@/utils/translations'
+import { Button, Dialog, Flex, TextField, IconButton } from '@radix-ui/themes'
 import { useFrappePostCall } from 'frappe-react-sdk'
 import { useCallback, useState } from 'react'
 import { FormProvider, useForm } from 'react-hook-form'
@@ -31,7 +32,7 @@ const SetCustomStatusContent = ({ onClose }: { onClose: VoidFunction }) => {
             fieldname: 'custom_status',
             value: data.custom_status
         }).then(() => {
-            toast.success("User status updated")
+            toast.success(__("User status updated"))
             mutate()
             onClose()
         })
@@ -45,14 +46,14 @@ const SetCustomStatusContent = ({ onClose }: { onClose: VoidFunction }) => {
 
     return (
         <>
-            <Dialog.Title>Set a custom status</Dialog.Title>
+            <Dialog.Title>{__("Set a custom status")}</Dialog.Title>
             <FormProvider {...methods}>
                 <form onSubmit={handleSubmit(onSubmit)}>
 
                     <ErrorBanner error={error} />
 
                     <Flex direction={'column'} gap={'2'}>
-                        <Label size='2' color='gray' weight='regular' htmlFor='custom_status'>Share what you're up to</Label>
+                        <Label size='2' color='gray' weight='regular' htmlFor='custom_status'>{__("Share what you're up to")}</Label>
                         <Flex align={'center'} gap='3'>
                             <Flex direction={'column'} gap='1'>
                                 <TextField.Root
@@ -63,7 +64,7 @@ const SetCustomStatusContent = ({ onClose }: { onClose: VoidFunction }) => {
                                     {...register('custom_status', {
                                         maxLength: {
                                             value: 140,
-                                            message: "Status cannot be more than 140 characters."
+                                            message: __("Status cannot be more than {0} characters.", 140)
                                         }
                                     })}
                                     className='min-w-[21rem]'
@@ -84,11 +85,11 @@ const SetCustomStatusContent = ({ onClose }: { onClose: VoidFunction }) => {
 
                     <Flex gap="3" mt="6" justify="end" align='center'>
                         <Dialog.Close disabled={loading}>
-                            <Button variant="soft" color="gray">Cancel</Button>
+                            <Button variant="soft" color="gray">{__("Cancel")}</Button>
                         </Dialog.Close>
                         <Button type='submit' disabled={loading}>
                             {loading && <Loader />}
-                            {loading ? "Saving" : "Save"}
+                            {loading ? __("Saving") : __("Save")}
                         </Button>
                     </Flex>
                 </form>
diff --git a/frontend/src/components/feature/userSettings/PushNotifications/PushNotificationToggle.tsx b/frontend/src/components/feature/userSettings/PushNotifications/PushNotificationToggle.tsx
index 238f21cc8..0a3e8597e 100644
--- a/frontend/src/components/feature/userSettings/PushNotifications/PushNotificationToggle.tsx
+++ b/frontend/src/components/feature/userSettings/PushNotifications/PushNotificationToggle.tsx
@@ -1,5 +1,6 @@
 import { getErrorMessage } from '@/components/layout/AlertBanner/ErrorBanner'
 import useIsPushNotificationEnabled from '@/hooks/fetchers/useIsPushNotificationEnabled'
+import { __ } from '@/utils/translations'
 import { DropdownMenu } from '@radix-ui/themes'
 import { useState } from 'react'
 import { BsBell, BsBellSlash } from 'react-icons/bs'
@@ -23,10 +24,10 @@ const PushNotificationToggle = (props: Props) => {
                 .disableNotification()
                 .then((data: any) => {
                     setPushNotificationsEnabled(false) // Disable the switch
-                    toast.info("Push notifications disabled")
+                    toast.info(__("Push notifications disabled"))
                 })
                 .catch((error: any) => {
-                    toast.error("There was an error", {
+                    toast.error(__("There was an error"), {
                         description: getErrorMessage(error)
                     }
                     )
@@ -54,8 +55,8 @@ const PushNotificationToggle = (props: Props) => {
                     throw error
                 })
             , {
-                success: "Push notifications enabled",
-                loading: "Enabling...",
+                success: __("Push notifications enabled"),
+                loading: __("Enabling..."),
                 error: (e: Error) => e.message
             })
     }
@@ -68,7 +69,7 @@ const PushNotificationToggle = (props: Props) => {
         <DropdownMenu.Item color='gray'
             onClick={togglePushNotifications}
             className={'flex justify-normal gap-2'}>
-            {pushNotificationsEnabled ? <><BsBellSlash size='14' /> Disable Notifications</> : <><BsBell size='14' /> Enable Notifications</>}
+            {pushNotificationsEnabled ? <><BsBellSlash size='14' /> {__("Disable Notifications")}</> : <><BsBell size='14' /> {__("Enable Notifications")}</>}
         </DropdownMenu.Item>
     )
 }
diff --git a/frontend/src/components/feature/userSettings/SettingsSidebar.tsx b/frontend/src/components/feature/userSettings/SettingsSidebar.tsx
index f62e0d43f..165991d62 100644
--- a/frontend/src/components/feature/userSettings/SettingsSidebar.tsx
+++ b/frontend/src/components/feature/userSettings/SettingsSidebar.tsx
@@ -1,17 +1,15 @@
-import { useIsDesktop } from '@/hooks/useMediaQuery'
+import { __ } from '@/utils/translations'
 import { Box, Flex, Separator, Text } from '@radix-ui/themes'
 import clsx from 'clsx'
 import { PropsWithChildren, createElement } from 'react'
 import { IconType } from 'react-icons'
-import { BiBuildings } from 'react-icons/bi'
+import { BiBot, BiBuildings } from 'react-icons/bi'
 import { BsBoxes } from 'react-icons/bs'
 import { LuUserCircle2 } from 'react-icons/lu'
 import { NavLink } from 'react-router-dom'
 
 export const SettingsSidebar = () => {
 
-    const isDesktop = useIsDesktop()
-
     return (
         <Box className="h-[full] w-64 border-r border-gray-4  dark:border-gray-6">
             <Flex direction="column" gap='2' className='px-4'>
@@ -25,9 +23,17 @@ export const SettingsSidebar = () => {
                     {/* <SettingsSidebarItem title="Bots" to='bots' /> */}
                 </SettingsGroup>
                 <SettingsSeparator />
+                <SettingsGroup title="AI" icon={BiBot}>
+                    <SettingsSidebarItem title="Bots" to='bots' />
+                    <SettingsSidebarItem title="Functions" to='functions' />
+                    <SettingsSidebarItem title="Commands" to='commands' />
+                    <SettingsSidebarItem title="Instructions" to="instructions" />
+                    <SettingsSidebarItem title="OpenAI Settings" to='openai-settings' />
+                </SettingsGroup>
+                <SettingsSeparator />
                 <SettingsGroup title='Integrations' icon={BsBoxes}>
                     {/* <SettingsSidebarItem title="ERPNext" to='erpnext' /> */}
-                    <SettingsSidebarItem title="Frappe HR" to='frappe-hr' />
+                    <SettingsSidebarItem title="HR" to='hr' />
                     {/* <SettingsSidebarItem title="Frappe LMS" to='frappe-lms' /> */}
                     {/* <SettingsSidebarItem title="Frappe CRM" to='frappe-crm' /> */}
                 </SettingsGroup>
@@ -50,7 +56,7 @@ const SettingsSidebarGroupHeader = ({ title, icon }: { title: string, icon: Icon
     return (
         <Flex className="py-1.5 flex items-center gap-1.5 text-gray-11">
             {createElement(icon, { size: 15 })}
-            <Text size='1'>{title}</Text>
+            <Text size='1'>{__(title)}</Text>
         </Flex>
     )
 }
@@ -68,8 +74,8 @@ const SettingsSidebarItem = ({ title, to, end }: { title: string, to: string, en
             {({ isActive }) => {
                 return (
                     <Box className='ml-4'>
-                        <Flex className={clsx(`px-2 py-1 text-gray-12 rounded-md cursor-default w-full`, isActive ? activeClass : "bg-transparent hover:bg-slate-2 hover:dark:bg-slate-3")}>
-                            <Text className='text-[13px]' weight='medium'>{title}</Text>
+                        <Flex className={clsx(`px-2 py-1 text-gray-12 rounded-md w-full`, isActive ? activeClass : "bg-transparent hover:bg-slate-2 hover:dark:bg-slate-3")}>
+                            <Text className='text-[13px]' weight='medium'>{__(title)}</Text>
                         </Flex>
                     </Box>
                 )
diff --git a/frontend/src/components/feature/userSettings/UploadImage/DeleteImageModal.tsx b/frontend/src/components/feature/userSettings/UploadImage/DeleteImageModal.tsx
index da78964cc..f5c780c3b 100644
--- a/frontend/src/components/feature/userSettings/UploadImage/DeleteImageModal.tsx
+++ b/frontend/src/components/feature/userSettings/UploadImage/DeleteImageModal.tsx
@@ -4,6 +4,7 @@ import { AlertDialog, Button, Flex, Text } from '@radix-ui/themes'
 import { ErrorBanner } from '@/components/layout/AlertBanner'
 import { Loader } from '@/components/common/Loader'
 import useCurrentRavenUser from '@/hooks/useCurrentRavenUser'
+import { __ } from '@/utils/translations'
 
 interface DeleteImageModalProps {
     onClose: () => void
@@ -29,23 +30,23 @@ export const DeleteImageModal = ({ onClose }: DeleteImageModalProps) => {
 
     return (
         <>
-            <AlertDialog.Title>Remove Image</AlertDialog.Title>
+            <AlertDialog.Title>{__("Remove Image")}</AlertDialog.Title>
 
             <Flex direction={'column'} gap='2'>
                 <ErrorBanner error={error} />
-                <Text>Are you sure you want to remove this image?</Text>
+                <Text>{__("Are you sure you want to remove this image?")}</Text>
             </Flex>
 
             <Flex gap="3" mt="4" justify="end">
                 <AlertDialog.Cancel>
                     <Button variant="soft" color="gray">
-                        Cancel
+                        {__("Cancel")}
                     </Button>
                 </AlertDialog.Cancel>
                 <AlertDialog.Action>
                     <Button variant="solid" color="red" onClick={removeImage} disabled={loading}>
                         {loading && <Loader />}
-                        {loading ? "Removing" : "Remove"}
+                        {loading ? __("Removing") : __("Remove")}
                     </Button>
                 </AlertDialog.Action>
             </Flex>
diff --git a/frontend/src/components/feature/userSettings/UploadImage/FileUploadBox.tsx b/frontend/src/components/feature/userSettings/UploadImage/FileUploadBox.tsx
index 66eacc71c..a488fc442 100644
--- a/frontend/src/components/feature/userSettings/UploadImage/FileUploadBox.tsx
+++ b/frontend/src/components/feature/userSettings/UploadImage/FileUploadBox.tsx
@@ -1,5 +1,4 @@
-import { Button, Flex, IconButton, Text } from "@radix-ui/themes";
-import { FlexProps } from "@radix-ui/themes/dist/cjs/components/flex";
+import { Button, Flex, FlexProps, IconButton, Text } from "@radix-ui/themes";
 import { forwardRef, useImperativeHandle, useState } from "react";
 import { Accept, useDropzone } from "react-dropzone";
 import { toast } from "sonner";
@@ -9,8 +8,9 @@ import { BiTrash } from "react-icons/bi";
 import { CustomFile } from "../../file-upload/FileDrop";
 import { FileUploadProgress } from "../../chat/ChatInput/FileInput/useFileUpload";
 import { getFileSize } from "../../file-upload/FileListItem";
+import { __ } from "@/utils/translations";
 
-export interface FileUploadBoxProps extends FlexProps {
+export type FileUploadBoxProps = FlexProps & {
     /** File to be uploaded */
     file: CustomFile | undefined
     /** Function to set file in parent */
@@ -28,10 +28,10 @@ export const FileUploadBox = forwardRef((props: FileUploadBoxProps, ref) => {
 
     const fileSizeValidator = (file: any) => {
         if (maxFileSize && file.size > maxFileSize * 1000000) {
-            toast.error(`Uh Oh! ${file.name} exceeded the maximum file size required.`)
+            toast.error(__("Uh Oh! {0} exceeded the maximum file size required.", [file.name]))
             return {
                 code: "size-too-large",
-                message: `File size is larger than the required size.`,
+                message: __("File size is larger than the required size."),
             }
         } else return null
     }
@@ -86,20 +86,20 @@ export const FileUploadBox = forwardRef((props: FileUploadBoxProps, ref) => {
                 display={"flex"}>
                 <Flex gap={'1'}>
                     <Text as="span" size="2" color="gray">
-                        Drag and drop your file here or
+                        {__("Drag and drop your file here or")}
                     </Text>
                     <Button variant={'ghost'} onClick={open} className={"underline not-cal hover:bg-transparent cursor-pointer"}>
-                        choose file
+                        {__("choose file")}
                     </Button>
                 </Flex>
                 <input type="file" style={{ display: "none" }} {...getInputProps()} />
             </Flex>
             <Flex justify={'between'}>
                 <Text as="span" size="1" color="gray">
-                    Supported formats: .jpeg, .jpg, .png
+                    {__("Supported formats: {0}, {1}, {2}", [".jpeg", ".jpg", ".png"])}
                 </Text>
                 <Text as="span" size="1" color="gray">
-                    Maximum file size: 10MB
+                    {__("Maximum file size: {0}MB", [10])}
                 </Text>
             </Flex>
             {file && <FileItem file={file} uploadProgress={fileUploadProgress} removeFile={() => removeFile(file.fileID)} />}
diff --git a/frontend/src/components/feature/userSettings/UploadImage/ImageUploader.tsx b/frontend/src/components/feature/userSettings/UploadImage/ImageUploader.tsx
index c5e984f12..35ac527ca 100644
--- a/frontend/src/components/feature/userSettings/UploadImage/ImageUploader.tsx
+++ b/frontend/src/components/feature/userSettings/UploadImage/ImageUploader.tsx
@@ -10,6 +10,7 @@ import { FiCamera } from "react-icons/fi"
 import { BiSolidTrash } from "react-icons/bi"
 import { UserAvatar, getInitials } from "@/components/common/UserAvatar"
 import useCurrentRavenUser from "@/hooks/useCurrentRavenUser"
+import { __ } from "@/utils/translations"
 
 interface ImageUploaderProps {
     /** Takes input MIME type as 'key' & array of extensions as 'value'; empty array - all extensions supported */
@@ -32,7 +33,7 @@ export const ImageUploader = ({ icon, accept = { 'image/*': ['.jpeg', '.jpg', '.
                 fieldname: 'user_image',
                 value: file
             }).then(() => {
-                toast("Image uploaded successfully.")
+                toast(__("Image uploaded successfully."))
                 mutate()
             }).catch(() => {
                 toast(`There was an error while uploading the image. ${error ? error.exception ?? error.httpStatusText : null}`)
diff --git a/frontend/src/components/feature/userSettings/UploadImage/UploadImageModal.tsx b/frontend/src/components/feature/userSettings/UploadImage/UploadImageModal.tsx
index f3a5fc2b1..a6fc4efcf 100644
--- a/frontend/src/components/feature/userSettings/UploadImage/UploadImageModal.tsx
+++ b/frontend/src/components/feature/userSettings/UploadImage/UploadImageModal.tsx
@@ -6,6 +6,7 @@ import { ErrorBanner } from "@/components/layout/AlertBanner"
 import { useState } from "react"
 import { FrappeError, useFrappeFileUpload } from "frappe-react-sdk"
 import { FileUploadBox } from "./FileUploadBox"
+import { __ } from "@/utils/translations"
 
 interface UploadImageModalProps {
     onClose: () => void,
@@ -43,7 +44,7 @@ export const UploadImageModal = ({ onClose, uploadImage }: UploadImageModalProps
 
     return (
         <>
-            <Dialog.Title>Upload file</Dialog.Title>
+            <Dialog.Title>{__("Upload file")}</Dialog.Title>
 
             <ErrorBanner error={fileError} />
 
@@ -56,11 +57,11 @@ export const UploadImageModal = ({ onClose, uploadImage }: UploadImageModalProps
 
             <Flex gap="3" mt="6" justify="end" align='center'>
                 <Dialog.Close disabled={loading}>
-                    <Button variant="soft" color="gray">Cancel</Button>
+                    <Button variant="soft" color="gray">{__("Cancel")}</Button>
                 </Dialog.Close>
                 <Button type='button' onClick={uploadFiles} disabled={loading}>
                     {loading && <Loader />}
-                    {loading ? "Saving" : "Save"}
+                    {loading ? __("Saving") : __("Save")}
                 </Button>
             </Flex>
         </>
diff --git a/frontend/src/components/feature/userSettings/UserProfile/UserProfile.tsx b/frontend/src/components/feature/userSettings/UserProfile/UserProfile.tsx
index 140ce4f94..900b6cd86 100644
--- a/frontend/src/components/feature/userSettings/UserProfile/UserProfile.tsx
+++ b/frontend/src/components/feature/userSettings/UserProfile/UserProfile.tsx
@@ -13,6 +13,10 @@ import { GrPowerReset } from "react-icons/gr"
 import { BiSmile } from "react-icons/bi"
 import EmojiPicker from "@/components/common/EmojiPicker/EmojiPicker"
 import { useIsDesktop } from "@/hooks/useMediaQuery"
+import PageContainer from "@/components/layout/Settings/PageContainer"
+import SettingsPageHeader from "@/components/layout/Settings/SettingsPageHeader"
+import SettingsContentContainer from "@/components/layout/Settings/SettingsContentContainer"
+import { __ } from "@/utils/translations"
 
 type UserProfile = {
     full_name?: string,
@@ -21,7 +25,7 @@ type UserProfile = {
     custom_status?: string
 }
 
-export const UserProfile = () => {
+const UserProfile = () => {
 
     const { myProfile, mutate } = useCurrentRavenUser()
     const methods = useForm<UserProfile>({
@@ -44,10 +48,10 @@ export const UserProfile = () => {
             availability_status: availabilityStatus,
             custom_status: data.custom_status
         }).then(() => {
-            toast.success("Profile updated")
+            toast.success(__("Profile updated"))
             mutate()
         }).catch(() => {
-            toast.error("Profile update failed")
+            toast.error(__("Profile update failed"))
         })
     }
 
@@ -59,22 +63,18 @@ export const UserProfile = () => {
     const isDesktop = useIsDesktop()
 
     return (
-        <Flex direction='column' gap='4' px='6' py='4'>
-
+        <PageContainer>
             <FormProvider {...methods}>
                 <form onSubmit={handleSubmit(onSubmit)}>
-
-                    <Flex direction={'column'} gap='4'>
-                        <Flex justify={'between'} align={'center'}>
-                            <Flex direction='column' gap='0'>
-                                <Text size='3' className={'font-semibold'}>Profile</Text>
-                                <Text size='1' color='gray'>Manage your Raven profile</Text>
-                            </Flex>
-                            <Button type='submit' disabled={updatingDoc}>
+                    <SettingsContentContainer>
+                        <SettingsPageHeader
+                            title={__('Profile')}
+                            description={__('Manage your Raven profile')}
+                            actions={<Button type='submit' disabled={updatingDoc}>
                                 {updatingDoc && <Loader />}
-                                {updatingDoc ? "Saving" : "Save"}
-                            </Button>
-                        </Flex>
+                                {updatingDoc ? __("Saving") : __("Save")}
+                            </Button>}
+                        />
 
                         <Card className="p-0 align-middle justify-center">
                             <Flex direction={'column'} gap='0'>
@@ -88,7 +88,7 @@ export const UserProfile = () => {
                                 <Flex gap='4' direction='column' className={'py-4 px-6 dark:bg-slate-2'}>
 
                                     <Flex justify={'between'} align={'center'}>
-                                        <Label htmlFor='full_name'>Full Name</Label>
+                                        <Label htmlFor='full_name'>{__("Full Name")}</Label>
                                         <TextField.Root
                                             autoFocus
                                             maxLength={140}
@@ -98,7 +98,7 @@ export const UserProfile = () => {
                                             {...register('full_name', {
                                                 maxLength: {
                                                     value: 140,
-                                                    message: "Name cannot be more than 140 characters."
+                                                    message: __("Name cannot be more than {0} characters.", [140])
                                                 }
                                             })}
                                             aria-invalid={errors.full_name ? 'true' : 'false'}
@@ -109,11 +109,11 @@ export const UserProfile = () => {
                                     <Separator className={'w-full bg-slate-4'} />
 
                                     <Flex justify={'between'} align={'center'}>
-                                        <Label htmlFor="availability_status">Availability Status</Label>
+                                        <Label htmlFor="availability_status">{__("Availability Status")}</Label>
                                         <DropdownMenu.Root>
                                             <DropdownMenu.Trigger>
                                                 <Flex gap={'2'} align='center' className={'text-sm px-2 py-1 border border-gray-7 rounded w-48 sm:w-96'}>{availabilityStatus ? getStatusText(availabilityStatus) :
-                                                    <Text color="gray">Set Availability</Text>
+                                                    <Text color="gray">{__("Set Availability")}</Text>
                                                 }</Flex>
                                             </DropdownMenu.Trigger>
                                             <DropdownMenu.Content variant="soft">
@@ -130,7 +130,7 @@ export const UserProfile = () => {
                                                     {getStatusText('Invisible')}
                                                 </DropdownMenu.Item>
                                                 <DropdownMenu.Item className={'flex justify-normal gap-2'} color='gray' onClick={() => setAvailabilityStatus('')}>
-                                                    <GrPowerReset fontSize={'0.7rem'} /> Reset
+                                                    <GrPowerReset fontSize={'0.7rem'} /> {__("Reset")}
                                                 </DropdownMenu.Item>
                                             </DropdownMenu.Content>
                                         </DropdownMenu.Root>
@@ -140,8 +140,8 @@ export const UserProfile = () => {
 
                                     <Flex justify={'between'} align={'center'}>
                                         <Flex direction={'column'} gap='0'>
-                                            <Label htmlFor='custom_status'>Custom Status</Label>
-                                            {isDesktop && <Text size={'1'} color={'gray'} style={{ lineHeight: '0.8' }}>Share what you are up to</Text>}
+                                            <Label htmlFor='custom_status'>{__("Custom Status")}</Label>
+                                            {isDesktop && <Text size={'1'} color={'gray'} style={{ lineHeight: '0.8' }}>{__("Share what you are up to")}</Text>}
                                         </Flex>
                                         <Flex align={'center'} gap='3'>
                                             <Flex direction={'column'} gap='1'>
@@ -152,7 +152,7 @@ export const UserProfile = () => {
                                                     {...register('custom_status', {
                                                         maxLength: {
                                                             value: 140,
-                                                            message: "Status cannot be more than 140 characters."
+                                                            message: __("Status cannot be more than {} characters.", ["140"])
                                                         }
                                                     })}
                                                     className={'w-48 sm:w-96'}
@@ -178,10 +178,12 @@ export const UserProfile = () => {
                                 </Flex>
                             </Flex>
                         </Card>
-                    </Flex>
+                    </SettingsContentContainer>
 
                 </form>
             </FormProvider>
-        </Flex>
+        </PageContainer>
     )
-}
\ No newline at end of file
+}
+
+export const Component = UserProfile
\ No newline at end of file
diff --git a/frontend/src/components/feature/userSettings/Users/AddUsers.tsx b/frontend/src/components/feature/userSettings/Users/AddUsers.tsx
index 6e450aa35..ea9318eb1 100644
--- a/frontend/src/components/feature/userSettings/Users/AddUsers.tsx
+++ b/frontend/src/components/feature/userSettings/Users/AddUsers.tsx
@@ -16,6 +16,9 @@ import { PageLengthSelector } from "../../pagination/PageLengthSelector"
 import { PageSelector } from "../../pagination/PageSelector"
 import { UsersTable } from "./UsersTable"
 import { isSystemManager } from "@/utils/roles"
+import PageContainer from "@/components/layout/Settings/PageContainer"
+import SettingsPageHeader from "@/components/layout/Settings/SettingsPageHeader"
+import SettingsContentContainer from "@/components/layout/Settings/SettingsContentContainer"
 
 interface AddUsersResponse {
     failed_users: User[],
@@ -82,20 +85,18 @@ const AddUsers = () => {
     const canAddRavenUsers = isSystemManager()
 
     return (
-        <Flex direction='column' gap='4' px='6' py='4'>
-
-            <Flex justify='between' align='center'>
-                <Flex direction='column' gap='0'>
-                    <Text size='3' className={'font-semibold'}>Add users to Raven</Text>
-                    <Text size='1' color='gray'>Only System managers have the ability to add users; users you add will be given the <Strong>"Raven User"</Strong> role.</Text>
-                </Flex>
-                <Button type='button' disabled={loading || !canAddRavenUsers} onClick={handleAddUsers}>
-                    {loading && <Loader />}
-                    {loading ? "Adding" : "Add"}
-                </Button>
-            </Flex>
-
-            <Flex direction='column' gap='4'>
+        <PageContainer>
+
+
+            <SettingsContentContainer>
+                <SettingsPageHeader
+                    title="Add users to Raven"
+                    description={<>Only System managers have the ability to add users; users you add will be given the <Strong>"Raven User"</Strong> role.</>}
+                    actions={<Button type='button' disabled={loading || !canAddRavenUsers} onClick={handleAddUsers}>
+                        {loading && <Loader />}
+                        {loading ? "Adding" : "Add"}
+                    </Button>}
+                />
                 <Flex justify='between' gap='2'>
                     <Flex gap='2' align='center'>
                         <TextField.Root onChange={handleChange}
@@ -145,8 +146,8 @@ const AddUsers = () => {
 
                 {data && data.length !== 0 && <UsersTable data={data} defaultSelected={ravenUsersArray} selected={selected} setSelected={setSelected} />}
 
-            </Flex>
-        </Flex>
+            </SettingsContentContainer>
+        </PageContainer>
     )
 }
 
diff --git a/frontend/src/components/feature/userSettings/Users/UsersTable.tsx b/frontend/src/components/feature/userSettings/Users/UsersTable.tsx
index 1a91ba119..d6515948b 100644
--- a/frontend/src/components/feature/userSettings/Users/UsersTable.tsx
+++ b/frontend/src/components/feature/userSettings/Users/UsersTable.tsx
@@ -56,7 +56,7 @@ export const UsersTable = ({ data, selected, setSelected, defaultSelected }: Use
     }
 
     return (
-        <Table.Root variant="surface">
+        <Table.Root variant="surface" className='rounded-sm'>
             <Table.Header>
                 <Table.Row>
                     <Table.ColumnHeaderCell><Checkbox checked={isAllChecked} onCheckedChange={(e) => setAllChecked(e.valueOf() ? true : false)} /></Table.ColumnHeaderCell>
diff --git a/frontend/src/components/layout/Breadcrumb.tsx b/frontend/src/components/layout/Breadcrumb.tsx
new file mode 100644
index 000000000..27491c539
--- /dev/null
+++ b/frontend/src/components/layout/Breadcrumb.tsx
@@ -0,0 +1,150 @@
+import * as React from "react"
+import { Slot } from "@radix-ui/react-slot"
+import { BiDotsHorizontal } from "react-icons/bi"
+import clsx from "clsx"
+import { Link } from "react-router-dom"
+import { LuChevronRight } from "react-icons/lu"
+import { Tooltip } from "@radix-ui/themes"
+import { toast } from "sonner"
+
+const Breadcrumb = React.forwardRef<
+    HTMLElement,
+    React.ComponentPropsWithoutRef<"nav"> & {
+        separator?: React.ReactNode
+    }
+>(({ ...props }, ref) => <nav ref={ref} aria-label="breadcrumb" {...props} />)
+Breadcrumb.displayName = "Breadcrumb"
+
+const BreadcrumbList = React.forwardRef<
+    HTMLOListElement,
+    React.ComponentPropsWithoutRef<"ol">
+>(({ className, ...props }, ref) => (
+    <ol
+        ref={ref}
+        className={clsx(
+            "flex flex-wrap items-center gap-1 break-words text-sm text-gray-11 sm:gap-1 list-none",
+            className
+        )}
+        {...props}
+    />
+))
+BreadcrumbList.displayName = "BreadcrumbList"
+
+const BreadcrumbItem = React.forwardRef<
+    HTMLLIElement,
+    React.ComponentPropsWithoutRef<"li">
+>(({ className, ...props }, ref) => (
+    <li
+        ref={ref}
+        className={clsx("inline-flex items-center gap-1.5", className)}
+        {...props}
+    />
+))
+BreadcrumbItem.displayName = "BreadcrumbItem"
+
+const BreadcrumbLink = React.forwardRef<
+    HTMLAnchorElement,
+    React.ComponentPropsWithoutRef<"a"> & {
+        asChild?: boolean
+        href: string
+    }
+>(({ asChild, className, ...props }, ref) => {
+    const Comp = asChild ? Slot : Link
+
+    return (
+        <Comp
+            ref={ref}
+            to={props.href}
+            className={clsx("text-gray-11 transition-colors hover:text-gray-12", className)}
+            {...props}
+        />
+    )
+})
+BreadcrumbLink.displayName = "BreadcrumbLink"
+
+const BreadcrumbPage = React.forwardRef<
+    HTMLSpanElement,
+    React.ComponentPropsWithoutRef<"span"> & {
+        copyToClipboard?: boolean,
+        value?: React.ReactNode
+    }
+>(({ className, copyToClipboard, value, ...props }, ref) => {
+
+    const onCopy = () => {
+        if (copyToClipboard && value) {
+            navigator.clipboard.writeText(value.toString())
+                .then(() => toast.success("Copied to clipboard", {
+                    duration: 800
+                }))
+        }
+    }
+
+    if (copyToClipboard && value) {
+        return <Tooltip content={"Click to copy"}>
+            <span
+                ref={ref}
+                role={copyToClipboard ? "button" : "link"}
+                aria-disabled="true"
+                aria-current="page"
+                onClick={onCopy}
+                className={clsx("font-normal text-gray-12 cursor-pointer", className)}
+                {...props}
+            />
+        </Tooltip>
+    }
+
+    return (
+        <span
+            ref={ref}
+            role={"link"}
+            aria-disabled="true"
+            aria-current="page"
+            className={clsx("font-normal text-gray-12", className)}
+            {...props}
+        />
+    )
+})
+
+BreadcrumbPage.displayName = "BreadcrumbPage"
+
+const BreadcrumbSeparator = ({
+    children,
+    className,
+    ...props
+}: React.ComponentProps<"li">) => (
+    <li
+        role="presentation"
+        aria-hidden="true"
+        className={clsx("flex items-center", className)}
+        {...props}
+    >
+        {children ?? <LuChevronRight size='14' />}
+    </li>
+)
+BreadcrumbSeparator.displayName = "BreadcrumbSeparator"
+
+const BreadcrumbEllipsis = ({
+    className,
+    ...props
+}: React.ComponentProps<"span">) => (
+    <span
+        role="presentation"
+        aria-hidden="true"
+        className={clsx("flex h-9 w-9 items-center justify-center", className)}
+        {...props}
+    >
+        <BiDotsHorizontal className="h-4 w-4" />
+        <span className="sr-only">More</span>
+    </span>
+)
+BreadcrumbEllipsis.displayName = "BreadcrumbElipssis"
+
+export {
+    Breadcrumb,
+    BreadcrumbList,
+    BreadcrumbItem,
+    BreadcrumbLink,
+    BreadcrumbPage,
+    BreadcrumbSeparator,
+    BreadcrumbEllipsis,
+}
diff --git a/frontend/src/components/layout/Loaders/FullPageLoader.tsx b/frontend/src/components/layout/Loaders/FullPageLoader.tsx
index 290205202..959b25c78 100644
--- a/frontend/src/components/layout/Loaders/FullPageLoader.tsx
+++ b/frontend/src/components/layout/Loaders/FullPageLoader.tsx
@@ -1,9 +1,8 @@
 import { Loader } from '@/components/common/Loader'
-import { Flex, Text } from '@radix-ui/themes'
-import { FlexProps } from '@radix-ui/themes/dist/cjs/components/flex'
+import { Flex, FlexProps, Text } from '@radix-ui/themes'
 import { clsx } from 'clsx'
 
-interface Props extends FlexProps {
+type Props = FlexProps & {
     text?: string
 }
 
diff --git a/frontend/src/components/layout/Loaders/TableLoader.tsx b/frontend/src/components/layout/Loaders/TableLoader.tsx
index 16c92cbf0..2b6ef29ed 100644
--- a/frontend/src/components/layout/Loaders/TableLoader.tsx
+++ b/frontend/src/components/layout/Loaders/TableLoader.tsx
@@ -1,5 +1,6 @@
 import { Skeleton } from "@/components/common/Skeleton"
 import { Table } from "@radix-ui/themes"
+import TableHeader from "@tiptap/extension-table-header"
 
 
 interface Props {
@@ -11,7 +12,12 @@ interface Props {
 export const TableLoader = ({ rows = 10, columns = 5, color = "gray", ...props }: Props) => {
 
     return (
-        <Table.Root {...props}>
+        <Table.Root variant="surface" {...props} className='rounded-sm'>
+            <Table.Header>
+                <Table.Row>
+                    {[...Array(columns)].map((e, i) => <Table.ColumnHeaderCell key={i}><Skeleton width='100%' height='16px' /></Table.ColumnHeaderCell>)}
+                </Table.Row>
+            </Table.Header>
             <Table.Body>
                 {
                     [...Array(rows)].map((e, index) =>
diff --git a/frontend/src/components/layout/Settings/PageContainer.tsx b/frontend/src/components/layout/Settings/PageContainer.tsx
new file mode 100644
index 000000000..f7599d61e
--- /dev/null
+++ b/frontend/src/components/layout/Settings/PageContainer.tsx
@@ -0,0 +1,9 @@
+import { Flex, FlexProps } from '@radix-ui/themes'
+
+const PageContainer = (props: FlexProps) => {
+    return (
+        <Flex direction='column' gap='4' px='6' py='4' {...props} />
+    )
+}
+
+export default PageContainer
\ No newline at end of file
diff --git a/frontend/src/components/layout/Settings/SettingsContentContainer.tsx b/frontend/src/components/layout/Settings/SettingsContentContainer.tsx
new file mode 100644
index 000000000..3e8a67e78
--- /dev/null
+++ b/frontend/src/components/layout/Settings/SettingsContentContainer.tsx
@@ -0,0 +1,9 @@
+import { Flex, FlexProps } from '@radix-ui/themes'
+
+const SettingsContentContainer = (props: FlexProps) => {
+    return (
+        <Flex direction={'column'} gap='4' {...props} />
+    )
+}
+
+export default SettingsContentContainer
\ No newline at end of file
diff --git a/frontend/src/components/layout/Settings/SettingsPageHeader.tsx b/frontend/src/components/layout/Settings/SettingsPageHeader.tsx
new file mode 100644
index 000000000..e64c88983
--- /dev/null
+++ b/frontend/src/components/layout/Settings/SettingsPageHeader.tsx
@@ -0,0 +1,48 @@
+import { Badge, BadgeProps, Flex, Text } from '@radix-ui/themes'
+import React from 'react'
+import { HStack } from '../Stack'
+import { Breadcrumb, BreadcrumbItem, BreadcrumbLink, BreadcrumbList, BreadcrumbPage, BreadcrumbSeparator } from '../Breadcrumb'
+
+type BreadcrumbItem = {
+    label: React.ReactNode,
+    href: string,
+    copyToClipboard?: boolean
+}
+type Props = {
+    title: React.ReactNode,
+    headerBadges?: { label: string, color: BadgeProps['color'] }[],
+    description?: React.ReactNode
+    actions?: React.ReactNode,
+    breadcrumbs?: BreadcrumbItem[]
+}
+
+const SettingsPageHeader = ({ title, description, actions, headerBadges, breadcrumbs }: Props) => {
+    return (
+        <Flex justify={'between'} align={'center'}>
+            <Flex direction='column' className='gap-0.5'>
+                {breadcrumbs ? <Breadcrumb>
+                    <BreadcrumbList>
+                        {breadcrumbs.map((b, index) => <React.Fragment key={b.href}>
+                            {index < breadcrumbs.length - 1 ? <>
+                                <BreadcrumbItem>
+                                    <BreadcrumbLink href={b.href}>{b.label}</BreadcrumbLink>
+                                </BreadcrumbItem>
+                                <BreadcrumbSeparator />
+                            </> :
+                                <BreadcrumbPage copyToClipboard={b.copyToClipboard} value={b.label}>{b.label}</BreadcrumbPage>
+                            }
+                        </React.Fragment>)}
+                    </BreadcrumbList>
+                </Breadcrumb> : null}
+                <HStack gap='2' align='center'>
+                    <Text size='5' className={'font-semibold'}>{title}</Text>
+                    {headerBadges?.map(badge => <Badge size='1' color={badge.color} key={badge.label}>{badge.label}</Badge>)}
+                </HStack>
+                {description && <Text size='2' color='gray'>{description}</Text>}
+            </Flex>
+            {actions}
+        </Flex>
+    )
+}
+
+export default SettingsPageHeader
\ No newline at end of file
diff --git a/frontend/src/components/layout/Sidebar/PinnedChannels.tsx b/frontend/src/components/layout/Sidebar/PinnedChannels.tsx
index 1149fd677..86f1d897a 100644
--- a/frontend/src/components/layout/Sidebar/PinnedChannels.tsx
+++ b/frontend/src/components/layout/Sidebar/PinnedChannels.tsx
@@ -4,6 +4,7 @@ import { SidebarGroup, SidebarGroupItem, SidebarGroupLabel, SidebarGroupList } f
 import { Box, Flex } from '@radix-ui/themes'
 import { ChannelItemElement } from '@/components/feature/channels/ChannelList'
 import useCurrentRavenUser from '@/hooks/useCurrentRavenUser'
+import { __ } from '@/utils/translations'
 
 const PinnedChannels = ({ unread_count }: { unread_count?: UnreadCountData }) => {
 
@@ -38,7 +39,7 @@ const PinnedChannels = ({ unread_count }: { unread_count?: UnreadCountData }) =>
         <Box>
             <SidebarGroup>
                 <SidebarGroupItem className={'gap-1 pl-1'}>
-                    <SidebarGroupLabel className='cal-sans'>Pinned</SidebarGroupLabel>
+                    <SidebarGroupLabel className='cal-sans'>{__("Pinned")}</SidebarGroupLabel>
                 </SidebarGroupItem>
                 <SidebarGroup>
                     <SidebarGroupList>
diff --git a/frontend/src/components/layout/Sidebar/SidebarBody.tsx b/frontend/src/components/layout/Sidebar/SidebarBody.tsx
index 55ce8b77c..a226fb16b 100644
--- a/frontend/src/components/layout/Sidebar/SidebarBody.tsx
+++ b/frontend/src/components/layout/Sidebar/SidebarBody.tsx
@@ -5,8 +5,8 @@ import { AccessibleIcon, Box, Flex, ScrollArea, Text } from '@radix-ui/themes'
 import useUnreadMessageCount from '@/hooks/useUnreadMessageCount'
 import PinnedChannels from './PinnedChannels'
 import React from 'react'
-import { BiMessageAltDetail } from 'react-icons/bi'
-import { LuBookmark } from 'react-icons/lu'
+import { BiBookmark, BiMessageAltDetail } from 'react-icons/bi'
+import { __ } from '@/utils/translations'
 
 export const SidebarBody = () => {
 
@@ -24,7 +24,7 @@ export const SidebarBody = () => {
                     <SidebarItemForPage
                         to={'saved-messages'}
                         label='Saved'
-                        icon={<LuBookmark className='text-gray-12 dark:text-gray-300 mt-0.5 sm:text-sm text-base' />}
+                        icon={<BiBookmark className='text-gray-12 dark:text-gray-300 mt-0.5 sm:text-sm text-base' />}
                         iconLabel='Saved Message' />
                     <PinnedChannels unread_count={unread_count?.message} />
                 </Flex>
@@ -45,15 +45,15 @@ interface SidebarItemForPageProps {
 const SidebarItemForPage = ({ to, label, icon, iconLabel }: SidebarItemForPageProps) => {
     return (
         <Box>
-            <SidebarItem to={to} className='py-1'>
-                <AccessibleIcon label={iconLabel}>
+            <SidebarItem to={to} className='py-1 px-[10px]'>
+                <AccessibleIcon label={__(iconLabel)}>
                     {icon}
                 </AccessibleIcon>
                 <Box>
                     <Text size={{
                         initial: '3',
                         md: '2'
-                    }} weight='bold' className='text-gray-12 dark:text-gray-300'>{label}</Text>
+                    }} className='text-gray-12 dark:text-gray-300 font-semibold'>{__(label)}</Text>
                 </Box>
             </SidebarItem>
         </Box>
diff --git a/frontend/src/components/layout/Sidebar/SidebarComp.tsx b/frontend/src/components/layout/Sidebar/SidebarComp.tsx
index 61ee06ee5..861f1376c 100644
--- a/frontend/src/components/layout/Sidebar/SidebarComp.tsx
+++ b/frontend/src/components/layout/Sidebar/SidebarComp.tsx
@@ -1,14 +1,13 @@
 import React, { ReactNode } from 'react'
 import { NavLink } from 'react-router-dom'
-import { Flex, IconButton, Text, Theme } from '@radix-ui/themes';
-import { FlexProps } from '@radix-ui/themes/dist/cjs/components/flex';
-import { TextProps } from '@radix-ui/themes/dist/cjs/components/text';
+import { Flex, FlexProps, IconButton, Text, TextProps, Theme } from '@radix-ui/themes';
 import { IconButtonProps } from '@radix-ui/themes/dist/cjs/components/icon-button';
 import { BadgeProps } from '@radix-ui/themes/dist/cjs/components/badge';
 import { clsx } from 'clsx';
 import { FiChevronDown, FiChevronRight } from 'react-icons/fi';
+import { __ } from '@/utils/translations';
 
-interface SidebarGroupProps extends FlexProps {
+type SidebarGroupProps = FlexProps & {
     children: ReactNode;
 }
 
@@ -21,7 +20,7 @@ export const SidebarGroup = ({ children, ...props }: SidebarGroupProps) => {
     )
 }
 
-interface SidebarGroupItemProps extends FlexProps {
+type SidebarGroupItemProps = FlexProps & {
     children: ReactNode
 }
 export const SidebarGroupItem = ({ children, ...props }: SidebarGroupItemProps) => {
@@ -48,7 +47,7 @@ export const SidebarGroupLabel = ({ children, ...props }: SidebarGroupLabelProps
     )
 }
 
-interface SidebarGroupListProps extends FlexProps {
+type SidebarGroupListProps = FlexProps & {
     children: ReactNode
 }
 export const SidebarGroupList = ({ children, ...props }: SidebarGroupListProps) => {
@@ -60,7 +59,7 @@ export const SidebarGroupList = ({ children, ...props }: SidebarGroupListProps)
     )
 }
 
-interface SidebarItemProps extends FlexProps {
+type SidebarItemProps = FlexProps & {
     to: string;
     children: React.ReactNode,
     end?: boolean,
@@ -94,7 +93,7 @@ export const SidebarItem = ({ to, children, end, active = false, activeStyles, c
     )
 }
 
-interface SidebarIconProps extends FlexProps {
+type SidebarIconProps = FlexProps & {
     subtle?: boolean,
     children: React.ReactNode
 }
@@ -108,7 +107,7 @@ export const SidebarIcon = ({ subtle, children, ...props }: SidebarIconProps) =>
 
 
 
-interface SidebarButtonItemProps extends FlexProps {
+type SidebarButtonItemProps = FlexProps & {
     children: React.ReactNode,
     subtle?: boolean,
     onClick?: () => void,
@@ -143,8 +142,8 @@ export const SidebarViewMoreButton = ({ expanded, onClick, ...props }: SidebarVi
 
     return (
         <IconButton
-            aria-label={expanded ? 'Collapse' : "Expand"}
-            title={expanded ? 'Collapse' : "Expand"}
+            aria-label={expanded ? __("Collapse") : __("Expand")}
+            title={expanded ? __("Collapse") : __("Expand")}
             variant='soft'
             size='1'
             radius='large'
diff --git a/frontend/src/components/layout/Sidebar/SidebarFooter.tsx b/frontend/src/components/layout/Sidebar/SidebarFooter.tsx
index 68a7e599e..bfcadd3d5 100644
--- a/frontend/src/components/layout/Sidebar/SidebarFooter.tsx
+++ b/frontend/src/components/layout/Sidebar/SidebarFooter.tsx
@@ -13,6 +13,7 @@ import { useNavigate } from 'react-router-dom'
 import { SetUserAvailabilityMenu } from '@/components/feature/userSettings/AvailabilityStatus/SetUserAvailabilityMenu'
 import { SetCustomStatusModal } from '@/components/feature/userSettings/CustomStatus/SetCustomStatusModal'
 import PushNotificationToggle from '@/components/feature/userSettings/PushNotifications/PushNotificationToggle'
+import { __ } from '@/utils/translations'
 
 export const SidebarFooter = () => {
 
@@ -54,12 +55,12 @@ export const SidebarFooter = () => {
                             <DropdownMenu.Content variant='soft'>
                                 <SetUserAvailabilityMenu />
                                 <DropdownMenu.Item color='gray' className={'flex justify-normal gap-2'} onClick={() => setUserStatusModalOpen(true)}>
-                                    <BsEmojiSmile size='14' /> Set custom status
+                                    <BsEmojiSmile size='14' /> {__("Set custom status")}
                                 </DropdownMenu.Item>
                                 <PushNotificationToggle />
                                 <DropdownMenu.Separator />
                                 <DropdownMenu.Item color='red' className={'flex justify-normal gap-2'} onClick={logout}>
-                                    <MdOutlineExitToApp size='14' />Log Out
+                                    <MdOutlineExitToApp size='14' /> {__("Log Out")}
                                 </DropdownMenu.Item>
                             </DropdownMenu.Content>
                         </DropdownMenu.Root>
diff --git a/frontend/src/components/layout/Sidebar/SidebarHeader.tsx b/frontend/src/components/layout/Sidebar/SidebarHeader.tsx
index 02c7fec98..80adff33e 100644
--- a/frontend/src/components/layout/Sidebar/SidebarHeader.tsx
+++ b/frontend/src/components/layout/Sidebar/SidebarHeader.tsx
@@ -4,6 +4,7 @@ import { Flex, IconButton, Text, Tooltip } from '@radix-ui/themes'
 import { BiMoon, BiSun } from 'react-icons/bi'
 import { useSetAtom } from 'jotai'
 import { TbSearch } from 'react-icons/tb'
+import { __ } from '@/utils/translations'
 
 export const SidebarHeader = () => {
     return (
@@ -33,7 +34,7 @@ const SearchButton = () => {
             <IconButton
                 size={{ initial: '2', md: '1' }}
                 aria-label='Open command menu'
-                title='Open command menu'
+                title={__("Open command menu")}
                 color='gray'
                 className='text-gray-11 sm:hover:text-gray-12'
                 variant='ghost'
@@ -53,7 +54,7 @@ const ColorModeToggleButton = () => {
         <IconButton
             size={{ initial: '2', md: '1' }}
             aria-label='Toggle theme'
-            title='Toggle theme'
+            title={__("Toggle theme")}
             color='gray'
             className='text-gray-11 sm:hover:text-gray-12'
             variant='ghost'
diff --git a/frontend/src/components/layout/Stack.tsx b/frontend/src/components/layout/Stack.tsx
new file mode 100644
index 000000000..df9a73511
--- /dev/null
+++ b/frontend/src/components/layout/Stack.tsx
@@ -0,0 +1,13 @@
+import { Flex, FlexProps } from '@radix-ui/themes'
+
+export const HStack = (props: FlexProps) => {
+    return (
+        <Flex direction="row" gap="2" {...props} />
+    )
+}
+
+export const Stack = (props: FlexProps) => {
+    return (
+        <Flex direction="column" gap="2" {...props} />
+    )
+}
\ No newline at end of file
diff --git a/frontend/src/hooks/useDoctypeMeta.ts b/frontend/src/hooks/useDoctypeMeta.ts
new file mode 100644
index 000000000..54d8ca47a
--- /dev/null
+++ b/frontend/src/hooks/useDoctypeMeta.ts
@@ -0,0 +1,23 @@
+import { DocType } from '@/types/Core/DocType'
+import { useFrappeGetCall } from 'frappe-react-sdk'
+
+const useDoctypeMeta = (doctype: string) => {
+    const { data, isLoading } = useFrappeGetCall<{ docs: DocType[] }>('frappe.desk.form.load.getdoctype', {
+        doctype: doctype
+    }, undefined, {
+        // 24 hours
+        dedupingInterval: 1000 * 60 * 60 * 24,
+        revalidateOnFocus: false,
+        revalidateOnReconnect: false,
+    })
+
+    const childDocs = data?.docs?.slice(1)
+
+    return {
+        doc: data?.docs?.[0],
+        childDocs,
+        isLoading
+    }
+}
+
+export default useDoctypeMeta
\ No newline at end of file
diff --git a/frontend/src/hooks/useDoctypePreview.ts b/frontend/src/hooks/useDoctypePreview.ts
index 3f176c8aa..989ece672 100644
--- a/frontend/src/hooks/useDoctypePreview.ts
+++ b/frontend/src/hooks/useDoctypePreview.ts
@@ -5,7 +5,7 @@ import { useFrappeGetCall } from "frappe-react-sdk"
  * @returns name(id), preview_image, preview_title and rest fields depending on Doctype
  */
 export const useDoctypePreview = (doctype: string, docname: string) => {
-    const {data, error, isLoading} = useFrappeGetCall('raven.api.document_link.get_preview_data', {
+    const { data, error, isLoading, mutate } = useFrappeGetCall('raven.api.document_link.get_preview_data', {
         doctype,
         docname
     })
@@ -13,6 +13,7 @@ export const useDoctypePreview = (doctype: string, docname: string) => {
     return {
         data: data?.message,
         error,
-        isLoading
+        isLoading,
+        mutate
     }
 }
\ No newline at end of file
diff --git a/frontend/src/pages/settings/AI/BotList.tsx b/frontend/src/pages/settings/AI/BotList.tsx
new file mode 100644
index 000000000..264aa6045
--- /dev/null
+++ b/frontend/src/pages/settings/AI/BotList.tsx
@@ -0,0 +1,107 @@
+import { UserAvatar } from '@/components/common/UserAvatar'
+import { ErrorBanner } from '@/components/layout/AlertBanner'
+import { TableLoader } from '@/components/layout/Loaders/TableLoader'
+import PageContainer from '@/components/layout/Settings/PageContainer'
+import SettingsContentContainer from '@/components/layout/Settings/SettingsContentContainer'
+import SettingsPageHeader from '@/components/layout/Settings/SettingsPageHeader'
+import { HStack, Stack } from '@/components/layout/Stack'
+import { RavenBot } from '@/types/RavenBot/RavenBot'
+import { Badge, Button, HoverCard, Table, Text } from '@radix-ui/themes'
+import { useFrappeGetDocList } from 'frappe-react-sdk'
+import { BiSolidCheckCircle, BiSolidXCircle } from 'react-icons/bi'
+import { RiSparkling2Fill } from 'react-icons/ri'
+import { Link } from 'react-router-dom'
+
+type Props = {}
+
+const BotList = (props: Props) => {
+
+    const { data, isLoading, error } = useFrappeGetDocList<RavenBot>("Raven Bot", {
+        fields: ["name", "bot_name", "is_ai_bot", "description", "image", "enable_file_search", "dynamic_instructions", "instruction", "allow_bot_to_write_documents"],
+        orderBy: {
+            field: "modified",
+            order: "desc"
+        }
+    })
+    return (
+        <PageContainer>
+            <SettingsContentContainer>
+                <SettingsPageHeader
+                    title='Bots'
+                    description='Use Bots to send reminders, run AI assistants, and more.'
+                    actions={<Button asChild>
+                        <Link to='create'>Create</Link>
+                    </Button>}
+                />
+                {isLoading && <TableLoader columns={2} />}
+                <ErrorBanner error={error} />
+                {data && <BotTable bots={data} />}
+            </SettingsContentContainer>
+        </PageContainer>
+    )
+}
+
+const BotTable = ({ bots }: { bots: RavenBot[] }) => {
+    return (
+        <Table.Root variant="surface" className='rounded-sm'>
+            <Table.Header>
+                <Table.Row>
+                    <Table.ColumnHeaderCell>Name</Table.ColumnHeaderCell>
+                    <Table.ColumnHeaderCell>Description</Table.ColumnHeaderCell>
+                </Table.Row>
+            </Table.Header>
+            <Table.Body>
+                {bots?.map((bot) => (
+                    <Table.Row key={bot.name}>
+                        <Table.Cell maxWidth={"150px"}>
+                            <HStack align='center'>
+                                <Link to={`${bot.name}`} className='hover:underline underline-offset-4'>
+                                    <HStack align='center'>
+                                        <UserAvatar src={bot.image} alt={bot.bot_name} />
+                                        <Text weight='medium'>{bot.bot_name}</Text>
+                                    </HStack>
+                                </Link>
+                                {bot.is_ai_bot ?
+                                    <HoverCard.Root>
+                                        <HoverCard.Trigger>
+                                            <Badge color='purple'><RiSparkling2Fill /> AI</Badge>
+                                        </HoverCard.Trigger>
+                                        <HoverCard.Content>
+                                            <Stack>
+                                                <BotFeatureRow
+                                                    enabled={bot.dynamic_instructions}
+                                                    label="Dynamic Instructions"
+                                                />
+                                                <BotFeatureRow
+                                                    enabled={bot.enable_file_search}
+                                                    label="File Search"
+                                                />
+                                                <BotFeatureRow
+                                                    enabled={bot.allow_bot_to_write_documents}
+                                                    label="Can Write Documents"
+                                                />
+                                            </Stack>
+                                        </HoverCard.Content>
+                                    </HoverCard.Root>
+                                    : null}
+                            </HStack>
+                        </Table.Cell>
+                        <Table.Cell maxWidth={"250px"}>
+                            <Text className='line-clamp-1 text-ellipsis'>{bot.description ? bot.description : bot.instruction}</Text>
+                        </Table.Cell>
+                    </Table.Row>
+                ))}
+            </Table.Body>
+        </Table.Root>
+    )
+}
+
+const BotFeatureRow = ({ enabled, label }: { enabled?: 0 | 1, label: string }) => {
+    return (
+        <HStack align='center'>
+            {enabled ? <BiSolidCheckCircle className='text-green-9' /> : <BiSolidXCircle className='text-red-9' />}
+            <Text className='text-gray-12' size='2'>{label}</Text>
+        </HStack>
+    )
+}
+export const Component = BotList
\ No newline at end of file
diff --git a/frontend/src/pages/settings/AI/CreateBot.tsx b/frontend/src/pages/settings/AI/CreateBot.tsx
new file mode 100644
index 000000000..faf0a0fb5
--- /dev/null
+++ b/frontend/src/pages/settings/AI/CreateBot.tsx
@@ -0,0 +1,59 @@
+import { Loader } from '@/components/common/Loader'
+import BotForm from '@/components/feature/settings/ai/bots/BotForm'
+import { ErrorBanner } from '@/components/layout/AlertBanner'
+import PageContainer from '@/components/layout/Settings/PageContainer'
+import SettingsContentContainer from '@/components/layout/Settings/SettingsContentContainer'
+import SettingsPageHeader from '@/components/layout/Settings/SettingsPageHeader'
+import { RavenBot } from '@/types/RavenBot/RavenBot'
+import { Button } from '@radix-ui/themes'
+import { useFrappeCreateDoc } from 'frappe-react-sdk'
+import { FormProvider, useForm } from 'react-hook-form'
+import { useNavigate } from 'react-router-dom'
+
+const CreateBot = () => {
+
+    const { createDoc, loading, error } = useFrappeCreateDoc<RavenBot>()
+
+    const methods = useForm<RavenBot>({
+        disabled: loading,
+        defaultValues: {
+            is_ai_bot: 1,
+            enable_file_search: 1,
+            enable_code_interpreter: 1
+        }
+    })
+
+    const navigate = useNavigate()
+
+
+    const onSubmit = (data: RavenBot) => {
+        createDoc("Raven Bot", data)
+            .then((doc) => {
+                navigate(`../${doc.name}`)
+            })
+    }
+
+    return (
+        <PageContainer>
+            <form onSubmit={methods.handleSubmit(onSubmit)}>
+                <FormProvider {...methods}>
+                    <SettingsContentContainer>
+                        <SettingsPageHeader
+                            title='Create a Bot'
+                            // description='Bots can be used to send reminders, run AI assistants, and more.'
+                            actions={<Button type='submit' disabled={loading}>
+                                {loading && <Loader />}
+                                {loading ? "Creating" : "Create"}
+                            </Button>}
+                            breadcrumbs={[{ label: 'Bots', href: '../' }, { label: 'New Bot', href: '' }]}
+                        />
+                        <ErrorBanner error={error} />
+                        <BotForm />
+                    </SettingsContentContainer>
+                </FormProvider>
+            </form>
+        </PageContainer>
+    )
+}
+
+export const Component = CreateBot
\ No newline at end of file
diff --git a/frontend/src/pages/settings/AI/CreateFunction.tsx b/frontend/src/pages/settings/AI/CreateFunction.tsx
new file mode 100644
index 000000000..5bd43f90a
--- /dev/null
+++ b/frontend/src/pages/settings/AI/CreateFunction.tsx
@@ -0,0 +1,59 @@
+import { Loader } from '@/components/common/Loader'
+import FunctionForm from '@/components/feature/settings/ai/functions/FunctionForm'
+import { ErrorBanner } from '@/components/layout/AlertBanner'
+import PageContainer from '@/components/layout/Settings/PageContainer'
+import SettingsContentContainer from '@/components/layout/Settings/SettingsContentContainer'
+import SettingsPageHeader from '@/components/layout/Settings/SettingsPageHeader'
+import { RavenAIFunction } from '@/types/RavenAI/RavenAIFunction'
+import { Button } from '@radix-ui/themes'
+import { useFrappeCreateDoc } from 'frappe-react-sdk'
+import { FormProvider, useForm } from 'react-hook-form'
+import { useNavigate } from 'react-router-dom'
+
+const CreateFunction = () => {
+
+    const { createDoc, loading, error } = useFrappeCreateDoc<RavenAIFunction>()
+
+    const methods = useForm<RavenAIFunction>({
+        disabled: loading,
+        defaultValues: {
+            params: {
+                type: 'object',
+                properties: {},
+            }
+        }
+    })
+
+    const navigate = useNavigate()
+
+
+    const onSubmit = (data: RavenAIFunction) => {
+        createDoc("Raven AI Function", data)
+            .then((doc) => {
+                navigate(`../${doc.name}`)
+            })
+    }
+
+    return (
+        <PageContainer>
+            <form onSubmit={methods.handleSubmit(onSubmit)}>
+                <FormProvider {...methods}>
+                    <SettingsContentContainer>
+                        <SettingsPageHeader
+                            title='Create a Function'
+                            actions={<Button type='submit' disabled={loading}>
+                                {loading && <Loader />}
+                                {loading ? "Creating" : "Create"}
+                            </Button>}
+                            breadcrumbs={[{ label: 'Functions', href: '../' }, { label: 'New Function', href: '' }]}
+                        />
+                        <ErrorBanner error={error} />
+                        <FunctionForm />
+                    </SettingsContentContainer>
+                </FormProvider>
+            </form>
+        </PageContainer>
+    )
+}
+
+export const Component = CreateFunction
\ No newline at end of file
diff --git a/frontend/src/pages/settings/AI/CreateInstructionTemplate.tsx b/frontend/src/pages/settings/AI/CreateInstructionTemplate.tsx
new file mode 100644
index 000000000..6368d28f2
--- /dev/null
+++ b/frontend/src/pages/settings/AI/CreateInstructionTemplate.tsx
@@ -0,0 +1,52 @@
+import { Loader } from '@/components/common/Loader'
+import InstructionTemplateForm from '@/components/feature/settings/ai/InstructionTemplateForm'
+import { ErrorBanner } from '@/components/layout/AlertBanner'
+import PageContainer from '@/components/layout/Settings/PageContainer'
+import SettingsContentContainer from '@/components/layout/Settings/SettingsContentContainer'
+import SettingsPageHeader from '@/components/layout/Settings/SettingsPageHeader'
+import { RavenBotInstructionTemplate } from '@/types/RavenAI/RavenBotInstructionTemplate'
+import { Button } from '@radix-ui/themes'
+import { useFrappeCreateDoc } from 'frappe-react-sdk'
+import { FormProvider, useForm } from 'react-hook-form'
+import { useNavigate } from 'react-router-dom'
+
+const CreateInstructionTemplate = () => {
+
+    const { createDoc, loading, error } = useFrappeCreateDoc<RavenBotInstructionTemplate>()
+
+    const methods = useForm<RavenBotInstructionTemplate>({
+        disabled: loading
+    })
+
+    const navigate = useNavigate()
+
+    const onSubmit = (data: RavenBotInstructionTemplate) => {
+        createDoc("Raven Bot Instruction Template", data)
+            .then((doc) => {
+                navigate(`../${doc.name}`)
+            })
+    }
+
+    return (
+        <PageContainer>
+            <form onSubmit={methods.handleSubmit(onSubmit)}>
+                <FormProvider {...methods}>
+                    <SettingsContentContainer>
+                        <SettingsPageHeader
+                            title='Create an Instruction Template'
+                            actions={<Button type='submit' disabled={loading}>
+                                {loading && <Loader />}
+                                {loading ? "Creating" : "Create"}
+                            </Button>}
+                            breadcrumbs={[{ label: 'Instruction Templates', href: '../' }, { label: 'New Instruction Template', href: '' }]}
+                        />
+                        <ErrorBanner error={error} />
+                        <InstructionTemplateForm />
+                    </SettingsContentContainer>
+                </FormProvider>
+            </form>
+        </PageContainer>
+    )
+}
+
+export const Component = CreateInstructionTemplate
\ No newline at end of file
diff --git a/frontend/src/pages/settings/AI/CreateSavedPrompt.tsx b/frontend/src/pages/settings/AI/CreateSavedPrompt.tsx
new file mode 100644
index 000000000..9a99948fd
--- /dev/null
+++ b/frontend/src/pages/settings/AI/CreateSavedPrompt.tsx
@@ -0,0 +1,54 @@
+import { Loader } from '@/components/common/Loader'
+import SavedPromptForm from '@/components/feature/settings/ai/SavedPromptForm'
+import { ErrorBanner } from '@/components/layout/AlertBanner'
+import PageContainer from '@/components/layout/Settings/PageContainer'
+import SettingsContentContainer from '@/components/layout/Settings/SettingsContentContainer'
+import SettingsPageHeader from '@/components/layout/Settings/SettingsPageHeader'
+import { RavenBotAIPrompt } from '@/types/RavenAI/RavenBotAIPrompt'
+import { Button } from '@radix-ui/themes'
+import { useFrappeCreateDoc } from 'frappe-react-sdk'
+import { FormProvider, useForm } from 'react-hook-form'
+import { useNavigate } from 'react-router-dom'
+
+const CreateSavedPrompt = () => {
+
+    const { createDoc, loading, error } = useFrappeCreateDoc<RavenBotAIPrompt>()
+
+    const methods = useForm<RavenBotAIPrompt>({
+        disabled: loading
+    })
+
+    const navigate = useNavigate()
+
+
+    const onSubmit = (data: RavenBotAIPrompt) => {
+        createDoc("Raven Bot AI Prompt", data)
+            .then((doc) => {
+                navigate(`../${doc.name}`)
+            })
+    }
+
+    return (
+        <PageContainer>
+            <form onSubmit={methods.handleSubmit(onSubmit)}>
+                <FormProvider {...methods}>
+                    <SettingsContentContainer>
+                        <SettingsPageHeader
+                            title='Create a Command'
+                            // description='Bots can be used to send reminders, run AI assistants, and more.'
+                            actions={<Button type='submit' disabled={loading}>
+                                {loading && <Loader />}
+                                {loading ? "Creating" : "Create"}
+                            </Button>}
+                            breadcrumbs={[{ label: 'Commands', href: '../' }, { label: 'New Command', href: '' }]}
+                        />
+                        <ErrorBanner error={error} />
+                        <SavedPromptForm />
+                    </SettingsContentContainer>
+                </FormProvider>
+            </form>
+        </PageContainer>
+    )
+}
+
+export const Component = CreateSavedPrompt
\ No newline at end of file
diff --git a/frontend/src/pages/settings/AI/FunctionList.tsx b/frontend/src/pages/settings/AI/FunctionList.tsx
new file mode 100644
index 000000000..67b9f5f12
--- /dev/null
+++ b/frontend/src/pages/settings/AI/FunctionList.tsx
@@ -0,0 +1,108 @@
+import AINotEnabledCallout from '@/components/feature/settings/ai/AINotEnabledCallout'
+import { ErrorBanner } from '@/components/layout/AlertBanner'
+import { TableLoader } from '@/components/layout/Loaders/TableLoader'
+import PageContainer from '@/components/layout/Settings/PageContainer'
+import SettingsContentContainer from '@/components/layout/Settings/SettingsContentContainer'
+import SettingsPageHeader from '@/components/layout/Settings/SettingsPageHeader'
+import { HStack, Stack } from '@/components/layout/Stack'
+import { RavenAIFunction } from '@/types/RavenAI/RavenAIFunction'
+import { Badge, Button, Checkbox, HoverCard, Table, Text } from '@radix-ui/themes'
+import { useFrappeGetDocList } from 'frappe-react-sdk'
+import { Link } from 'react-router-dom'
+
+type Props = {}
+
+const FunctionList = (props: Props) => {
+
+    const { data, isLoading, error } = useFrappeGetDocList<RavenAIFunction>("Raven AI Function", {
+        fields: ["name", "description", "function_name", "type", "requires_write_permissions"],
+        orderBy: {
+            field: "modified",
+            order: "desc"
+        }
+    })
+    return (
+        <PageContainer>
+            <SettingsContentContainer>
+                <SettingsPageHeader
+                    title='Functions'
+                    description='Declare functions to be used by your AI bots.'
+                    actions={<Button asChild>
+                        <Link to='create'>Create</Link>
+                    </Button>}
+                />
+                {isLoading && <TableLoader columns={2} />}
+                <ErrorBanner error={error} />
+                <AINotEnabledCallout />
+                {data && <FunctionTable functions={data} />}
+            </SettingsContentContainer>
+        </PageContainer>
+    )
+}
+
+const FunctionTable = ({ functions }: { functions: RavenAIFunction[] }) => {
+    return (
+        <Table.Root variant="surface" className='rounded-sm'>
+            <Table.Header>
+                <Table.Row>
+                    <Table.ColumnHeaderCell>Name</Table.ColumnHeaderCell>
+                    <Table.ColumnHeaderCell>Description</Table.ColumnHeaderCell>
+                    <Table.ColumnHeaderCell>Type</Table.ColumnHeaderCell>
+                    <Table.ColumnHeaderCell>Writes</Table.ColumnHeaderCell>
+                </Table.Row>
+            </Table.Header>
+            <Table.Body>
+                {functions?.map((f) => (
+                    <Table.Row key={f.name}>
+                        <Table.Cell maxWidth={"250px"}>
+                            <HStack align='center'>
+                                <Link to={`${f.name}`} className='hover:underline underline-offset-4'>
+                                    <Text weight='medium'>{f.function_name}</Text>
+                                </Link>
+                                {/* {bot.is_ai_bot ?
+                                    <HoverCard.Root>
+                                        <HoverCard.Trigger>
+                                            <Badge color='purple'><RiSparkling2Fill /> AI</Badge>
+                                        </HoverCard.Trigger>
+                                        <HoverCard.Content>
+                                            <Stack>
+                                                <BotFeatureRow
+                                                    enabled={bot.dynamic_instructions}
+                                                    label="Dynamic Instructions"
+                                                />
+                                                <BotFeatureRow
+                                                    enabled={bot.enable_file_search}
+                                                    label="File Search"
+                                                />
+                                                <BotFeatureRow
+                                                    enabled={bot.allow_bot_to_write_documents}
+                                                    label="Can Write Documents"
+                                                />
+                                            </Stack>
+                                        </HoverCard.Content>
+                                    </HoverCard.Root>
+                                    : null} */}
+                            </HStack>
+                        </Table.Cell>
+                        <Table.Cell maxWidth={"300px"}>
+                            <Text className='line-clamp-1 text-ellipsis'>{f.description}</Text>
+                        </Table.Cell>
+                        <Table.Cell maxWidth={"150px"}>
+                            <Badge variant='outline'>{f.type}</Badge>
+                        </Table.Cell>
+
+                        <Table.Cell maxWidth={"50px"}>
+                            <Checkbox checked={f.requires_write_permissions === 1} />
+                        </Table.Cell>
+
+                        {/* <Table.Cell maxWidth={"250px"}>
+                            <Text className='line-clamp-1 text-ellipsis'>{bot.description ? bot.description : bot.instruction}</Text>
+                        </Table.Cell> */}
+                    </Table.Row>
+                ))}
+            </Table.Body>
+        </Table.Root>
+    )
+}
+
+export const Component = FunctionList
\ No newline at end of file
diff --git a/frontend/src/pages/settings/AI/InstructionTemplateList.tsx b/frontend/src/pages/settings/AI/InstructionTemplateList.tsx
new file mode 100644
index 000000000..89ed63719
--- /dev/null
+++ b/frontend/src/pages/settings/AI/InstructionTemplateList.tsx
@@ -0,0 +1,77 @@
+import AINotEnabledCallout from '@/components/feature/settings/ai/AINotEnabledCallout'
+import { ErrorBanner } from '@/components/layout/AlertBanner'
+import { TableLoader } from '@/components/layout/Loaders/TableLoader'
+import PageContainer from '@/components/layout/Settings/PageContainer'
+import SettingsContentContainer from '@/components/layout/Settings/SettingsContentContainer'
+import SettingsPageHeader from '@/components/layout/Settings/SettingsPageHeader'
+import { HStack, Stack } from '@/components/layout/Stack'
+import { RavenBotInstructionTemplate } from '@/types/RavenAI/RavenBotInstructionTemplate'
+import { Badge, Button, Table, Text } from '@radix-ui/themes'
+import { useFrappeGetDocList } from 'frappe-react-sdk'
+import { RiSparkling2Fill } from 'react-icons/ri'
+import { Link } from 'react-router-dom'
+
+type Props = {}
+
+const InstructionTemplateList = (props: Props) => {
+
+    const { data, isLoading, error } = useFrappeGetDocList<RavenBotInstructionTemplate>("Raven Bot Instruction Template", {
+        fields: ["name", "template_name", "dynamic_instructions", "instruction"],
+        orderBy: {
+            field: "modified",
+            order: "desc"
+        }
+    })
+    return (
+        <PageContainer>
+            <SettingsContentContainer>
+                <SettingsPageHeader
+                    title='Instruction Templates'
+                    description='Save commonly used instructions as templates for your bots.'
+                    actions={<Button asChild>
+                        <Link to='create'>Create</Link>
+                    </Button>}
+                />
+                {isLoading && <TableLoader columns={2} />}
+                <ErrorBanner error={error} />
+                <AINotEnabledCallout />
+                {data && <InstructionTable data={data} />}
+            </SettingsContentContainer>
+        </PageContainer>
+    )
+}
+
+const InstructionTable = ({ data }: { data: RavenBotInstructionTemplate[] }) => {
+    return (
+        <Table.Root variant="surface" className='rounded-sm'>
+            <Table.Header>
+                <Table.Row>
+                    <Table.ColumnHeaderCell>Name</Table.ColumnHeaderCell>
+                    <Table.ColumnHeaderCell>Description</Table.ColumnHeaderCell>
+                </Table.Row>
+            </Table.Header>
+            <Table.Body>
+                {data?.map((d) => (
+                    <Table.Row key={d.name}>
+                        <Table.Cell maxWidth={"150px"}>
+                            <HStack align='center'>
+                                <Link to={`${d.name}`} className='hover:underline underline-offset-4'>
+                                    <Text weight='medium'>{d.template_name}</Text>
+                                </Link>
+                                {d.dynamic_instructions ?
+                                    <Badge color='purple'><RiSparkling2Fill /> Dynamic</Badge>
+
+                                    : null}
+                            </HStack>
+                        </Table.Cell>
+                        <Table.Cell maxWidth={"250px"}>
+                            <Text className='line-clamp-1 text-ellipsis'>{d.instruction}</Text>
+                        </Table.Cell>
+                    </Table.Row>
+                ))}
+            </Table.Body>
+        </Table.Root>
+    )
+}
+
+export const Component = InstructionTemplateList
\ No newline at end of file
diff --git a/frontend/src/pages/settings/AI/OpenAISettings.tsx b/frontend/src/pages/settings/AI/OpenAISettings.tsx
new file mode 100644
index 000000000..7213a0fcd
--- /dev/null
+++ b/frontend/src/pages/settings/AI/OpenAISettings.tsx
@@ -0,0 +1,156 @@
+import { ErrorText, HelperText, Label } from '@/components/common/Form'
+import { Loader } from '@/components/common/Loader'
+import PageContainer from '@/components/layout/Settings/PageContainer'
+import SettingsContentContainer from '@/components/layout/Settings/SettingsContentContainer'
+import SettingsPageHeader from '@/components/layout/Settings/SettingsPageHeader'
+import useRavenSettings from '@/hooks/fetchers/useRavenSettings'
+import { RavenSettings } from '@/types/Raven/RavenSettings'
+import { Box, Button, Checkbox, Flex, Separator, Text, TextField } from '@radix-ui/themes'
+import { useFrappeUpdateDoc } from 'frappe-react-sdk'
+import { useEffect } from 'react'
+import { Controller, FormProvider, useForm } from 'react-hook-form'
+import { toast } from 'sonner'
+
+const OpenAISettings = () => {
+
+    const { ravenSettings, mutate } = useRavenSettings()
+
+    const methods = useForm<RavenSettings>()
+
+    const { handleSubmit, control, watch, reset, register, formState: { errors } } = methods
+
+    useEffect(() => {
+        if (ravenSettings) {
+            reset(ravenSettings)
+        }
+    }, [ravenSettings])
+
+    const { updateDoc, loading: updatingDoc } = useFrappeUpdateDoc<RavenSettings>()
+
+    const onSubmit = (data: RavenSettings) => {
+        toast.promise(updateDoc('Raven Settings', null, {
+            ...(ravenSettings ?? {}),
+            ...data
+        }).then(res => {
+            mutate(res, {
+                revalidate: false
+            })
+        }), {
+            loading: 'Updating...',
+            success: () => {
+                return `Settings updated`;
+            },
+            error: 'There was an error.',
+        })
+
+    }
+
+    const isAIEnabled = watch('enable_ai_integration')
+
+    return (
+        <PageContainer>
+            <FormProvider {...methods}>
+                <form onSubmit={handleSubmit(onSubmit)}>
+                    <SettingsContentContainer>
+                        <SettingsPageHeader
+                            title='OpenAI Settings'
+                            description='Set your OpenAI API Key to use AI features in Raven.'
+                            actions={<Button type='submit' disabled={updatingDoc}>
+                                {updatingDoc && <Loader />}
+                                {updatingDoc ? "Saving" : "Save"}
+                            </Button>}
+                        />
+
+                        <Flex direction={'column'} gap='2'>
+                            <Text as="label" size="2">
+                                <Flex gap="2">
+                                    <Controller
+                                        control={control}
+                                        defaultValue={ravenSettings?.enable_ai_integration}
+                                        name='enable_ai_integration'
+                                        render={({ field }) => (
+                                            <Checkbox
+                                                checked={field.value ? true : false}
+                                                onCheckedChange={(v) => field.onChange(v ? 1 : 0)}
+                                            />
+                                        )} />
+
+                                    Enable AI Integration
+                                </Flex>
+                            </Text>
+                        </Flex>
+                        <Separator size='4' />
+                        {isAIEnabled ?
+                            <Box>
+                                <Label htmlFor='openai_organisation_id' isRequired>OpenAI Organization ID</Label>
+                                <TextField.Root
+                                    autoFocus
+                                    maxLength={140}
+                                    className={'w-48 sm:w-96'}
+                                    id='openai_organisation_id'
+                                    required
+                                    placeholder='org-************************'
+                                    {...register('openai_organisation_id', {
+                                        required: isAIEnabled ? "Please add your OpenAI Organization ID" : false,
+                                        maxLength: {
+                                            value: 140,
+                                            message: "ID cannot be more than 140 characters."
+                                        }
+                                    })}
+                                    aria-invalid={errors.openai_organisation_id ? 'true' : 'false'}
+                                />
+                                {errors?.openai_organisation_id && <ErrorText>{errors.openai_organisation_id?.message}</ErrorText>}
+                            </Box>
+                            : null
+                        }
+
+                        {isAIEnabled ?
+                            <Box>
+                                <Label htmlFor='openai_api_key' isRequired>OpenAI API Key</Label>
+                                <TextField.Root
+                                    className={'w-48 sm:w-96'}
+                                    id='openai_api_key'
+                                    required
+                                    type='password'
+                                    placeholder='••••••••••••••••••••••••••••••••'
+                                    {...register('openai_api_key', {
+                                        required: isAIEnabled ? "Please add your OpenAI API Key" : false,
+                                    })}
+                                    aria-invalid={errors.openai_api_key ? 'true' : 'false'}
+                                />
+                                {errors?.openai_api_key && <ErrorText>{errors.openai_api_key?.message}</ErrorText>}
+                            </Box>
+                            : null
+                        }
+
+                        {isAIEnabled ?
+                            <Box>
+                                <Label htmlFor='openai_project_id'>OpenAI Project ID</Label>
+                                <TextField.Root
+                                    maxLength={140}
+                                    className={'w-48 sm:w-96'}
+                                    id='openai_project_id'
+                                    placeholder='proj_************************'
+                                    {...register('openai_project_id', {
+                                        maxLength: {
+                                            value: 140,
+                                            message: "ID cannot be more than 140 characters."
+                                        }
+                                    })}
+                                    aria-invalid={errors.openai_project_id ? 'true' : 'false'}
+                                />
+                                {errors?.openai_project_id && <ErrorText>{errors.openai_project_id?.message}</ErrorText>}
+                                <HelperText>
+                                    If not set, the integration will use the default project.
+                                </HelperText>
+                            </Box>
+                            : null
+                        }
+                    </SettingsContentContainer>
+                </form>
+            </FormProvider>
+        </PageContainer>
+    )
+}
+
+export const Component = OpenAISettings
\ No newline at end of file
diff --git a/frontend/src/pages/settings/AI/SavedPromptsList.tsx b/frontend/src/pages/settings/AI/SavedPromptsList.tsx
new file mode 100644
index 000000000..2b4a2629a
--- /dev/null
+++ b/frontend/src/pages/settings/AI/SavedPromptsList.tsx
@@ -0,0 +1,78 @@
+import AINotEnabledCallout from '@/components/feature/settings/ai/AINotEnabledCallout'
+import { ErrorBanner } from '@/components/layout/AlertBanner'
+import { TableLoader } from '@/components/layout/Loaders/TableLoader'
+import PageContainer from '@/components/layout/Settings/PageContainer'
+import SettingsContentContainer from '@/components/layout/Settings/SettingsContentContainer'
+import SettingsPageHeader from '@/components/layout/Settings/SettingsPageHeader'
+import { HStack, Stack } from '@/components/layout/Stack'
+import { RavenBotAIPrompt } from '@/types/RavenAI/RavenBotAIPrompt'
+import { Badge, Button, Checkbox, Table, Text } from '@radix-ui/themes'
+import { useFrappeGetDocList } from 'frappe-react-sdk'
+import { Link } from 'react-router-dom'
+
+type Props = {}
+
+const SavedPromptList = (props: Props) => {
+
+    const { data, isLoading, error } = useFrappeGetDocList<RavenBotAIPrompt>("Raven Bot AI Prompt", {
+        fields: ["name", "prompt", "raven_bot", "is_global"],
+        orderBy: {
+            field: "modified",
+            order: "desc"
+        }
+    })
+    return (
+        <PageContainer>
+            <SettingsContentContainer>
+                <SettingsPageHeader
+                    title='Saved Commands'
+                    description='Save commonly used commands and prompts for your AI bots and access them via "/" in chat.'
+                    actions={<Button asChild>
+                        <Link to='create'>Create</Link>
+                    </Button>}
+                />
+                {isLoading && <TableLoader columns={2} />}
+                <ErrorBanner error={error} />
+                <AINotEnabledCallout />
+                {data && <SavedPromptTable data={data} />}
+            </SettingsContentContainer>
+        </PageContainer>
+    )
+}
+
+const SavedPromptTable = ({ data }: { data: RavenBotAIPrompt[] }) => {
+    return (
+        <Table.Root variant="surface" className='rounded-sm'>
+            <Table.Header>
+                <Table.Row>
+                    <Table.ColumnHeaderCell>Name</Table.ColumnHeaderCell>
+                    <Table.ColumnHeaderCell>Bot</Table.ColumnHeaderCell>
+                    <Table.ColumnHeaderCell>Is Global?</Table.ColumnHeaderCell>
+                </Table.Row>
+            </Table.Header>
+            <Table.Body>
+                {data?.map((d) => (
+                    <Table.Row key={d.name}>
+                        <Table.Cell maxWidth={"250px"}>
+                            <HStack align='center'>
+                                <Link to={`${d.name}`} className='hover:underline underline-offset-4'>
+                                    <Text weight='medium' className='line-clamp-1 text-ellipsis'>{d.prompt}</Text>
+                                </Link>
+
+                            </HStack>
+                        </Table.Cell>
+                        <Table.Cell maxWidth={"100px"}>
+                            <Text>{d.raven_bot}</Text>
+                        </Table.Cell>
+
+                        <Table.Cell maxWidth={"50px"}>
+                            <Checkbox checked={d.is_global === 1} />
+                        </Table.Cell>
+                    </Table.Row>
+                ))}
+            </Table.Body>
+        </Table.Root>
+    )
+}
+
+export const Component = SavedPromptList
\ No newline at end of file
diff --git a/frontend/src/pages/settings/AI/ViewBot.tsx b/frontend/src/pages/settings/AI/ViewBot.tsx
new file mode 100644
index 000000000..b1ef3ad8f
--- /dev/null
+++ b/frontend/src/pages/settings/AI/ViewBot.tsx
@@ -0,0 +1,106 @@
+import { Loader } from "@/components/common/Loader"
+import BotForm from "@/components/feature/settings/ai/bots/BotForm"
+import { ErrorBanner } from "@/components/layout/AlertBanner"
+import { FullPageLoader } from "@/components/layout/Loaders"
+import PageContainer from "@/components/layout/Settings/PageContainer"
+import SettingsContentContainer from "@/components/layout/Settings/SettingsContentContainer"
+import SettingsPageHeader from "@/components/layout/Settings/SettingsPageHeader"
+import { HStack } from "@/components/layout/Stack"
+import { RavenBot } from "@/types/RavenBot/RavenBot"
+import { isEmpty } from "@/utils/validations"
+import { Button } from "@radix-ui/themes"
+import { useFrappeGetDoc, useFrappeUpdateDoc, SWRResponse, FrappeContext, FrappeConfig } from "frappe-react-sdk"
+import { useContext } from "react"
+import { FormProvider, useForm } from "react-hook-form"
+import { FiExternalLink } from "react-icons/fi"
+import { useNavigate, useParams } from "react-router-dom"
+import { toast } from "sonner"
+
+type Props = {}
+
+const ViewBot = (props: Props) => {
+
+    const { ID } = useParams<{ ID: string }>()
+
+    const { data, isLoading, error, mutate } = useFrappeGetDoc<RavenBot>("Raven Bot", ID)
+
+    return (
+        <PageContainer>
+            <ErrorBanner error={error} />
+            {isLoading && <FullPageLoader className="h-64" />}
+            {data && <ViewBotContent data={data} mutate={mutate} />}
+        </PageContainer>
+    )
+}
+
+const ViewBotContent = ({ data, mutate }: { data: RavenBot, mutate: SWRResponse['mutate'] }) => {
+
+    const { updateDoc, loading, error } = useFrappeUpdateDoc<RavenBot>()
+
+    const methods = useForm<RavenBot>({
+        disabled: loading,
+        defaultValues: data
+    })
+
+    const { formState: { dirtyFields } } = methods
+
+    const isDirty = !isEmpty(dirtyFields)
+
+
+    const onSubmit = (data: RavenBot) => {
+        updateDoc("Raven Bot", data.name, data)
+            .then((doc) => {
+                toast.success("Saved")
+                methods.reset(doc)
+                mutate(doc, { revalidate: false })
+            })
+    }
+
+
+
+    return <form onSubmit={methods.handleSubmit(onSubmit)}>
+        <FormProvider {...methods}>
+            <SettingsContentContainer>
+                <SettingsPageHeader
+                    title={data.bot_name}
+                    headerBadges={isDirty ? [{ label: "Not Saved", color: "red" }] : undefined}
+                    actions={<HStack>
+                        <OpenChatButton bot={data} />
+                        <Button type='submit' disabled={loading}>
+                            {loading && <Loader />}
+                            {loading ? "Saving" : "Save"}
+                        </Button>
+                    </HStack>}
+                    breadcrumbs={[{ label: 'Bots', href: '../' }, { label: data.name, href: '', copyToClipboard: true }]}
+                />
+                <ErrorBanner error={error} />
+                <BotForm isEdit={true} />
+            </SettingsContentContainer>
+        </FormProvider>
+    </form>
+
+}
+
+const OpenChatButton = ({ bot }: { bot: RavenBot }) => {
+
+    const { call } = useContext(FrappeContext) as FrappeConfig
+
+    const navigate = useNavigate()
+
+    const openChat = () => {
+        call.post("raven.api.raven_channel.create_direct_message_channel", {
+            user_id: bot.raven_user
+        }).then((res) => {
+            navigate(`/channel/${res.message}`)
+        })
+    }
+
+    return <Button variant='surface' color='gray'
+        type='button'
+        className="not-cal" onClick={openChat}>
+        Open Chat
+        <FiExternalLink />
+    </Button>
+}
+
+export const Component = ViewBot
\ No newline at end of file
diff --git a/frontend/src/pages/settings/AI/ViewFunction.tsx b/frontend/src/pages/settings/AI/ViewFunction.tsx
new file mode 100644
index 000000000..9415f75e1
--- /dev/null
+++ b/frontend/src/pages/settings/AI/ViewFunction.tsx
@@ -0,0 +1,74 @@
+import { Loader } from "@/components/common/Loader"
+import FunctionForm from "@/components/feature/settings/ai/functions/FunctionForm"
+import { ErrorBanner } from "@/components/layout/AlertBanner"
+import { FullPageLoader } from "@/components/layout/Loaders"
+import PageContainer from "@/components/layout/Settings/PageContainer"
+import SettingsContentContainer from "@/components/layout/Settings/SettingsContentContainer"
+import SettingsPageHeader from "@/components/layout/Settings/SettingsPageHeader"
+import { RavenAIFunction } from "@/types/RavenAI/RavenAIFunction"
+import { isEmpty } from "@/utils/validations"
+import { Button } from "@radix-ui/themes"
+import { SWRResponse, useFrappeGetDoc, useFrappeUpdateDoc } from "frappe-react-sdk"
+import { FormProvider, useForm } from "react-hook-form"
+import { useParams } from "react-router-dom"
+import { toast } from "sonner"
+
+type Props = {}
+
+const ViewFunction = (props: Props) => {
+
+    const { ID } = useParams<{ ID: string }>()
+
+    const { data, isLoading, error, mutate } = useFrappeGetDoc<RavenAIFunction>("Raven AI Function", ID)
+
+    return (
+        <PageContainer>
+            <ErrorBanner error={error} />
+            {isLoading && <FullPageLoader className="h-64" />}
+            {data && <ViewFunctionContent data={data} mutate={mutate} />}
+        </PageContainer>
+    )
+}
+
+const ViewFunctionContent = ({ data, mutate }: { data: RavenAIFunction, mutate: SWRResponse['mutate'] }) => {
+
+    const { updateDoc, loading, error } = useFrappeUpdateDoc<RavenAIFunction>()
+
+    const methods = useForm<RavenAIFunction>({
+        disabled: loading,
+        defaultValues: data
+    })
+
+    const { formState: { dirtyFields } } = methods
+
+    const isDirty = !isEmpty(dirtyFields)
+    const onSubmit = (data: RavenAIFunction) => {
+        updateDoc("Raven AI Function", data.name, data)
+            .then((doc) => {
+                toast.success("Saved")
+                methods.reset(doc)
+                mutate(doc, { revalidate: false })
+            })
+    }
+
+    return <form onSubmit={methods.handleSubmit(onSubmit)}>
+        <FormProvider {...methods}>
+            <SettingsContentContainer>
+                <SettingsPageHeader
+                    title={data.name}
+                    headerBadges={isDirty ? [{ label: "Not Saved", color: "red" }] : undefined}
+                    actions={<Button type='submit' disabled={loading}>
+                        {loading && <Loader />}
+                        {loading ? "Saving" : "Save"}
+                    </Button>}
+                    breadcrumbs={[{ label: 'Functions', href: '../' }, { label: data.name, href: '', copyToClipboard: true }]}
+                />
+                <ErrorBanner error={error} />
+                <FunctionForm isEdit />
+            </SettingsContentContainer>
+        </FormProvider>
+    </form>
+
+}
+
+export const Component = ViewFunction
\ No newline at end of file
diff --git a/frontend/src/pages/settings/AI/ViewInstructionTemplate.tsx b/frontend/src/pages/settings/AI/ViewInstructionTemplate.tsx
new file mode 100644
index 000000000..586d38a7f
--- /dev/null
+++ b/frontend/src/pages/settings/AI/ViewInstructionTemplate.tsx
@@ -0,0 +1,74 @@
+import { Loader } from "@/components/common/Loader"
+import InstructionTemplateForm from "@/components/feature/settings/ai/InstructionTemplateForm"
+import { ErrorBanner } from "@/components/layout/AlertBanner"
+import { FullPageLoader } from "@/components/layout/Loaders"
+import PageContainer from "@/components/layout/Settings/PageContainer"
+import SettingsContentContainer from "@/components/layout/Settings/SettingsContentContainer"
+import SettingsPageHeader from "@/components/layout/Settings/SettingsPageHeader"
+import { RavenBotInstructionTemplate } from "@/types/RavenAI/RavenBotInstructionTemplate"
+import { isEmpty } from "@/utils/validations"
+import { Button } from "@radix-ui/themes"
+import { SWRResponse, useFrappeGetDoc, useFrappeUpdateDoc } from "frappe-react-sdk"
+import { FormProvider, useForm } from "react-hook-form"
+import { useParams } from "react-router-dom"
+import { toast } from "sonner"
+
+const ViewInstructionTemplate = () => {
+
+    const { ID } = useParams<{ ID: string }>()
+
+    const { data, isLoading, error, mutate } = useFrappeGetDoc<RavenBotInstructionTemplate>("Raven Bot Instruction Template", ID)
+
+    return (
+        <PageContainer>
+            <ErrorBanner error={error} />
+            {isLoading && <FullPageLoader className="h-64" />}
+            {data && <ViewBotContent data={data} mutate={mutate} />}
+        </PageContainer>
+    )
+}
+
+const ViewBotContent = ({ data, mutate }: { data: RavenBotInstructionTemplate, mutate: SWRResponse['mutate'] }) => {
+
+    const { updateDoc, loading, error } = useFrappeUpdateDoc<RavenBotInstructionTemplate>()
+
+    const methods = useForm<RavenBotInstructionTemplate>({
+        disabled: loading,
+        defaultValues: data
+    })
+
+    const { formState: { dirtyFields } } = methods
+
+    const isDirty = !isEmpty(dirtyFields)
+
+
+    const onSubmit = (data: RavenBotInstructionTemplate) => {
+        updateDoc("Raven Bot Instruction Template", data.name, data)
+            .then((doc) => {
+                toast.success("Saved")
+                methods.reset(doc)
+                mutate(doc, { revalidate: false })
+            })
+    }
+
+    return <form onSubmit={methods.handleSubmit(onSubmit)}>
+        <FormProvider {...methods}>
+            <SettingsContentContainer>
+                <SettingsPageHeader
+                    title={data.name}
+                    headerBadges={isDirty ? [{ label: "Not Saved", color: "red" }] : undefined}
+                    actions={<Button type='submit' disabled={loading}>
+                        {loading && <Loader />}
+                        {loading ? "Saving" : "Save"}
+                    </Button>}
+                    breadcrumbs={[{ label: 'Instruction Templates', href: '../' }, { label: data.name, href: '', copyToClipboard: true }]}
+                />
+                <ErrorBanner error={error} />
+                <InstructionTemplateForm isEdit />
+            </SettingsContentContainer>
+        </FormProvider>
+    </form>
+
+}
+
+export const Component = ViewInstructionTemplate
\ No newline at end of file
diff --git a/frontend/src/pages/settings/AI/ViewSavedPrompt.tsx b/frontend/src/pages/settings/AI/ViewSavedPrompt.tsx
new file mode 100644
index 000000000..75daa6159
--- /dev/null
+++ b/frontend/src/pages/settings/AI/ViewSavedPrompt.tsx
@@ -0,0 +1,76 @@
+import { Loader } from "@/components/common/Loader"
+import SavedPromptForm from "@/components/feature/settings/ai/SavedPromptForm"
+import { ErrorBanner } from "@/components/layout/AlertBanner"
+import { FullPageLoader } from "@/components/layout/Loaders"
+import PageContainer from "@/components/layout/Settings/PageContainer"
+import SettingsContentContainer from "@/components/layout/Settings/SettingsContentContainer"
+import SettingsPageHeader from "@/components/layout/Settings/SettingsPageHeader"
+import { RavenBotAIPrompt } from "@/types/RavenAI/RavenBotAIPrompt"
+import { isEmpty } from "@/utils/validations"
+import { Button } from "@radix-ui/themes"
+import { SWRResponse, useFrappeGetDoc, useFrappeUpdateDoc } from "frappe-react-sdk"
+import { FormProvider, useForm } from "react-hook-form"
+import { useParams } from "react-router-dom"
+import { toast } from "sonner"
+
+type Props = {}
+
+const ViewSavedPrompt = (props: Props) => {
+
+    const { ID } = useParams<{ ID: string }>()
+
+    const { data, isLoading, error, mutate } = useFrappeGetDoc<RavenBotAIPrompt>("Raven Bot AI Prompt", ID)
+
+    return (
+        <PageContainer>
+            <ErrorBanner error={error} />
+            {isLoading && <FullPageLoader className="h-64" />}
+            {data && <ViewSavedPromptContent data={data} mutate={mutate} />}
+        </PageContainer>
+    )
+}
+
+const ViewSavedPromptContent = ({ data, mutate }: { data: RavenBotAIPrompt, mutate: SWRResponse['mutate'] }) => {
+
+    const { updateDoc, loading, error } = useFrappeUpdateDoc<RavenBotAIPrompt>()
+
+    const methods = useForm<RavenBotAIPrompt>({
+        disabled: loading,
+        defaultValues: data
+    })
+
+    const { formState: { dirtyFields } } = methods
+
+    const isDirty = !isEmpty(dirtyFields)
+
+
+    const onSubmit = (data: RavenBotAIPrompt) => {
+        updateDoc("Raven Bot AI Prompt", data.name, data)
+            .then((doc) => {
+                toast.success("Saved")
+                methods.reset(doc)
+                mutate(doc, { revalidate: false })
+            })
+    }
+
+    return <form onSubmit={methods.handleSubmit(onSubmit)}>
+        <FormProvider {...methods}>
+            <SettingsContentContainer>
+                <SettingsPageHeader
+                    title={data.name}
+                    headerBadges={isDirty ? [{ label: "Not Saved", color: "red" }] : undefined}
+                    actions={<Button type='submit' disabled={loading}>
+                        {loading && <Loader />}
+                        {loading ? "Saving" : "Save"}
+                    </Button>}
+                    breadcrumbs={[{ label: 'Commands', href: '../' }, { label: data.name, href: '', copyToClipboard: true }]}
+                />
+                <ErrorBanner error={error} />
+                <SavedPromptForm />
+            </SettingsContentContainer>
+        </FormProvider>
+    </form>
+
+}
+
+export const Component = ViewSavedPrompt
\ No newline at end of file
diff --git a/frontend/src/pages/settings/Integrations/FrappeHR.tsx b/frontend/src/pages/settings/Integrations/FrappeHR.tsx
index e09445049..3f7d57fa2 100644
--- a/frontend/src/pages/settings/Integrations/FrappeHR.tsx
+++ b/frontend/src/pages/settings/Integrations/FrappeHR.tsx
@@ -1,8 +1,12 @@
 import { CustomCallout } from '@/components/common/Callouts/CustomCallout'
 import { HelperText, Label } from '@/components/common/Form'
 import { Loader } from '@/components/common/Loader'
+import PageContainer from '@/components/layout/Settings/PageContainer'
+import SettingsContentContainer from '@/components/layout/Settings/SettingsContentContainer'
+import SettingsPageHeader from '@/components/layout/Settings/SettingsPageHeader'
 import useRavenSettings from '@/hooks/fetchers/useRavenSettings'
 import { RavenSettings } from '@/types/Raven/RavenSettings'
+import { __ } from '@/utils/translations'
 import { Button, Checkbox, Flex, Select, Separator, Text } from '@radix-ui/themes'
 import { useFrappeUpdateDoc } from 'frappe-react-sdk'
 import { useEffect } from 'react'
@@ -37,9 +41,9 @@ const FrappeHR = () => {
         }), {
             loading: 'Updating...',
             success: () => {
-                return `Settings updated`;
+                return __("Settings updated");
             },
-            error: 'There was an error.',
+            error: __("There was an error."),
         })
 
     }
@@ -50,24 +54,22 @@ const FrappeHR = () => {
     const autoCreateDepartment = watch('auto_create_department_channel')
 
     return (
-        <Flex direction='column' gap='4' px='6' py='4'>
+        <PageContainer>
             <FormProvider {...methods}>
                 <form onSubmit={handleSubmit(onSubmit)}>
-                    <Flex direction={'column'} gap='4'>
-                        <Flex justify={'between'} align={'center'}>
-                            <Flex direction='column' gap='0'>
-                                <Text size='3' className={'font-semibold'}>Frappe HR</Text>
-                                {/* <Text size='1' color='gray'>Manage your Raven profile</Text> */}
-                            </Flex>
-                            <Button type='submit' disabled={updatingDoc}>
+                    <SettingsContentContainer>
+                        <SettingsPageHeader
+                            title={__('HR')}
+                            description={__("Connect your HR system to Raven to sync employee data and send notifications.")}
+                            actions={<Button type='submit' disabled={updatingDoc}>
                                 {updatingDoc && <Loader />}
-                                {updatingDoc ? "Saving" : "Save"}
-                            </Button>
-                        </Flex>
+                                {updatingDoc ? __("Saving") : __("Save")}
+                            </Button>}
+                        />
                         {!isHRInstalled && <CustomCallout
                             iconChildren={<FiAlertTriangle />}
                             rootProps={{ color: 'yellow', variant: 'surface' }}
-                            textChildren="Frappe HR is not installed on this site.">
+                            textChildren={__("HR is not installed on this site.")} >
                         </CustomCallout>}
 
                         <Flex direction={'column'} gap='2' maxWidth={'480px'}>
@@ -84,16 +86,16 @@ const FrappeHR = () => {
                                             />
                                         )} />
 
-                                    Automatically create channels for departments
+                                    {__("Automatically create channels for departments")}
                                 </Flex>
                             </Text>
                             <HelperText>
-                                If checked, a channel will be created for each department. Employees in the department will be synced with channel members.
+                                {__("If checked, a channel will be created for each department. Employees in the department will be synced with channel members.")}
                             </HelperText>
                         </Flex>
                         {autoCreateDepartment ?
                             <Flex direction={'column'} maxWidth={'320px'}>
-                                <Label isRequired>Department Channel Type</Label>
+                                <Label isRequired>{__("Department Channel Type")}</Label>
                                 <Controller
                                     control={control}
                                     defaultValue={ravenSettings?.department_channel_type}
@@ -105,10 +107,10 @@ const FrappeHR = () => {
                                             <Select.Trigger />
                                             <Select.Content>
                                                 <Select.Item value='Private'>
-                                                    Private
+                                                    {__("Private")}
                                                 </Select.Item>
                                                 <Select.Item value='Public'>
-                                                    Public
+                                                    {__("Public")}
                                                 </Select.Item>
                                             </Select.Content>
                                         </Select.Root>
@@ -131,17 +133,17 @@ const FrappeHR = () => {
                                             />
                                         )} />
 
-                                    Show if a user is on leave
+                                    {__("Show if a user is on leave")}
                                 </Flex>
                             </Text>
                             <HelperText>
-                                If checked, users on Raven are notified if another user is on leave.
+                                {__("If checked, users on Raven are notified if another user is on leave.")}
                             </HelperText>
                         </Flex>
-                    </Flex>
+                    </SettingsContentContainer>
                 </form>
             </FormProvider>
-        </Flex>
+        </PageContainer>
     )
 }
 
diff --git a/frontend/src/pages/settings/Settings.tsx b/frontend/src/pages/settings/Settings.tsx
index 67080fc14..151974ad4 100644
--- a/frontend/src/pages/settings/Settings.tsx
+++ b/frontend/src/pages/settings/Settings.tsx
@@ -1,6 +1,7 @@
 import { SettingsSidebar } from '@/components/feature/userSettings/SettingsSidebar'
 import { PageHeader } from '@/components/layout/Heading/PageHeader'
 import { useIsDesktop } from '@/hooks/useMediaQuery'
+import { __ } from '@/utils/translations'
 import { Box, Flex, Heading } from '@radix-ui/themes'
 import { BiChevronLeft } from 'react-icons/bi'
 import { Link } from 'react-router-dom'
@@ -15,7 +16,7 @@ const Settings = () => {
                     <Link to='/channel' className="block bg-transparent hover:bg-transparent active:bg-transparent sm:hidden">
                         <BiChevronLeft size='24' className="block text-gray-12" />
                     </Link>
-                    <Heading size='5'>Settings</Heading>
+                    <Heading size='5'>{__("Settings")}</Heading>
                 </Flex>
             </PageHeader>
             <Flex className="min-h-screen pt-16 w-full">
diff --git a/frontend/src/types/Core/DocField.ts b/frontend/src/types/Core/DocField.ts
new file mode 100644
index 000000000..f9413a6e2
--- /dev/null
+++ b/frontend/src/types/Core/DocField.ts
@@ -0,0 +1,128 @@
+
+export interface DocField{
+	creation: string
+	name: string
+	modified: string
+	owner: string
+	modified_by: string
+	docstatus: 0 | 1 | 2
+	parent?: string
+	parentfield?: string
+	parenttype?: string
+	idx?: number
+	/**	Label : Data	*/
+	label?: string
+	/**	Type : Select	*/
+	fieldtype: "Autocomplete" | "Attach" | "Attach Image" | "Barcode" | "Button" | "Check" | "Code" | "Color" | "Column Break" | "Currency" | "Data" | "Date" | "Datetime" | "Duration" | "Dynamic Link" | "Float" | "Fold" | "Geolocation" | "Heading" | "HTML" | "HTML Editor" | "Icon" | "Image" | "Int" | "JSON" | "Link" | "Long Text" | "Markdown Editor" | "Password" | "Percent" | "Phone" | "Read Only" | "Rating" | "Section Break" | "Select" | "Signature" | "Small Text" | "Tab Break" | "Table" | "Table MultiSelect" | "Text" | "Text Editor" | "Time"
+	/**	Name : Data	*/
+	fieldname?: string
+	/**	Precision : Select - Set non-standard precision for a Float or Currency field	*/
+	precision?: "" | "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"
+	/**	Length : Int	*/
+	length?: number
+	/**	Non Negative : Check	*/
+	non_negative?: 0 | 1
+	/**	Hide Days : Check	*/
+	hide_days?: 0 | 1
+	/**	Hide Seconds : Check	*/
+	hide_seconds?: 0 | 1
+	/**	Mandatory : Check	*/
+	reqd?: 0 | 1
+	/**	Virtual : Check	*/
+	is_virtual?: 0 | 1
+	/**	Index : Check	*/
+	search_index?: 0 | 1
+	/**	Not Nullable : Check	*/
+	not_nullable?: 0 | 1
+	/**	Options : Small Text - For Links, enter the DocType as range.
+For Select, enter list of Options, each on a new line.	*/
+	options?: string
+	/**	Sort Options : Check	*/
+	sort_options?: 0 | 1
+	/**	Show Dashboard : Check	*/
+	show_dashboard?: 0 | 1
+	/**	Link Filters : JSON	*/
+	link_filters?: any
+	/**	Default : Small Text	*/
+	default?: string
+	/**	Fetch From : Small Text	*/
+	fetch_from?: string
+	/**	Fetch on Save if Empty : Check - If unchecked, the value will always be re-fetched on save.	*/
+	fetch_if_empty?: 0 | 1
+	/**	Hidden : Check	*/
+	hidden?: 0 | 1
+	/**	Show on Timeline : Check	*/
+	show_on_timeline?: 0 | 1
+	/**	Bold : Check	*/
+	bold?: 0 | 1
+	/**	Allow in Quick Entry : Check	*/
+	allow_in_quick_entry?: 0 | 1
+	/**	Translatable : Check	*/
+	translatable?: 0 | 1
+	/**	Print Hide : Check	*/
+	print_hide?: 0 | 1
+	/**	Print Hide If No Value : Check	*/
+	print_hide_if_no_value?: 0 | 1
+	/**	Report Hide : Check	*/
+	report_hide?: 0 | 1
+	/**	Display Depends On (JS) : Code	*/
+	depends_on?: string
+	/**	Collapsible : Check	*/
+	collapsible?: 0 | 1
+	/**	Collapsible Depends On (JS) : Code	*/
+	collapsible_depends_on?: string
+	/**	Hide Border : Check	*/
+	hide_border?: 0 | 1
+	/**	In List View : Check	*/
+	in_list_view?: 0 | 1
+	/**	In List Filter : Check	*/
+	in_standard_filter?: 0 | 1
+	/**	In Preview : Check	*/
+	in_preview?: 0 | 1
+	/**	In Filter : Check	*/
+	in_filter?: 0 | 1
+	/**	In Global Search : Check	*/
+	in_global_search?: 0 | 1
+	/**	Read Only : Check	*/
+	read_only?: 0 | 1
+	/**	Allow on Submit : Check	*/
+	allow_on_submit?: 0 | 1
+	/**	Ignore User Permissions : Check	*/
+	ignore_user_permissions?: 0 | 1
+	/**	Allow Bulk Edit : Check	*/
+	allow_bulk_edit?: 0 | 1
+	/**	Perm Level : Int	*/
+	permlevel?: number
+	/**	Ignore XSS Filter : Check - Don't encode HTML tags like &lt;script&gt; or just characters like &lt; or &gt;, as they could be intentionally used in this field	*/
+	ignore_xss_filter?: 0 | 1
+	/**	Unique : Check	*/
+	unique?: 0 | 1
+	/**	No Copy : Check	*/
+	no_copy?: 0 | 1
+	/**	Set only once : Check	*/
+	set_only_once?: 0 | 1
+	/**	Remember Last Selected Value : Check	*/
+	remember_last_selected_value?: 0 | 1
+	/**	Mandatory Depends On (JS) : Code	*/
+	mandatory_depends_on?: string
+	/**	Read Only Depends On (JS) : Code	*/
+	read_only_depends_on?: string
+	/**	Print Width : Data	*/
+	print_width?: string
+	/**	Width : Data	*/
+	width?: string
+	/**	Max Height : Data	*/
+	max_height?: string
+	/**	Columns : Int - Number of columns for a field in a List View or a Grid (Total Columns should be less than 11)	*/
+	columns?: number
+	/**	Description : Small Text	*/
+	description?: string
+	/**	Documentation URL : Data	*/
+	documentation_url?: string
+	/**	Placeholder : Data	*/
+	placeholder?: string
+	/**	 : Data	*/
+	oldfieldname?: string
+	/**	 : Data	*/
+	oldfieldtype?: string
+}
\ No newline at end of file
diff --git a/frontend/src/types/Core/DocType.ts b/frontend/src/types/Core/DocType.ts
new file mode 100644
index 000000000..432f5c03d
--- /dev/null
+++ b/frontend/src/types/Core/DocType.ts
@@ -0,0 +1,144 @@
+import { DocField } from "./DocField"
+
+export interface DocType {
+	creation: string
+	name: string
+	modified: string
+	owner: string
+	modified_by: string
+	docstatus: 0 | 1 | 2
+	parent?: string
+	parentfield?: string
+	parenttype?: string
+	idx?: number
+	/**	Permissions : Table - DocPerm	*/
+	permissions?: any
+	/**	Restrict To Domain : Link - Domain	*/
+	restrict_to_domain?: string
+	/**	User Cannot Search : Check	*/
+	read_only?: 0 | 1
+	/**	User Cannot Create : Check	*/
+	in_create?: 0 | 1
+	/**	Naming Rule : Select	*/
+	naming_rule?: "" | "Set by user" | "Autoincrement" | "By fieldname" | 'By "Naming Series" field' | "Expression" | "Expression (old style)" | "Random" | "UUID" | "By script"
+	/**	Auto Name : Data	*/
+	autoname?: string
+	/**	Title Field : Data	*/
+	title_field?: string
+	/**	Allow Rename : Check	*/
+	allow_rename?: 0 | 1
+	/**	Module : Link - Module Def	*/
+	module: string
+	/**	Is Submittable : Check - Once submitted, submittable documents cannot be changed. They can only be Cancelled and Amended.	*/
+	is_submittable?: 0 | 1
+	/**	Is Child Table : Check - Child Tables are shown as a Grid in other DocTypes	*/
+	istable?: 0 | 1
+	/**	Is Single : Check - Single Types have only one record no tables associated. Values are stored in tabSingles	*/
+	issingle?: 0 | 1
+	/**	Is Tree : Check - Tree structures are implemented using Nested Set	*/
+	is_tree?: 0 | 1
+	/**	Is Calendar and Gantt : Check - Enables Calendar and Gantt views.	*/
+	is_calendar_and_gantt?: 0 | 1
+	/**	Editable Grid : Check	*/
+	editable_grid?: 0 | 1
+	/**	Quick Entry : Check - Open a dialog with mandatory fields to create a new record quickly. There must be at least one mandatory field to show in dialog.	*/
+	quick_entry?: 0 | 1
+	/**	Track Changes : Check - If enabled, changes to the document are tracked and shown in timeline	*/
+	track_changes?: 0 | 1
+	/**	Track Seen : Check - If enabled, the document is marked as seen, the first time a user opens it	*/
+	track_seen?: 0 | 1
+	/**	Track Views : Check - If enabled, document views are tracked, this can happen multiple times	*/
+	track_views?: 0 | 1
+	/**	Custom? : Check	*/
+	custom?: 0 | 1
+	/**	Beta : Check	*/
+	beta?: 0 | 1
+	/**	Is Virtual : Check	*/
+	is_virtual?: 0 | 1
+	/**	Queue in Background (BETA) : Check - Enabling this will submit documents in background	*/
+	queue_in_background?: 0 | 1
+	/**	Description : Small Text	*/
+	description?: string
+	/**	Image Field : Data - Must be of type "Attach Image"	*/
+	image_field?: string
+	/**	Timeline Field : Data - Comments and Communications will be associated with this linked document	*/
+	timeline_field?: string
+	/**	Parent Field (Tree) : Data	*/
+	nsm_parent_field?: string
+	/**	Max Attachments : Int	*/
+	max_attachments?: number
+	/**	Documentation Link : Data - URL for documentation or help	*/
+	documentation?: string
+	/**	Hide Sidebar, Menu, and Comments : Check	*/
+	hide_toolbar?: 0 | 1
+	/**	Hide Copy : Check	*/
+	allow_copy?: 0 | 1
+	/**	Allow Import (via Data Import Tool) : Check	*/
+	allow_import?: 0 | 1
+	/**	Allow events in timeline : Check	*/
+	allow_events_in_timeline?: 0 | 1
+	/**	Allow Auto Repeat : Check	*/
+	allow_auto_repeat?: 0 | 1
+	/**	Make Attachments Public by Default : Check	*/
+	make_attachments_public?: 0 | 1
+	/**	Show Title in Link Fields : Check	*/
+	show_title_field_in_link?: 0 | 1
+	/**	Translate Link Fields : Check	*/
+	translated_doctype?: 0 | 1
+	/**	Search Fields : Data	*/
+	search_fields?: string
+	/**	Default Print Format : Data	*/
+	default_print_format?: string
+	/**	Default Sort Field : Data	*/
+	sort_field?: string
+	/**	Default Sort Order : Select	*/
+	sort_order?: "ASC" | "DESC"
+	/**	Default View : Select	*/
+	default_view?: string
+	/**	Force Re-route to Default View : Check	*/
+	force_re_route_to_default_view?: 0 | 1
+	/**	Show in Module Section : Select	*/
+	document_type?: "" | "Document" | "Setup" | "System" | "Other"
+	/**	Icon : Data	*/
+	icon?: string
+	/**	Color : Data	*/
+	color?: string
+	/**	Show Preview Popup : Check	*/
+	show_preview_popup?: 0 | 1
+	/**	Make "name" searchable in Global Search : Check	*/
+	show_name_in_global_search?: 0 | 1
+	/**	Default Email Template : Link - Email Template	*/
+	default_email_template?: string
+	/**	Allow document creation via Email : Check	*/
+	email_append_to?: 0 | 1
+	/**	Sender Email Field : Data	*/
+	sender_field?: string
+	/**	Sender Name Field : Data	*/
+	sender_name_field?: string
+	/**	Subject Field : Data	*/
+	subject_field?: string
+	/**	Fields : Table - DocField	*/
+	fields?: DocField[]
+	/**	Document Actions : Table - DocType Action	*/
+	actions?: any
+	/**	Document Links : Table - DocType Link	*/
+	links?: any
+	/**	Document States : Table - DocType State	*/
+	states?: any
+	/**	Has Web View : Check	*/
+	has_web_view?: 0 | 1
+	/**	Allow Guest to View : Check	*/
+	allow_guest_to_view?: 0 | 1
+	/**	Index Web Pages for Search : Check	*/
+	index_web_pages_for_search?: 0 | 1
+	/**	Route : Data	*/
+	route?: string
+	/**	Is Published Field : Data	*/
+	is_published_field?: string
+	/**	Website Search Field : Data	*/
+	website_search_field?: string
+	/**	Database Engine : Select	*/
+	engine?: "InnoDB" | "MyISAM"
+	/**	 : Data	*/
+	migration_hash?: string
+}
\ No newline at end of file
diff --git a/frontend/src/types/Raven/RavenSettings.ts b/frontend/src/types/Raven/RavenSettings.ts
index fd5a93234..bfc117632 100644
--- a/frontend/src/types/Raven/RavenSettings.ts
+++ b/frontend/src/types/Raven/RavenSettings.ts
@@ -16,6 +16,14 @@ export interface RavenSettings{
 	show_raven_on_desk?: 0 | 1
 	/**	Tenor API Key : Data	*/
 	tenor_api_key?: string
+	/**	Enable AI Integration : Check	*/
+	enable_ai_integration?: 0 | 1
+	/**	OpenAI Organisation ID : Data	*/
+	openai_organisation_id?: string
+	/**	OpenAI API Key : Password	*/
+	openai_api_key?: string
+	/**	OpenAI Project ID : Data - If not set, the integration will use the default project	*/
+	openai_project_id?: string
 	/**	Automatically Create a Channel for each Department : Check - If checked, a channel will be created in Raven for each department and employees will be synced with Raven Users.	*/
 	auto_create_department_channel?: 0 | 1
 	/**	Department Channel Type : Select	*/
diff --git a/frontend/src/types/RavenAI/RavenAIFunction.ts b/frontend/src/types/RavenAI/RavenAIFunction.ts
new file mode 100644
index 000000000..ced912af5
--- /dev/null
+++ b/frontend/src/types/RavenAI/RavenAIFunction.ts
@@ -0,0 +1,36 @@
+import { RavenAIFunctionParams } from './RavenAIFunctionParams'
+
+export interface RavenAIFunction{
+	creation: string
+	name: string
+	modified: string
+	owner: string
+	modified_by: string
+	docstatus: 0 | 1 | 2
+	parent?: string
+	parentfield?: string
+	parenttype?: string
+	idx?: number
+	/**	Function Name : Data	*/
+	function_name: string
+	/**	Description : Small Text	*/
+	description: string
+	/**	Function Path : Small Text	*/
+	function_path?: string
+	/**	Type : Select	*/
+	type: "Get Document" | "Get Multiple Documents" | "Get List" | "Create Document" | "Create Multiple Documents" | "Update Document" | "Update Multiple Documents" | "Delete Document" | "Delete Multiple Documents" | "Custom Function" | "Send Message" | "Attach File to Document" | "Get Report Result"
+	/**	Reference DocType : Link - DocType	*/
+	reference_doctype?: string
+	/**	Pass parameters as JSON : Check - If checked, the params will be passed as a JSON object instead of named parameters	*/
+	pass_parameters_as_json?: 0 | 1
+	/**	Requires Write Permissions : Check	*/
+	requires_write_permissions?: 0 | 1
+	/**	Strict : Check	*/
+	strict?: 0 | 1
+	/**	Parameters : Table - Raven AI Function Params	*/
+	parameters?: RavenAIFunctionParams[]
+	/**	Params : JSON	*/
+	params?: any
+	/**	Function Definition : JSON	*/
+	function_definition?: any
+}
\ No newline at end of file
diff --git a/frontend/src/types/RavenAI/RavenAIFunctionParams.ts b/frontend/src/types/RavenAI/RavenAIFunctionParams.ts
new file mode 100644
index 000000000..ee60ae234
--- /dev/null
+++ b/frontend/src/types/RavenAI/RavenAIFunctionParams.ts
@@ -0,0 +1,29 @@
+
+export interface RavenAIFunctionParams{
+	creation: string
+	name: string
+	modified: string
+	owner: string
+	modified_by: string
+	docstatus: 0 | 1 | 2
+	parent?: string
+	parentfield?: string
+	parenttype?: string
+	idx?: number
+	/**	Fieldname : Data	*/
+	fieldname: string
+	/**	Child Table Name : Data	*/
+	child_table_name?: string
+	/**	Required : Check	*/
+	required?: 0 | 1
+	/**	Do not ask AI to fill this variable : Check	*/
+	do_not_ask_ai?: 0 | 1
+	/**	Default Value : Data	*/
+	default_value?: string
+	/**	Options : Small Text	*/
+	options?: string
+	/**	Type : Select	*/
+	type: "string" | "integer" | "number" | "float" | "boolean"
+	/**	Description : Small Text	*/
+	description: string
+}
\ No newline at end of file
diff --git a/frontend/src/types/RavenAI/RavenBotAIPrompt.ts b/frontend/src/types/RavenAI/RavenBotAIPrompt.ts
new file mode 100644
index 000000000..1346f834e
--- /dev/null
+++ b/frontend/src/types/RavenAI/RavenBotAIPrompt.ts
@@ -0,0 +1,21 @@
+
+export interface RavenBotAIPrompt{
+	creation: string
+	name: string
+	modified: string
+	owner: string
+	modified_by: string
+	docstatus: 0 | 1 | 2
+	parent?: string
+	parentfield?: string
+	parenttype?: string
+	idx?: number
+	/**	Prompt : Small Text	*/
+	prompt: string
+	/**	Naming Series : Select	*/
+	naming_series?: "PR-.#####."
+	/**	Raven Bot : Link - Raven Bot - If added, this prompt will only be shown when interacting with the bot	*/
+	raven_bot?: string
+	/**	Is Global : Check - If checked, this prompt will be available to all users on Raven	*/
+	is_global?: 0 | 1
+}
\ No newline at end of file
diff --git a/frontend/src/types/RavenAI/RavenBotFunctions.ts b/frontend/src/types/RavenAI/RavenBotFunctions.ts
new file mode 100644
index 000000000..b38385d8c
--- /dev/null
+++ b/frontend/src/types/RavenAI/RavenBotFunctions.ts
@@ -0,0 +1,19 @@
+
+export interface RavenBotFunctions{
+	creation: string
+	name: string
+	modified: string
+	owner: string
+	modified_by: string
+	docstatus: 0 | 1 | 2
+	parent?: string
+	parentfield?: string
+	parenttype?: string
+	idx?: number
+	/**	Function : Link - Raven AI Function	*/
+	function: string
+	/**	Type : Data	*/
+	type?: string
+	/**	Description : Small Text	*/
+	description?: string
+}
\ No newline at end of file
diff --git a/frontend/src/types/RavenAI/RavenBotInstructionTemplate.ts b/frontend/src/types/RavenAI/RavenBotInstructionTemplate.ts
new file mode 100644
index 000000000..7f0847c63
--- /dev/null
+++ b/frontend/src/types/RavenAI/RavenBotInstructionTemplate.ts
@@ -0,0 +1,19 @@
+
+export interface RavenBotInstructionTemplate{
+	creation: string
+	name: string
+	modified: string
+	owner: string
+	modified_by: string
+	docstatus: 0 | 1 | 2
+	parent?: string
+	parentfield?: string
+	parenttype?: string
+	idx?: number
+	/**	Template Name : Data	*/
+	template_name: string
+	/**	Dynamic Instructions : Check - Dynamic Instructions allow you to embed Jinja tags in your instruction to the bot. Hence the instruction would be different based on the user who is calling the bot or the data in your system. These instructions are computed every time the bot is called. Check this if you want to embed things like Employee ID, Company Name etc in your instructions dynamically	*/
+	dynamic_instructions?: 0 | 1
+	/**	Instruction : Long Text - You can use Jinja variables here to customize the instruction to the bot at run time if dynamic instructions are enabled.	*/
+	instruction: string
+}
\ No newline at end of file
diff --git a/frontend/src/types/RavenBot/RavenBot.ts b/frontend/src/types/RavenBot/RavenBot.ts
index 32b092caa..afca165f5 100644
--- a/frontend/src/types/RavenBot/RavenBot.ts
+++ b/frontend/src/types/RavenBot/RavenBot.ts
@@ -1,3 +1,4 @@
+import { RavenBotFunctions } from '../RavenAI/RavenBotFunctions'
 
 export interface RavenBot{
 	creation: string
@@ -22,4 +23,26 @@ export interface RavenBot{
 	is_standard?: 0 | 1
 	/**	Module : Link - Module Def	*/
 	module?: string
+	/**	Is AI Bot? : Check	*/
+	is_ai_bot?: 0 | 1
+	/**	Debug Mode : Check - If enabled, stack traces of errors will be sent as messages by the bot 	*/
+	debug_mode?: 0 | 1
+	/**	OpenAI Assistant ID : Data	*/
+	openai_assistant_id?: string
+	/**	Enable Code Interpreter : Check -  Enable this if you want the bot to be able to process files like Excel sheets or data from Insights.
+                    <br>
+                    OpenAI Assistants run code in a sandboxed environment (on OpenAI servers) to do this.	*/
+	enable_code_interpreter?: 0 | 1
+	/**	Allow Bot to Write Documents : Check	*/
+	allow_bot_to_write_documents?: 0 | 1
+	/**	Enable File Search : Check - Enable this if you want the bot to be able to read PDF files and scan them.
+
+File search enables the assistant with knowledge from files that you upload. Once a file is uploaded, the assistant automatically decides when to retrieve content based on user requests.	*/
+	enable_file_search?: 0 | 1
+	/**	Instruction : Long Text - You can use Jinja variables here to customize the instruction to the bot at run time if dynamic instructions are enabled.	*/
+	instruction?: string
+	/**	Dynamic Instructions : Check - Dynamic Instructions allow you to embed Jinja tags in your instruction to the bot. Hence the instruction would be different based on the user who is calling the bot or the data in your system. These instructions are computed every time the bot is called. Check this if you want to embed things like Employee ID, Company Name etc in your instructions dynamically	*/
+	dynamic_instructions?: 0 | 1
+	/**	Bot Functions : Table - Raven Bot Functions	*/
+	bot_functions?: RavenBotFunctions[]
 }
\ No newline at end of file
diff --git a/frontend/src/types/RavenChannelManagement/RavenChannel.ts b/frontend/src/types/RavenChannelManagement/RavenChannel.ts
index a9756fd10..f4a9f0af3 100644
--- a/frontend/src/types/RavenChannelManagement/RavenChannel.ts
+++ b/frontend/src/types/RavenChannelManagement/RavenChannel.ts
@@ -34,4 +34,10 @@ export interface RavenChannel{
 	last_message_timestamp?: string
 	/**	Last Message Details : JSON	*/
 	last_message_details?: any
+	/**	Is AI Thread : Check	*/
+	is_ai_thread?: 0 | 1
+	/**	OpenAI Thread ID : Data	*/
+	openai_thread_id?: string
+	/**	Thread Bot : Link - Raven Bot	*/
+	thread_bot?: string
 }
\ No newline at end of file
diff --git a/frontend/src/utils/translations.ts b/frontend/src/utils/translations.ts
new file mode 100644
index 000000000..a30c45b21
--- /dev/null
+++ b/frontend/src/utils/translations.ts
@@ -0,0 +1,34 @@
+
+function format(message: string, replace: any) {
+    return message.replace(/{(\d+)}/g, function (match, number) {
+        return typeof replace[number] != 'undefined' ? replace[number] : match
+    })
+}
+
+function translate(message: string, replace?: any, context = null): any {
+
+    // @ts-ignore
+    const translatedMessages = window?.frappe?.boot?.__messages || {}
+
+    let translatedMessage: string = ''
+
+    if (context) {
+        let key = `${message}:${context}`
+        if (translatedMessages[key]) {
+            translatedMessage = translatedMessages[key]
+        }
+    }
+
+    if (!translatedMessage) {
+        translatedMessage = translatedMessages[message] || message
+    }
+
+    const hasPlaceholders = /{\d+}/.test(message)
+    if (!hasPlaceholders) {
+        return translatedMessage
+    }
+
+    return format(translatedMessage, replace)
+}
+
+export const __ = translate
\ No newline at end of file
diff --git a/frontend/src/utils/validations.ts b/frontend/src/utils/validations.ts
index 8572d5b6c..01742aada 100644
--- a/frontend/src/utils/validations.ts
+++ b/frontend/src/utils/validations.ts
@@ -11,4 +11,25 @@ export const isEmailValid = (email: string): boolean => {
 */
 export const isPasswordValid = (password: string): boolean => {
     return (/^(?=.*[0-9])(?=.*[!@#$%^&*_-])(?=.*[a-zA-Z])[a-zA-Z0-9!@#$%^&*_-]{8,60}$/.test(password))
+}
+
+/**
+ * Function to check if a string exists in a list
+ * @param list 
+ * @param item 
+ * @returns 
+ */
+export const in_list = (list: string[], item?: string): boolean => {
+    if (item === undefined) return false
+
+    return list.includes(item)
+}
+
+/**
+ * Function to check if an object is empty
+ * @param obj 
+ * @returns 
+ */
+export const isEmpty = (obj: object) => {
+    return Object.keys(obj).length === 0;
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index c356c2482..ff15298df 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "raven",
-  "version": "1.7.1",
+  "version": "2.0.0",
   "description": "Messaging Application",
   "workspaces": [
     "frontend"
diff --git a/pyproject.toml b/pyproject.toml
index a55a07050..d3725cd58 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,8 @@ requires-python = ">=3.10"
 readme = "README.md"
 dynamic = ["version"]
 dependencies = [
- "linkpreview~=0.9.0"
+ "linkpreview~=0.9.0",
+ "openai"
 ]
 
 [build-system]
diff --git a/raven/__init__.py b/raven/__init__.py
index 3c1e9cbd3..8c0d5d5bb 100644
--- a/raven/__init__.py
+++ b/raven/__init__.py
@@ -1 +1 @@
-__version__ = "1.7.1"
+__version__ = "2.0.0"
diff --git a/raven/ai/ai.py b/raven/ai/ai.py
new file mode 100644
index 000000000..63a416f56
--- /dev/null
+++ b/raven/ai/ai.py
@@ -0,0 +1,234 @@
+import frappe
+
+from raven.ai.handler import stream_response
+from raven.ai.openai_client import get_open_ai_client
+
+
+def handle_bot_dm(message, bot):
+	"""
+	 Function to handle direct messages to the bot.
+
+	We need to start a new thread with the message and create a new conversation in OpenAI
+	"""
+
+	client = get_open_ai_client()
+
+	# If the message is a poll, send a message to the user that we don't support polls for AI yet
+
+	if message.message_type == "Poll":
+		bot.send_message(
+			channel_id=message.channel_id,
+			text="Sorry, I don't support polls yet. Please send a text message or file.",
+		)
+		return
+
+	if message.message_type in ["File", "Image"]:
+
+		if message.message_type == "File" and not check_if_bot_has_file_search(bot, message.channel_id):
+			return
+		# Upload the file to OpenAI
+		file = create_file_in_openai(message.file, message.message_type, client)
+
+		content, attachments = get_content_attachment_for_file(
+			message.message_type, file.id, message.file
+		)
+
+		ai_thread = client.beta.threads.create(
+			messages=[
+				{
+					"role": "user",
+					"content": content,
+					"metadata": {"user": message.owner, "message": message.name},
+					"attachments": attachments,
+				}
+			],
+			metadata={
+				"bot": bot.name,
+				"channel": message.channel_id,
+				"user": message.owner,
+				"message": message.name,
+			},
+		)
+
+	else:
+		ai_thread = client.beta.threads.create(
+			messages=[
+				{
+					"role": "user",
+					"content": message.content,
+					"metadata": {"user": message.owner, "message": message.name},
+				}
+			],
+			metadata={
+				"bot": bot.name,
+				"channel": message.channel_id,
+				"user": message.owner,
+				"message": message.name,
+			},
+		)
+
+	thread_channel = frappe.get_doc(
+		{
+			"doctype": "Raven Channel",
+			"channel_name": message.name,
+			"type": "Private",
+			"is_thread": 1,
+			"is_ai_thread": 1,
+			"openai_thread_id": ai_thread.id,
+			"thread_bot": bot.name,
+		}
+	).insert()
+
+	# Update the message to mark it as a thread
+	message.is_thread = 1
+	message.save()
+	# nosemgrep We need to commit here since the response will be streamed, and hence might take a while
+	frappe.db.commit()
+
+	frappe.publish_realtime(
+		"ai_event",
+		{
+			"text": "Raven AI is thinking...",
+			"channel_id": thread_channel.name,
+			"bot": bot.name,
+		},
+		doctype="Raven Channel",
+		docname=thread_channel.name,
+		after_commit=True,
+	)
+
+	stream_response(ai_thread_id=ai_thread.id, bot=bot, channel_id=thread_channel.name)
+
+
+def handle_ai_thread_message(message, channel):
+	"""
+	Function to handle messages in an AI thread
+
+	When a new message is sent, we need to send it to the OpenAI API and then stream the response
+	"""
+
+	client = get_open_ai_client()
+
+	bot = frappe.get_doc("Raven Bot", channel.thread_bot)
+
+	if message.message_type in ["File", "Image"]:
+
+		if message.message_type == "File" and not check_if_bot_has_file_search(bot, channel.name):
+			return
+		# Upload the file to OpenAI
+		try:
+			file = create_file_in_openai(message.file, message.message_type, client)
+		except Exception as e:
+			frappe.log_error("Raven AI Error", frappe.get_traceback())
+			bot.send_message(
+				channel_id=channel.name,
+				text="Sorry, there was an error in processing your file. Please try again.<br/><br/>Error: "
+				+ str(e),
+			)
+			return
+
+		content, attachments = get_content_attachment_for_file(
+			message.message_type, file.id, message.file
+		)
+
+		try:
+			client.beta.threads.messages.create(
+				thread_id=channel.openai_thread_id,
+				role="user",
+				content=content,
+				metadata={"user": message.owner, "message": message.name},
+				attachments=attachments,
+			)
+		except Exception as e:
+			frappe.log_error("Raven AI Error", frappe.get_traceback())
+			bot.send_message(
+				channel_id=channel.name,
+				text="Sorry, there was an error in processing your file. Please try again.<br/><br/>Error: "
+				+ str(e),
+			)
+			return
+
+	else:
+
+		client.beta.threads.messages.create(
+			thread_id=channel.openai_thread_id,
+			role="user",
+			content=message.content,
+			metadata={"user": message.owner, "message": message.name},
+		)
+
+	frappe.publish_realtime(
+		"ai_event",
+		{
+			"text": "Raven AI is thinking...",
+			"channel_id": channel.name,
+			"bot": bot.name,
+		},
+		doctype="Raven Channel",
+		docname=channel.name,
+	)
+
+	stream_response(ai_thread_id=channel.openai_thread_id, bot=bot, channel_id=channel.name)
+
+
+def check_if_bot_has_file_search(bot, channel_id):
+	"""
+	Checks of bot has file search. If not, send a message to the user. If yes, return True
+	"""
+
+	if not bot.enable_file_search:
+		bot.send_message(
+			channel_id=channel_id,
+			text="Sorry, your bot does not support file search. Please enable it and try again.",
+		)
+		return False
+
+	return True
+
+
+def create_file_in_openai(file_url: str, message_type: str, client):
+	"""
+	Function to create a file in OpenAI
+
+	We need to upload the file to OpenAI and return the file ID
+	"""
+
+	file_doc = frappe.get_doc("File", {"file_url": file_url})
+	file_path = file_doc.get_full_path()
+
+	file = client.files.create(
+		file=open(file_path, "rb"), purpose="assistants" if message_type == "File" else "vision"
+	)
+
+	return file
+
+
+def get_content_attachment_for_file(message_type: str, file_id: str, file_url: str):
+
+	attachments = None
+
+	if message_type == "File":
+		content = f"Uploaded a file. URL of the file is '{file_url}'"
+
+		FILE_SEARCH_EXCLUSIONS = [".xlsx", ".csv", ".json", ".xls"]
+
+		tool_type = "file_search"
+
+		for exclusion in FILE_SEARCH_EXCLUSIONS:
+			if file_url.endswith(exclusion):
+				tool_type = "code_interpreter"
+				break
+
+		attachments = [
+			{
+				"file_id": file_id,
+				"tools": [{"type": tool_type}],
+			}
+		]
+	else:
+		content = [
+			{"type": "text", "text": f"Uploaded an image. URL of the image is '{file_url}'"},
+			{"type": "image_file", "image_file": {"file_id": file_id}},
+		]
+
+	return content, attachments
diff --git a/raven/ai/functions.py b/raven/ai/functions.py
new file mode 100644
index 000000000..01c1ed947
--- /dev/null
+++ b/raven/ai/functions.py
@@ -0,0 +1,139 @@
+import frappe
+from frappe import _
+
+
+def get_document(doctype: str, document_id: str):
+	"""
+	Get a document from the database
+	"""
+	# Use the frappe.client.get method to get the document with permissions (both read and field level read)
+	return frappe.client.get(doctype, name=document_id)
+
+
+def get_documents(doctype: str, document_ids: list):
+	"""
+	Get documents from the database
+	"""
+	docs = []
+	for document_id in document_ids:
+		# Use the frappe.client.get method to get the document with permissions applied
+		docs.append(frappe.client.get(doctype, name=document_id))
+	return docs
+
+
+def create_document(doctype: str, data: dict, function=None):
+	"""
+	Create a document in the database
+	"""
+	if function:
+		# Get any default values
+		for param in function.parameters:
+			if param.default_value:
+				# Check if this value was not to be asked by the AI
+				if param.do_not_ask_ai:
+					data[param.fieldname] = param.default_value
+
+				# Check if the value was not provided
+				if not data.get(param.fieldname):
+					data[param.fieldname] = param.default_value
+
+	doc = frappe.get_doc({"doctype": doctype, **data})
+	doc.insert()
+	return {"document_id": doc.name, "message": "Document created", "doctype": doctype}
+
+
+def create_documents(doctype: str, data: list, function=None):
+	"""
+	Create documents in the database
+	"""
+	docs = []
+	for item in data:
+		docs.append(create_document(doctype, item, function).get("document_id"))
+
+	return {"documents": docs, "message": "Documents created", "doctype": doctype}
+
+
+def update_document(doctype: str, document_id: str, data: dict, function=None):
+	"""
+	Update a document in the database
+	"""
+	if function:
+		# Get any default values
+		for param in function.parameters:
+			if param.default_value:
+				# Check if this value was not to be asked by the AI
+				if param.do_not_ask_ai:
+					data[param.fieldname] = param.default_value
+
+				# Check if the value was not provided
+				if not data.get(param.fieldname):
+					data[param.fieldname] = param.default_value
+
+	doc = frappe.get_doc(doctype, document_id)
+	doc.update(data)
+	doc.save()
+	return {"document_id": doc.name, "message": "Document updated", "doctype": doctype}
+
+
+def update_documents(doctype: str, data: dict, function=None):
+	"""
+	Update documents in the database
+	"""
+	updated_docs = []
+	for document in data:
+		document_without_id = document.copy()
+		document_id = document_without_id.pop("document_id")
+		updated_docs.append(
+			update_document(doctype, document_id, document_without_id, function).get("document_id")
+		)
+
+	return {"document_ids": updated_docs, "message": "Documents updated", "doctype": doctype}
+
+
+def delete_document(doctype: str, document_id: str):
+	"""
+	Delete a document from the database
+	"""
+	frappe.delete_doc(doctype, document_id)
+	return {"document_id": document_id, "message": "Document deleted", "doctype": doctype}
+
+
+def delete_documents(doctype: str, document_ids: list):
+	"""
+	Delete documents from the database
+	"""
+	for document_id in document_ids:
+		frappe.delete_doc(doctype, document_id)
+	return {"document_ids": document_ids, "message": "Documents deleted", "doctype": doctype}
+
+
+def attach_file_to_document(doctype: str, document_id: str, file_path: str):
+	"""
+	Attach a file to a document in the database
+	"""
+	if not frappe.db.exists(doctype, document_id):
+		return {
+			"document_id": document_id,
+			"message": f"{doctype} with ID {document_id} not found",
+			"doctype": doctype,
+		}
+
+	file = frappe.get_doc("File", {"file_url": file_path})
+
+	if not file:
+		frappe.throw(_("File not found"))
+
+	newFile = frappe.get_doc(
+		{
+			"doctype": "File",
+			"file_url": file_path,
+			"attached_to_doctype": doctype,
+			"attached_to_name": document_id,
+			"folder": file.folder,
+			"file_name": file.file_name,
+			"is_private": file.is_private,
+		}
+	)
+	newFile.insert()
+
+	return {"document_id": document_id, "message": "File attached", "file_id": newFile.name}
diff --git a/raven/ai/handler.py b/raven/ai/handler.py
new file mode 100644
index 000000000..3dbb93c3c
--- /dev/null
+++ b/raven/ai/handler.py
@@ -0,0 +1,306 @@
+import json
+
+import frappe
+from openai import AssistantEventHandler
+from openai.types.beta.threads import Text
+from openai.types.beta.threads.runs import RunStep
+from typing_extensions import override
+
+from raven.ai.functions import (
+	attach_file_to_document,
+	create_document,
+	create_documents,
+	delete_document,
+	delete_documents,
+	get_document,
+	get_documents,
+	update_document,
+	update_documents,
+)
+from raven.ai.openai_client import get_open_ai_client
+
+
+def stream_response(ai_thread_id: str, bot, channel_id: str):
+
+	client = get_open_ai_client()
+
+	assistant_id = bot.openai_assistant_id
+
+	docs_updated = []
+
+	class EventHandler(AssistantEventHandler):
+		@override
+		def on_run_step_done(self, run_step: RunStep) -> None:
+			details = run_step.step_details
+			if details.type == "tool_calls":
+				for tool in details.tool_calls:
+					if tool.type == "code_interpreter":
+						self.publish_event("Running code...")
+					if tool.type == "file_search":
+						self.publish_event("Searching file contents...")
+			else:
+				self.publish_event("Raven AI is thinking...")
+
+		@override
+		def on_text_done(self, text: Text):
+
+			link_doctype = None
+			link_document = None
+			if len(docs_updated) == 1:
+				link_doctype = docs_updated[0]["doctype"]
+				link_document = docs_updated[0]["document_id"]
+
+			bot.send_message(
+				channel_id=channel_id,
+				text=text.value,
+				link_doctype=link_doctype,
+				link_document=link_document,
+				markdown=True,
+			)
+
+			frappe.publish_realtime(
+				"ai_event_clear",
+				{
+					"channel_id": channel_id,
+				},
+				doctype="Raven Channel",
+				docname=channel_id,
+				after_commit=True,
+			)
+
+		@override
+		def on_event(self, event):
+			# Retrieve events that are denoted with 'requires_action'
+			# since these will have our tool_calls
+			if event.event == "thread.run.requires_action":
+				run_id = event.data.id  # Retrieve the run ID from the event data
+				self.handle_requires_action(event.data, run_id)
+
+		def publish_event(self, text):
+			frappe.publish_realtime(
+				"ai_event",
+				{
+					"text": text,
+					"channel_id": channel_id,
+					"bot": bot.name,
+				},
+				doctype="Raven Channel",
+				docname=channel_id,
+			)
+
+		def handle_requires_action(self, data, run_id):
+			tool_outputs = []
+
+			for tool in data.required_action.submit_tool_outputs.tool_calls:
+
+				function = None
+
+				try:
+					function = frappe.get_cached_doc("Raven AI Function", tool.function.name)
+				except frappe.DoesNotExistError:
+					tool_outputs.append({"tool_call_id": tool.id, "output": "Function not found"})
+					return
+
+				# When calling the function, we need to pass the arguments as named params/json
+				# Args is a dictionary of the form {"param_name": "param_value"}
+
+				try:
+					args = json.loads(tool.function.arguments)
+
+					# Check the type of function and then call it accordingly
+
+					function_output = {}
+
+					if function.type == "Custom Function":
+						function_name = frappe.get_attr(function.function_path)
+
+						if bot.allow_bot_to_write_documents:
+							# We can commit to the database if writes are allowed
+							if function.pass_parameters_as_json:
+								function_output = function_name(args)
+							else:
+								function_output = function_name(**args)
+						else:
+							# We need to savepoint and then rollback
+							frappe.db.savepoint(run_id + "_" + tool.id)
+							if function.pass_parameters_as_json:
+								function_output = function_name(args)
+							else:
+								function_output = function_name(**args)
+							frappe.db.rollback(save_point=run_id + "_" + tool.id)
+
+					if function.type == "Get Document":
+						self.publish_event(
+							"Fetching {} {}...".format(function.reference_doctype, args.get("document_id"))
+						)
+						function_output = get_document(function.reference_doctype, **args)
+
+					if function.type == "Get Multiple Documents":
+						self.publish_event(f"Fetching multiple {function.reference_doctype}s...")
+						function_output = get_documents(function.reference_doctype, **args)
+
+					if function.type == "Delete Document":
+						self.publish_event(
+							"Deleting {} {}...".format(function.reference_doctype, args.get("document_id"))
+						)
+						function_output = delete_document(function.reference_doctype, **args)
+
+					if function.type == "Delete Multiple Documents":
+						self.publish_event(f"Deleting multiple {function.reference_doctype}s...")
+						function_output = delete_documents(function.reference_doctype, **args)
+
+					if function.type == "Create Document":
+						self.publish_event(f"Creating {function.reference_doctype}...")
+						function_output = create_document(function.reference_doctype, data=args, function=function)
+
+						docs_updated.append(
+							{"doctype": function.reference_doctype, "document_id": function_output.get("document_id")}
+						)
+
+					if function.type == "Create Multiple Documents":
+						self.publish_event(f"Creating multiple {function.reference_doctype}s...")
+						function_output = create_documents(
+							function.reference_doctype, data=args.get("data"), function=function
+						)
+
+						for doc_id in function_output.get("documents"):
+							docs_updated.append({"doctype": function.reference_doctype, "document_id": doc_id})
+
+					if function.type == "Update Document":
+						self.publish_event(f"Updating {function.reference_doctype}...")
+						function_output = update_document(
+							function.reference_doctype,
+							document_id=args.get("document_id"),
+							data=args,
+							function=function,
+						)
+
+						docs_updated.append(
+							{"doctype": function.reference_doctype, "document_id": args.get("document_id")}
+						)
+
+					if function.type == "Update Multiple Documents":
+						self.publish_event(f"Updating multiple {function.reference_doctype}s...")
+						function_output = update_documents(
+							function.reference_doctype, data=args.get("data"), function=function
+						)
+
+						for doc_id in function_output.get("documents"):
+							docs_updated.append({"doctype": function.reference_doctype, "document_id": doc_id})
+
+					if function.type == "Attach File to Document":
+						doctype = args.get("doctype")
+						document_id = args.get("document_id")
+						file_path = args.get("file_path")
+						self.publish_event(f"Attaching file to {doctype} {document_id}...")
+						function_output = attach_file_to_document(doctype, document_id, file_path)
+
+					tool_outputs.append(
+						{"tool_call_id": tool.id, "output": json.dumps(function_output, default=str)}
+					)
+
+				except Exception as e:
+					frappe.log_error("Raven AI Error", frappe.get_traceback())
+
+					if bot.debug_mode:
+						bot.send_message(
+							channel_id=channel_id,
+							text=f"<details data-summary='Error in function call'><p>{frappe.get_traceback()}</p></details>",
+						)
+					tool_outputs.append(
+						{
+							"tool_call_id": tool.id,
+							"output": json.dumps(
+								{
+									"message": "There was an error in the function call",
+									"error": frappe.get_traceback(),
+								},
+								default=str,
+							),
+						}
+					)
+
+			# Submit all tool_outputs at the same time
+			self.submit_tool_outputs(tool_outputs, run_id)
+
+		def submit_tool_outputs(self, tool_outputs, run_id):
+			# Use the submit_tool_outputs_stream helper
+			with client.beta.threads.runs.submit_tool_outputs_stream(
+				thread_id=self.current_run.thread_id,
+				run_id=self.current_run.id,
+				tool_outputs=tool_outputs,
+				event_handler=EventHandler(),
+			) as stream:
+				self.publish_event("Raven AI is thinking...")
+				for text in stream.text_deltas:
+					print(text, end="", flush=True)
+				print()
+
+	# We need to get the instructions from the bot
+	instructions = get_instructions(bot)
+	with client.beta.threads.runs.stream(
+		thread_id=ai_thread_id,
+		assistant_id=assistant_id,
+		event_handler=EventHandler(),
+		instructions=instructions,
+	) as stream:
+		try:
+			stream.until_done()
+		except Exception as e:
+			bot.send_message(
+				channel_id=channel_id,
+				text=f"There was an error in the AI thread. Please try again.<br/>Error: {str(e)}",
+			)
+			frappe.publish_realtime(
+				"ai_event_clear",
+				{
+					"channel_id": channel_id,
+				},
+				doctype="Raven Channel",
+				docname=channel_id,
+				after_commit=True,
+			)
+
+
+def get_instructions(bot):
+
+	# If no instruction is set, or dynamic instruction is disabled, we return None
+	if not bot.instruction or not bot.dynamic_instructions:
+		return None
+
+	vars = get_variables_for_instructions()
+
+	instructions = frappe.render_template(bot.instruction, vars)
+	return instructions
+
+
+def get_variables_for_instructions():
+	user = frappe.get_cached_doc("User", frappe.session.user)
+
+	employee_company = None
+	company = None
+	employee_id = None
+	department = None
+
+	if "erpnext" in frappe.get_installed_apps():
+		employee_id = frappe.db.exists("Employee", {"user_id": frappe.session.user})
+
+		if employee_id:
+			employee = frappe.get_cached_doc("Employee", employee_id)
+			employee_company = employee.company
+			department = employee.department
+
+		company = frappe.defaults.get_user_default("company") or frappe.db.get_single_value(
+			"Global Defaults", "default_company"
+		)
+
+	return {
+		"first_name": user.first_name,
+		"full_name": user.full_name,
+		"email": user.email,
+		"user_id": frappe.session.user,
+		"company": company,
+		"employee_id": employee_id,
+		"department": department,
+		"employee_company": employee_company,
+	}
diff --git a/raven/ai/openai_client.py b/raven/ai/openai_client.py
new file mode 100644
index 000000000..e58cca55b
--- /dev/null
+++ b/raven/ai/openai_client.py
@@ -0,0 +1,30 @@
+import frappe
+from frappe import _
+from openai import OpenAI
+
+
+def get_open_ai_client():
+	"""
+	Get the OpenAI client
+	"""
+
+	raven_settings = frappe.get_cached_doc("Raven Settings")
+
+	if not raven_settings.enable_ai_integration:
+		frappe.throw(_("AI Integration is not enabled"))
+
+	openai_api_key = raven_settings.get_password("openai_api_key")
+
+	if raven_settings.openai_project_id:
+		client = OpenAI(
+			organization=raven_settings.openai_organisation_id,
+			project=raven_settings.openai_project_id,
+			api_key=openai_api_key,
+		)
+
+		return client
+
+	else:
+		client = OpenAI(api_key=openai_api_key, organization=raven_settings.openai_organisation_id)
+
+		return client
diff --git a/raven/api/ai_features.py b/raven/api/ai_features.py
new file mode 100644
index 000000000..8713f06ad
--- /dev/null
+++ b/raven/api/ai_features.py
@@ -0,0 +1,29 @@
+import frappe
+
+from raven.ai.handler import get_variables_for_instructions
+
+
+@frappe.whitelist()
+def get_instruction_preview(instruction):
+	"""
+	Function to get the rendered instructions for the bot
+	"""
+	instructions = frappe.render_template(instruction, get_variables_for_instructions())
+	return instructions
+
+
+@frappe.whitelist()
+def get_saved_prompts(bot: str = None):
+	"""
+	API to get the saved prompt for a user/bot/global
+	"""
+	or_filters = [["is_global", "=", 1], ["owner", "=", frappe.session.user]]
+
+	prompts = frappe.get_list(
+		"Raven Bot AI Prompt", or_filters=or_filters, fields=["name", "prompt", "is_global", "raven_bot"]
+	)
+
+	# Order by ones with the given bot
+	prompts = sorted(prompts, key=lambda x: x.get("raven_bot") == bot, reverse=True)
+
+	return prompts
diff --git a/raven/api/document_link.py b/raven/api/document_link.py
index 58c5d3502..980a0524e 100644
--- a/raven/api/document_link.py
+++ b/raven/api/document_link.py
@@ -1,10 +1,23 @@
 import frappe
 from frappe.desk.utils import slug
 from frappe.model.meta import no_value_fields, table_fields
+from frappe.utils import get_url
+
+
+def get_new_app_document_links(doctype, docname):
+	"""
+	New apps like Frappe CRM etc have a different link.
+	"""
+	# TODO: Add the other app routes here
+	routes = {
+		"CRM Lead": "/crm/leads/",
+	}
+
+	return routes.get(doctype) + docname if doctype in routes else None
 
 
 @frappe.whitelist(methods=["GET"])
-def get(doctype, docname):
+def get(doctype, docname, with_site_url=True):
 
 	document_link_override = frappe.get_hooks("raven_document_link_override")
 	if document_link_override and len(document_link_override) > 0:
@@ -13,8 +26,13 @@ def get(doctype, docname):
 		for hook in document_link_override:
 			link = frappe.get_attr(hook)(doctype, docname)
 			if link:
+				if with_site_url:
+					return get_url() + link
 				return link
 
+	if with_site_url:
+		return frappe.utils.get_url() + f"/app/{slug(doctype)}/{docname}"
+
 	return f"/app/{slug(doctype)}/{docname}"
 
 
diff --git a/raven/api/events.py b/raven/api/events.py
index 56b704a2a..7069aafb8 100644
--- a/raven/api/events.py
+++ b/raven/api/events.py
@@ -1,4 +1,5 @@
 import frappe
+from frappe import _
 
 
 @frappe.whitelist()
@@ -19,7 +20,7 @@ def create_event(
 		)
 
 	if not google_calendar:
-		frappe.throw("Google Calendar not found for the current user")
+		frappe.throw(_("Google Calendar not found for the current user"))
 
 	event = frappe.get_doc(
 		{
diff --git a/raven/api/notification.py b/raven/api/notification.py
index e65c88e0b..340912e5a 100644
--- a/raven/api/notification.py
+++ b/raven/api/notification.py
@@ -1,4 +1,5 @@
 import frappe
+from frappe import _
 
 
 @frappe.whitelist()
@@ -20,4 +21,4 @@ def toggle_push_notification_for_channel(member: str, allow_notifications: 0 | 1
 
 			return member_doc
 	else:
-		frappe.throw("Push notifications are not supported in the current framework version")
+		frappe.throw(_("Push notifications are not supported in the current framework version"))
diff --git a/raven/api/preview_links.py b/raven/api/preview_links.py
index f018e7214..14582d5f5 100644
--- a/raven/api/preview_links.py
+++ b/raven/api/preview_links.py
@@ -80,4 +80,5 @@ def hide_link_preview(message_id: str):
 	message = frappe.get_doc("Raven Message", message_id)
 	message.flags.ignore_permissions = True
 	message.hide_link_preview = 1
+	message.flags.editing_metadata = True
 	message.save()
diff --git a/raven/api/raven_mobile.py b/raven/api/raven_mobile.py
index f0432bb83..dfdcb2ab0 100644
--- a/raven/api/raven_mobile.py
+++ b/raven/api/raven_mobile.py
@@ -1,5 +1,6 @@
 import frappe
 
+
 @frappe.whitelist(allow_guest=True)
 def get_client_id():
-    return frappe.db.get_single_value("Raven Settings", "oauth_client")
\ No newline at end of file
+	return frappe.db.get_single_value("Raven Settings", "oauth_client")
diff --git a/raven/api/threads.py b/raven/api/threads.py
index 2fbe036f0..48bc3e991 100644
--- a/raven/api/threads.py
+++ b/raven/api/threads.py
@@ -4,7 +4,7 @@
 
 
 @frappe.whitelist()
-def get_all_threads():
+def get_all_threads(is_ai_thread=0):
 	"""
 	Get all the threads in which the user is a participant
 	(We are not fetching the messages inside a thread here, just the main thread message,
@@ -46,6 +46,7 @@ def get_all_threads():
 		.on(channel.name == channel_member.channel_id)
 		.where(channel_member.user_id == frappe.session.user)
 		.where(channel.is_thread == 1)
+		.where(channel.is_ai_thread == is_ai_thread)
 	)
 
 	query = query.orderby(channel.last_message_timestamp, order=Order.desc)
diff --git a/raven/api/user_availability.py b/raven/api/user_availability.py
index 36a3d297b..10a54e2bc 100644
--- a/raven/api/user_availability.py
+++ b/raven/api/user_availability.py
@@ -3,7 +3,6 @@
 
 def set_user_active():
 	# Set the user's session ID in the cache
-	print("Setting the user as active", frappe.session.user)
 	frappe.cache().set_value(
 		f"user_session_{frappe.session.user}", frappe.session.user, expires_in_sec=900
 	)
@@ -11,7 +10,6 @@ def set_user_active():
 
 def set_user_inactive():
 	# Remove the user's session ID from the cache
-	print("Setting the user as inactive", frappe.session.user)
 	frappe.cache().delete_key(f"user_session_{frappe.session.user}")
 
 
diff --git a/raven/hooks.py b/raven/hooks.py
index 4173d15d1..84a6893f1 100644
--- a/raven/hooks.py
+++ b/raven/hooks.py
@@ -8,7 +8,7 @@
 app_license = "AGPLv3"
 source_link = "https://github.com/The-Commit-Company/Raven"
 app_logo = "/assets/raven/raven-logo.png"
-# app_logo_url = "/assets/raven/raven-logo.png"
+app_logo_url = "/assets/raven/raven-logo.png"
 
 # Includes in <head>
 # ------------------
@@ -253,3 +253,5 @@
 on_logout = "raven.api.user_availability.set_user_inactive"
 
 export_python_type_annotations = True
+
+raven_document_link_override = "raven.api.document_link.get_new_app_document_links"
diff --git a/raven/install.py b/raven/install.py
index cbe4b8d3c..c6c9936ee 100644
--- a/raven/install.py
+++ b/raven/install.py
@@ -1,12 +1,10 @@
 import click
-import frappe
 from frappe.desk.page.setup_wizard.setup_wizard import make_records
 
 
 def after_install():
 	try:
 		print("Setting up Raven...")
-		add_standard_navbar_items()
 		create_general_channel()
 
 		click.secho("Thank you for installing Raven!", fg="green")
@@ -28,39 +26,3 @@ def create_general_channel():
 	]
 
 	make_records(channel)
-
-
-def add_standard_navbar_items():
-	navbar_settings = frappe.get_single("Navbar Settings")
-
-	raven_navbar_items = [
-		{
-			"item_label": "Raven",
-			"item_type": "Route",
-			"route": "/raven",
-			"is_standard": 1,
-		}
-	]
-
-	current_navbar_items = navbar_settings.settings_dropdown
-	navbar_settings.set("settings_dropdown", [])
-
-	for item in raven_navbar_items:
-		current_labels = [item.get("item_label") for item in current_navbar_items]
-		if not item.get("item_label") in current_labels:
-			navbar_settings.append("settings_dropdown", item)
-
-	for item in current_navbar_items:
-		navbar_settings.append(
-			"settings_dropdown",
-			{
-				"item_label": item.item_label,
-				"item_type": item.item_type,
-				"route": item.route,
-				"action": item.action,
-				"is_standard": item.is_standard,
-				"hidden": item.hidden,
-			},
-		)
-
-	navbar_settings.save()
diff --git a/raven/modules.txt b/raven/modules.txt
index 54ebc74a0..4e7a2a38a 100644
--- a/raven/modules.txt
+++ b/raven/modules.txt
@@ -2,4 +2,5 @@ Raven
 Raven Messaging
 Raven Channel Management
 Raven Bot
-Raven Integrations
\ No newline at end of file
+Raven Integrations
+Raven AI
\ No newline at end of file
diff --git a/raven/package.json b/raven/package.json
index 26b6aa663..0c5b79004 100644
--- a/raven/package.json
+++ b/raven/package.json
@@ -1,6 +1,6 @@
 {
   "name": "raven-app",
-  "version": "1.7.1",
+  "version": "2.0.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/raven/public/raven-logo.png b/raven/public/raven-logo.png
index c6fcd6a11..6239c45bd 100644
Binary files a/raven/public/raven-logo.png and b/raven/public/raven-logo.png differ
diff --git a/raven/public/scss/raven.bundle.scss b/raven/public/scss/raven.bundle.scss
index e554f4107..3c513424c 100644
--- a/raven/public/scss/raven.bundle.scss
+++ b/raven/public/scss/raven.bundle.scss
@@ -27,7 +27,7 @@
     bottom: 0;
     border-top-right-radius: var(--border-radius-md);
     border-top-left-radius: var(--border-radius-md);
-    left: 15px;
+    left: 60px;
 }
 
 .skeleton {
diff --git a/raven/raven/doctype/raven_settings/raven_settings.json b/raven/raven/doctype/raven_settings/raven_settings.json
index 6efedddbb..e8a7c6e06 100644
--- a/raven/raven/doctype/raven_settings/raven_settings.json
+++ b/raven/raven/doctype/raven_settings/raven_settings.json
@@ -12,6 +12,12 @@
   "integrations_tab",
   "integrations_section",
   "tenor_api_key",
+  "ai_section",
+  "enable_ai_integration",
+  "openai_organisation_id",
+  "openai_api_key",
+  "openai_project_id",
+  "column_break_occp",
   "frappe_hr_tab",
   "auto_create_department_channel",
   "department_channel_type",
@@ -82,6 +88,42 @@
    "fieldtype": "Check",
    "label": "Show if a user is on leave"
   },
+  {
+   "fieldname": "ai_section",
+   "fieldtype": "Section Break",
+   "label": "AI"
+  },
+  {
+   "default": "0",
+   "fieldname": "enable_ai_integration",
+   "fieldtype": "Check",
+   "label": "Enable AI Integration"
+  },
+  {
+   "depends_on": "eval:doc.enable_ai_integration;",
+   "fieldname": "openai_organisation_id",
+   "fieldtype": "Data",
+   "label": "OpenAI Organisation ID",
+   "mandatory_depends_on": "eval:doc.enable_ai_integration;"
+  },
+  {
+   "depends_on": "eval:doc.enable_ai_integration;",
+   "fieldname": "openai_api_key",
+   "fieldtype": "Password",
+   "label": "OpenAI API Key",
+   "mandatory_depends_on": "eval:doc.enable_ai_integration;"
+  },
+  {
+   "depends_on": "eval:doc.enable_ai_integration;",
+   "description": "If not set, the integration will use the default project",
+   "fieldname": "openai_project_id",
+   "fieldtype": "Data",
+   "label": "OpenAI Project ID"
+  },
+  {
+   "fieldname": "column_break_occp",
+   "fieldtype": "Column Break"
+  },
   {
    "fieldname": "raven_mobile_tab",
    "fieldtype": "Tab Break",
diff --git a/raven/raven/doctype/raven_settings/raven_settings.py b/raven/raven/doctype/raven_settings/raven_settings.py
index 5c77ecefb..7db352d09 100644
--- a/raven/raven/doctype/raven_settings/raven_settings.py
+++ b/raven/raven/doctype/raven_settings/raven_settings.py
@@ -17,6 +17,10 @@ class RavenSettings(Document):
 		auto_add_system_users: DF.Check
 		auto_create_department_channel: DF.Check
 		department_channel_type: DF.Literal["Public", "Private"]
+		enable_ai_integration: DF.Check
+		openai_api_key: DF.Password | None
+		openai_organisation_id: DF.Data | None
+		openai_project_id: DF.Data | None
 		oauth_client: DF.Link | None
 		show_if_a_user_is_on_leave: DF.Check
 		show_raven_on_desk: DF.Check
diff --git a/raven/raven/doctype/raven_user/raven_user.py b/raven/raven/doctype/raven_user/raven_user.py
index 488d543e6..0b24ab97a 100644
--- a/raven/raven/doctype/raven_user/raven_user.py
+++ b/raven/raven/doctype/raven_user/raven_user.py
@@ -68,11 +68,12 @@ def after_delete(self):
 		"""
 		Remove the Raven User role from the user.
 		"""
-		user = frappe.get_doc("User", self.user)
-		user.flags.ignore_permissions = True
-		user.flags.deleting_raven_user = True
-		user.remove_roles("Raven User")
-		user.save()
+		if self.user:
+			user = frappe.get_doc("User", self.user)
+			user.flags.ignore_permissions = True
+			user.flags.deleting_raven_user = True
+			user.remove_roles("Raven User")
+			user.save()
 
 		self.invalidate_user_list_cache()
 
diff --git a/raven/raven/workspace/raven/raven.json b/raven/raven/workspace/raven/raven.json
index 3d0ddbf27..699ba6014 100644
--- a/raven/raven/workspace/raven/raven.json
+++ b/raven/raven/workspace/raven/raven.json
@@ -1,6 +1,6 @@
 {
  "charts": [],
- "content": "[{\"id\":\"MKitHAnT4f\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><a href=\\\"/raven\\\">Raven</a></span>\",\"col\":12}},{\"id\":\"gBy2HFBNf4\",\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Raven\",\"col\":12}},{\"id\":\"ZcawYU5brv\",\"type\":\"card\",\"data\":{\"card_name\":\"DocTypes\",\"col\":4}}]",
+ "content": "[{\"id\":\"MKitHAnT4f\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><a href=\\\"/raven\\\">Raven</a></span>\",\"col\":12}},{\"id\":\"gBy2HFBNf4\",\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Raven\",\"col\":12}},{\"id\":\"ZcawYU5brv\",\"type\":\"card\",\"data\":{\"card_name\":\"DocTypes\",\"col\":4}},{\"id\":\"Uox8EFjnuM\",\"type\":\"card\",\"data\":{\"card_name\":\"AI\",\"col\":4}}]",
  "creation": "2023-06-22 20:12:29.687295",
  "custom_blocks": [],
  "docstatus": 0,
@@ -79,9 +79,58 @@
    "link_type": "DocType",
    "onboard": 0,
    "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "AI",
+   "link_count": 4,
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Card Break"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Bots",
+   "link_count": 0,
+   "link_to": "Raven Bot",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Functions",
+   "link_count": 0,
+   "link_to": "Raven AI Function",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Instruction Templates",
+   "link_count": 0,
+   "link_to": "Raven Bot Instruction Template",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
+  },
+  {
+   "hidden": 0,
+   "is_query_report": 0,
+   "label": "Saved Prompts",
+   "link_count": 0,
+   "link_to": "Raven Bot AI Prompt",
+   "link_type": "DocType",
+   "onboard": 0,
+   "type": "Link"
   }
  ],
- "modified": "2024-06-13 20:18:44.203529",
+ "modified": "2024-09-29 07:34:36.957102",
  "modified_by": "Administrator",
  "module": "Raven",
  "name": "Raven",
diff --git a/raven/raven_ai/__init__.py b/raven/raven_ai/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/raven/raven_ai/doctype/__init__.py b/raven/raven_ai/doctype/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/raven/raven_ai/doctype/raven_ai_function/__init__.py b/raven/raven_ai/doctype/raven_ai_function/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/raven/raven_ai/doctype/raven_ai_function/raven_ai_function.js b/raven/raven_ai/doctype/raven_ai_function/raven_ai_function.js
new file mode 100644
index 000000000..c8dfa330f
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_ai_function/raven_ai_function.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2024, The Commit Company (Algocode Technologies Pvt. Ltd.) and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("Raven AI Function", {
+// 	refresh(frm) {
+
+// 	},
+// });
diff --git a/raven/raven_ai/doctype/raven_ai_function/raven_ai_function.json b/raven/raven_ai/doctype/raven_ai_function/raven_ai_function.json
new file mode 100644
index 000000000..3d077ae35
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_ai_function/raven_ai_function.json
@@ -0,0 +1,132 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:function_name",
+ "beta": 1,
+ "creation": "2024-08-23 08:43:26.356348",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "function_name",
+  "description",
+  "function_path",
+  "column_break_tlyz",
+  "type",
+  "reference_doctype",
+  "pass_parameters_as_json",
+  "requires_write_permissions",
+  "strict",
+  "parameters_section",
+  "parameters",
+  "params",
+  "function_definition"
+ ],
+ "fields": [
+  {
+   "depends_on": "eval: doc.type == \"Custom Function\";",
+   "fieldname": "function_path",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Function Path"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval: doc.type == \"Custom Function\";",
+   "description": "If checked, the params will be passed as a JSON object instead of named parameters",
+   "fieldname": "pass_parameters_as_json",
+   "fieldtype": "Check",
+   "label": "Pass parameters as JSON"
+  },
+  {
+   "fieldname": "function_name",
+   "fieldtype": "Data",
+   "label": "Function Name",
+   "reqd": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "type",
+   "fieldtype": "Select",
+   "label": "Type",
+   "options": "Get Document\nGet Multiple Documents\nGet List\nCreate Document\nCreate Multiple Documents\nUpdate Document\nUpdate Multiple Documents\nDelete Document\nDelete Multiple Documents\nCustom Function\nSend Message\nAttach File to Document\nGet Report Result",
+   "reqd": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "requires_write_permissions",
+   "fieldtype": "Check",
+   "label": "Requires Write Permissions"
+  },
+  {
+   "fieldname": "params",
+   "fieldtype": "JSON",
+   "label": "Params"
+  },
+  {
+   "fieldname": "function_definition",
+   "fieldtype": "JSON",
+   "label": "Function Definition",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_tlyz",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "parameters_section",
+   "fieldtype": "Section Break",
+   "label": "Parameters"
+  },
+  {
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "label": "Description",
+   "reqd": 1
+  },
+  {
+   "depends_on": "eval: doc.type != \"Custom Function\"",
+   "fieldname": "reference_doctype",
+   "fieldtype": "Link",
+   "label": "Reference DocType",
+   "options": "DocType"
+  },
+  {
+   "fieldname": "parameters",
+   "fieldtype": "Table",
+   "label": "Parameters",
+   "options": "Raven AI Function Params"
+  },
+  {
+   "default": "0",
+   "fieldname": "strict",
+   "fieldtype": "Check",
+   "label": "Strict"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2024-10-02 07:19:47.003701",
+ "modified_by": "Administrator",
+ "module": "Raven AI",
+ "name": "Raven AI Function",
+ "naming_rule": "By fieldname",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "search_fields": "description",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/raven/raven_ai/doctype/raven_ai_function/raven_ai_function.py b/raven/raven_ai/doctype/raven_ai_function/raven_ai_function.py
new file mode 100644
index 000000000..53223f7da
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_ai_function/raven_ai_function.py
@@ -0,0 +1,378 @@
+# Copyright (c) 2024, The Commit Company (Algocode Technologies Pvt. Ltd.) and contributors
+# For license information, please see license.txt
+
+import json
+
+import frappe
+from frappe import _, is_whitelisted
+from frappe.model.document import Document
+
+
+class RavenAIFunction(Document):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		from raven.raven_ai.doctype.raven_ai_function_params.raven_ai_function_params import (
+			RavenAIFunctionParams,
+		)
+
+		description: DF.SmallText
+		function_definition: DF.JSON | None
+		function_name: DF.Data
+		function_path: DF.SmallText | None
+		parameters: DF.Table[RavenAIFunctionParams]
+		params: DF.JSON | None
+		pass_parameters_as_json: DF.Check
+		reference_doctype: DF.Link | None
+		requires_write_permissions: DF.Check
+		strict: DF.Check
+		type: DF.Literal[
+			"Get Document",
+			"Get Multiple Documents",
+			"Get List",
+			"Create Document",
+			"Create Multiple Documents",
+			"Update Document",
+			"Update Multiple Documents",
+			"Delete Document",
+			"Delete Multiple Documents",
+			"Custom Function",
+			"Send Message",
+			"Attach File to Document",
+			"Get Report Result",
+		]
+	# end: auto-generated types
+
+	def before_validate(self):
+		WRITE_PERMISSIONS = [
+			"Create Document",
+			"Create Multiple Documents",
+			"Update Document",
+			"Update Multiple Documents",
+			"Delete Document",
+			"Delete Multiple Documents",
+			"Send Message",
+			"Attach File to Document",
+		]
+		if self.type in WRITE_PERMISSIONS:
+			self.requires_write_permissions = 1
+
+		READ_PERMISSIONS = ["Get Document", "Get Multiple Documents", "Get Report Result", "Get List"]
+		if self.type in READ_PERMISSIONS:
+			self.requires_write_permissions = 0
+
+		self.validate_reference_doctype()
+		self.validate_fields_for_doctype()
+		self.prepare_function_params()
+
+		self.validate_json()
+
+	def validate_reference_doctype(self):
+		if not self.reference_doctype:
+			if not self.type in [
+				"Custom Function",
+				"Send Message",
+				"Get Report Result",
+				"Attach File to Document",
+			]:
+				frappe.throw(_("Please select a DocType for this function."))
+
+	def validate_fields_for_doctype(self):
+		# TODO: Validate fields for the doctype - clean up this code
+		if not self.reference_doctype:
+			return
+
+		doctype = frappe.get_meta(self.reference_doctype)
+
+		# Loop over the variables and check if the field names are valid
+		for param in self.parameters:
+			# Check if the fieldname belongs to a child table
+			if param.child_table_name:
+				child_table = doctype.get_field(param.child_table_name)
+				if not child_table:
+					frappe.throw(
+						_("Child table {0} not found in {1}").format(param.child_table_name, self.reference_doctype)
+					)
+
+				# Check if the child table is a valid doctype
+				child_meta = frappe.get_meta(child_table.options)
+				if not child_meta:
+					frappe.throw(_("Child table {0} is not a valid doctype").format(param.child_table_name))
+
+				# Check if the child table variable has a valid name
+				docfield = child_meta.get_field(param.fieldname)
+				if not docfield:
+					frappe.throw(_("Field {0} not found in {1}").format(param.fieldname, child_table.options))
+			else:
+
+				field = doctype.get_field(param.fieldname)
+
+				if not field:
+					frappe.throw(_("Field {0} not found in {1}").format(param.fieldname, self.reference_doctype))
+
+				if field.fieldtype == "Select":
+					if not param.options:
+						frappe.throw(_("Options are required for select fields"))
+
+					select_options = field.options.split("\n")
+					for option in param.options.split("\n"):
+						if option not in select_options:
+							frappe.throw(
+								_("Option {0} is not valid for field {1} in {2}").format(
+									option, param.fieldname, self.reference_doctype
+								)
+							)
+
+	def prepare_function_params(self):
+		"""
+		Set the function params based on the type of function and other inputs
+		"""
+		params = {}
+		if self.type == "Get Document":
+			params = {
+				"type": "object",
+				"properties": {
+					"document_id": {
+						"type": "string",
+						"description": f"The ID of the {self.reference_doctype} to get",
+					}
+				},
+				"required": ["document_id"],
+				"additionalProperties": False,
+			}
+
+		elif self.type == "Get Multiple Documents":
+			params = {
+				"type": "object",
+				"properties": {
+					"document_ids": {
+						"type": "array",
+						"items": {"type": "string"},
+						"description": f"The IDs of the {self.reference_doctype}s to get",
+					}
+				},
+				"required": ["document_ids"],
+				"additionalProperties": False,
+			}
+
+		elif self.type == "Delete Document":
+			params = {
+				"type": "object",
+				"properties": {
+					"document_id": {
+						"type": "string",
+						"description": f"The ID of the {self.reference_doctype} to delete",
+					}
+				},
+				"required": ["document_id"],
+				"additionalProperties": False,
+			}
+
+		elif self.type == "Delete Multiple Documents":
+			params = {
+				"type": "object",
+				"properties": {
+					"document_ids": {
+						"type": "array",
+						"items": {"type": "string"},
+						"description": f"The IDs of the {self.reference_doctype}s to delete",
+					}
+				},
+				"required": ["document_ids"],
+				"additionalProperties": False,
+			}
+		elif self.type == "Attach File to Document":
+			params = {
+				"type": "object",
+				"properties": {
+					"doctype": {
+						"type": "string",
+						"description": "The DocType of the document to attach the file to",
+					},
+					"document_id": {
+						"type": "string",
+						"description": "Use the document_id obtained to attach the file to the document.",
+					},
+					"file_path": {
+						"type": "string",
+						"description": "The path of the file to attach to the document",
+					},
+				},
+				"required": ["doctype", "document_id", "file_path"],
+				"additionalProperties": False,
+			}
+		elif self.type == "Custom Function":
+			params = json.loads(self.params)
+		else:
+			params = self.build_params_json_from_table()
+
+		self.params = json.dumps(params, indent=4)
+
+	def build_params_json_from_table(self):
+		params = {
+			"type": "object",
+			"additionalProperties": False,
+		}
+
+		required = []
+		properties = {}
+
+		child_tables = {}
+
+		if self.type == "Update Document" or self.type == "Update Multiple Documents":
+			properties["document_id"] = {
+				"type": "string",
+				"description": f"The ID of the {self.reference_doctype} to update",
+			}
+			required.append("document_id")
+
+		for param in self.parameters:
+			if param.do_not_ask_ai and not param.default_value and param.required:
+				frappe.throw(
+					_("You need to provide a default value for required parameters that are not asked by the AI.")
+				)
+
+			if param.do_not_ask_ai:
+				continue
+			obj = {
+				"type": param.type,
+				"description": param.description,
+			}
+
+			if param.type == "string" and param.options:
+				obj["enum"] = param.options.split("\n")
+
+			if not param.child_table_name:
+				properties[param.fieldname] = obj
+
+				if param.required:
+					required.append(param.fieldname)
+			else:
+				if param.child_table_name not in child_tables:
+					child_tables[param.child_table_name] = {
+						"type": "array",
+						"items": {
+							"type": "object",
+							"additionalProperties": False,
+							"properties": {param.fieldname: obj},
+							"required": [],
+						},
+					}
+				else:
+					child_tables[param.child_table_name]["items"]["properties"][param.fieldname] = obj
+
+				if param.required:
+					child_tables[param.child_table_name]["items"]["required"].append(param.fieldname)
+
+		for child_table_name, child_table in child_tables.items():
+			doctype_meta = frappe.get_meta(self.reference_doctype)
+			table_field = doctype_meta.get_field(child_table_name)
+			if table_field.reqd and not self.strict:
+				child_table["minItems"] = 1
+
+			properties[child_table_name] = child_table
+
+		if self.type == "Create Multiple Documents" or self.type == "Update Multiple Documents":
+			params["properties"] = {
+				"data": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": properties,
+						"required": required,
+						"additionalProperties": False,
+					},
+				}
+			}
+			if not self.strict:
+				params["properties"]["data"]["minItems"] = 1
+		else:
+			params["properties"] = properties
+			params["required"] = required
+
+		return params
+
+	def validate_json(self):
+		if self.type == "Custom Function":
+			if not self.function_path:
+				frappe.throw(_("Function path is required for Custom Functions"))
+
+			# Check if JSON is valid and format it
+			try:
+				json.loads(self.params)
+			except json.JSONDecodeError:
+				frappe.throw(_("Invalid JSON in params"))
+
+			self.params = json.dumps(json.loads(self.params), indent=4)
+
+	def validate(self):
+		# Functions cannot be named after core functions
+		INVALID_FUNCTION_NAMES = [
+			"get_document",
+			"get_documents",
+			"get_list",
+			"create_document",
+			"create_documents",
+			"update_document",
+			"update_documents",
+			"delete_document",
+			"delete_documents",
+		]
+		if self.function_name in INVALID_FUNCTION_NAMES:
+			frappe.throw(
+				_("Function name cannot be one of the core functions. Please choose a different name.")
+			)
+
+		DOCUMENT_REF_FUNCTIONS = [
+			"Get Document",
+			"Get Multiple Documents",
+			"Get List",
+			"Create Document",
+			"Create Multiple Documents",
+			"Update Document",
+			"Update Multiple Documents",
+			"Delete Document",
+			"Delete Multiple Documents",
+		]
+		if self.type in DOCUMENT_REF_FUNCTIONS:
+			if not self.reference_doctype:
+				frappe.throw(_("Please select a DocType for this function."))
+
+		# Validate if the function is whitelisted
+		if self.type == "Custom Function":
+			f = frappe.get_attr(self.function_path)
+			if not f:
+				frappe.throw(_("Function not found"))
+
+			is_whitelisted(f)
+
+	def before_save(self):
+		# Generate the function definition from the variables + function name + description
+		if isinstance(self.params, str):
+			params = json.loads(self.params)
+
+		else:
+			params = self.params
+
+		function_definition = {
+			"name": self.function_name,
+			"description": self.description,
+			"strict": True if self.strict else False,
+			"parameters": params,
+		}
+
+		self.function_definition = json.dumps(function_definition, indent=4)
+
+	def on_update(self):
+		# Update all the bots that use this function
+
+		bots = frappe.get_all("Raven Bot Functions", filters={"function": self.name}, pluck="parent")
+
+		for bot in bots:
+			bot = frappe.get_doc("Raven Bot", bot)
+			bot.update_openai_assistant()
diff --git a/raven/raven_ai/doctype/raven_ai_function/test_raven_ai_function.py b/raven/raven_ai/doctype/raven_ai_function/test_raven_ai_function.py
new file mode 100644
index 000000000..badc11beb
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_ai_function/test_raven_ai_function.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, The Commit Company (Algocode Technologies Pvt. Ltd.) and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestRavenAIFunction(FrappeTestCase):
+	pass
diff --git a/raven/raven_ai/doctype/raven_ai_function_params/__init__.py b/raven/raven_ai/doctype/raven_ai_function_params/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/raven/raven_ai/doctype/raven_ai_function_params/raven_ai_function_params.json b/raven/raven_ai/doctype/raven_ai_function_params/raven_ai_function_params.json
new file mode 100644
index 000000000..9a0c7e659
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_ai_function_params/raven_ai_function_params.json
@@ -0,0 +1,89 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2024-09-27 19:33:46.149867",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "fieldname",
+  "child_table_name",
+  "required",
+  "do_not_ask_ai",
+  "default_value",
+  "options",
+  "column_break_zwir",
+  "type",
+  "description"
+ ],
+ "fields": [
+  {
+   "fieldname": "fieldname",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Fieldname",
+   "reqd": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "required",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Required"
+  },
+  {
+   "fieldname": "default_value",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Default Value",
+   "mandatory_depends_on": "eval: doc.do_not_ask_ai;"
+  },
+  {
+   "fieldname": "options",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Options"
+  },
+  {
+   "fieldname": "column_break_zwir",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Description",
+   "reqd": 1
+  },
+  {
+   "fieldname": "type",
+   "fieldtype": "Select",
+   "label": "Type",
+   "options": "string\ninteger\nnumber\nfloat\nboolean",
+   "reqd": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "do_not_ask_ai",
+   "fieldtype": "Check",
+   "label": "Do not ask AI to fill this variable"
+  },
+  {
+   "fieldname": "child_table_name",
+   "fieldtype": "Data",
+   "label": "Child Table Name"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-10-01 02:08:27.767802",
+ "modified_by": "Administrator",
+ "module": "Raven AI",
+ "name": "Raven AI Function Params",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/raven/raven_ai/doctype/raven_ai_function_params/raven_ai_function_params.py b/raven/raven_ai/doctype/raven_ai_function_params/raven_ai_function_params.py
new file mode 100644
index 000000000..42c8f6b6e
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_ai_function_params/raven_ai_function_params.py
@@ -0,0 +1,30 @@
+# Copyright (c) 2024, The Commit Company (Algocode Technologies Pvt. Ltd.) and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class RavenAIFunctionParams(Document):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		child_table_name: DF.Data | None
+		default_value: DF.Data | None
+		description: DF.SmallText
+		do_not_ask_ai: DF.Check
+		fieldname: DF.Data
+		options: DF.SmallText | None
+		parent: DF.Data
+		parentfield: DF.Data
+		parenttype: DF.Data
+		required: DF.Check
+		type: DF.Literal["string", "integer", "number", "float", "boolean"]
+	# end: auto-generated types
+
+	pass
diff --git a/raven/raven_ai/doctype/raven_bot_ai_prompt/__init__.py b/raven/raven_ai/doctype/raven_bot_ai_prompt/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/raven/raven_ai/doctype/raven_bot_ai_prompt/raven_bot_ai_prompt.js b/raven/raven_ai/doctype/raven_bot_ai_prompt/raven_bot_ai_prompt.js
new file mode 100644
index 000000000..e14098829
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_bot_ai_prompt/raven_bot_ai_prompt.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2024, The Commit Company (Algocode Technologies Pvt. Ltd.) and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("Raven Bot AI Prompt", {
+// 	refresh(frm) {
+
+// 	},
+// });
diff --git a/raven/raven_ai/doctype/raven_bot_ai_prompt/raven_bot_ai_prompt.json b/raven/raven_ai/doctype/raven_bot_ai_prompt/raven_bot_ai_prompt.json
new file mode 100644
index 000000000..8dd45e13a
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_bot_ai_prompt/raven_bot_ai_prompt.json
@@ -0,0 +1,73 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "naming_series:",
+ "beta": 1,
+ "creation": "2024-09-12 18:23:10.771302",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "prompt",
+  "naming_series",
+  "raven_bot",
+  "is_global"
+ ],
+ "fields": [
+  {
+   "fieldname": "prompt",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Prompt",
+   "reqd": 1
+  },
+  {
+   "description": "If added, this prompt will only be shown when interacting with the bot",
+   "fieldname": "raven_bot",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Raven Bot",
+   "options": "Raven Bot"
+  },
+  {
+   "default": "0",
+   "description": "If checked, this prompt will be available to all users on Raven",
+   "fieldname": "is_global",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Is Global"
+  },
+  {
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Naming Series",
+   "options": "PR-.#####."
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2024-09-30 00:07:21.256747",
+ "modified_by": "Administrator",
+ "module": "Raven AI",
+ "name": "Raven Bot AI Prompt",
+ "naming_rule": "By \"Naming Series\" field",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/raven/raven_ai/doctype/raven_bot_ai_prompt/raven_bot_ai_prompt.py b/raven/raven_ai/doctype/raven_bot_ai_prompt/raven_bot_ai_prompt.py
new file mode 100644
index 000000000..42c05da09
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_bot_ai_prompt/raven_bot_ai_prompt.py
@@ -0,0 +1,23 @@
+# Copyright (c) 2024, The Commit Company (Algocode Technologies Pvt. Ltd.) and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class RavenBotAIPrompt(Document):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		is_global: DF.Check
+		naming_series: DF.Literal["PR-.#####."]
+		prompt: DF.SmallText
+		raven_bot: DF.Link | None
+	# end: auto-generated types
+
+	pass
diff --git a/raven/raven_ai/doctype/raven_bot_ai_prompt/test_raven_bot_ai_prompt.py b/raven/raven_ai/doctype/raven_bot_ai_prompt/test_raven_bot_ai_prompt.py
new file mode 100644
index 000000000..c728120b9
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_bot_ai_prompt/test_raven_bot_ai_prompt.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, The Commit Company (Algocode Technologies Pvt. Ltd.) and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestRavenBotAIPrompt(FrappeTestCase):
+	pass
diff --git a/raven/raven_ai/doctype/raven_bot_functions/__init__.py b/raven/raven_ai/doctype/raven_bot_functions/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/raven/raven_ai/doctype/raven_bot_functions/raven_bot_functions.json b/raven/raven_ai/doctype/raven_bot_functions/raven_bot_functions.json
new file mode 100644
index 000000000..ce9761df3
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_bot_functions/raven_bot_functions.json
@@ -0,0 +1,61 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2024-09-27 16:34:18.404073",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "function",
+  "column_break_xuns",
+  "type",
+  "section_break_osgg",
+  "description"
+ ],
+ "fields": [
+  {
+   "fieldname": "function",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Function",
+   "options": "Raven AI Function",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break_xuns",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fetch_from": "function.type",
+   "fieldname": "type",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Type",
+   "read_only": 1
+  },
+  {
+   "fieldname": "section_break_osgg",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fetch_from": "function.description",
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Description",
+   "read_only": 1
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-09-27 16:36:48.777744",
+ "modified_by": "Administrator",
+ "module": "Raven AI",
+ "name": "Raven Bot Functions",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/raven/raven_ai/doctype/raven_bot_functions/raven_bot_functions.py b/raven/raven_ai/doctype/raven_bot_functions/raven_bot_functions.py
new file mode 100644
index 000000000..a704b35d9
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_bot_functions/raven_bot_functions.py
@@ -0,0 +1,25 @@
+# Copyright (c) 2024, The Commit Company (Algocode Technologies Pvt. Ltd.) and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class RavenBotFunctions(Document):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		description: DF.SmallText | None
+		function: DF.Link
+		parent: DF.Data
+		parentfield: DF.Data
+		parenttype: DF.Data
+		type: DF.Data | None
+	# end: auto-generated types
+
+	pass
diff --git a/raven/raven_ai/doctype/raven_bot_instruction_template/__init__.py b/raven/raven_ai/doctype/raven_bot_instruction_template/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/raven/raven_ai/doctype/raven_bot_instruction_template/raven_bot_instruction_template.js b/raven/raven_ai/doctype/raven_bot_instruction_template/raven_bot_instruction_template.js
new file mode 100644
index 000000000..7d87f88da
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_bot_instruction_template/raven_bot_instruction_template.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2024, The Commit Company (Algocode Technologies Pvt. Ltd.) and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("Raven Bot Instruction Template", {
+// 	refresh(frm) {
+
+// 	},
+// });
diff --git a/raven/raven_ai/doctype/raven_bot_instruction_template/raven_bot_instruction_template.json b/raven/raven_ai/doctype/raven_bot_instruction_template/raven_bot_instruction_template.json
new file mode 100644
index 000000000..6d4aba911
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_bot_instruction_template/raven_bot_instruction_template.json
@@ -0,0 +1,66 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:template_name",
+ "beta": 1,
+ "creation": "2024-09-12 18:21:02.235237",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "template_name",
+  "dynamic_instructions",
+  "instruction"
+ ],
+ "fields": [
+  {
+   "fieldname": "template_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Template Name",
+   "reqd": 1,
+   "unique": 1
+  },
+  {
+   "default": "0",
+   "description": "Dynamic Instructions allow you to embed Jinja tags in your instruction to the bot. Hence the instruction would be different based on the user who is calling the bot or the data in your system. These instructions are computed every time the bot is called. Check this if you want to embed things like Employee ID, Company Name etc in your instructions dynamically",
+   "fieldname": "dynamic_instructions",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Dynamic Instructions"
+  },
+  {
+   "description": "You can use Jinja variables here to customize the instruction to the bot at run time if dynamic instructions are enabled.",
+   "fieldname": "instruction",
+   "fieldtype": "Long Text",
+   "in_list_view": 1,
+   "label": "Instruction",
+   "reqd": 1
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2024-09-30 00:07:16.724949",
+ "modified_by": "Administrator",
+ "module": "Raven AI",
+ "name": "Raven Bot Instruction Template",
+ "naming_rule": "By fieldname",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/raven/raven_ai/doctype/raven_bot_instruction_template/raven_bot_instruction_template.py b/raven/raven_ai/doctype/raven_bot_instruction_template/raven_bot_instruction_template.py
new file mode 100644
index 000000000..42b04e98a
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_bot_instruction_template/raven_bot_instruction_template.py
@@ -0,0 +1,22 @@
+# Copyright (c) 2024, The Commit Company (Algocode Technologies Pvt. Ltd.) and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class RavenBotInstructionTemplate(Document):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		dynamic_instructions: DF.Check
+		instruction: DF.LongText
+		template_name: DF.Data
+	# end: auto-generated types
+
+	pass
diff --git a/raven/raven_ai/doctype/raven_bot_instruction_template/test_raven_bot_instruction_template.py b/raven/raven_ai/doctype/raven_bot_instruction_template/test_raven_bot_instruction_template.py
new file mode 100644
index 000000000..a3af026e5
--- /dev/null
+++ b/raven/raven_ai/doctype/raven_bot_instruction_template/test_raven_bot_instruction_template.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, The Commit Company (Algocode Technologies Pvt. Ltd.) and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestRavenBotInstructionTemplate(FrappeTestCase):
+	pass
diff --git a/raven/raven_bot/doctype/raven_bot/raven_bot.json b/raven/raven_bot/doctype/raven_bot/raven_bot.json
index 0788426fb..b6700dc50 100644
--- a/raven/raven_bot/doctype/raven_bot/raven_bot.json
+++ b/raven/raven_bot/doctype/raven_bot/raven_bot.json
@@ -2,6 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "autoname": "field:bot_name",
+ "beta": 1,
  "creation": "2024-03-29 20:25:13.529714",
  "default_view": "List",
  "doctype": "DocType",
@@ -14,7 +15,20 @@
   "column_break_lhoo",
   "description",
   "is_standard",
-  "module"
+  "module",
+  "ai_tab",
+  "is_ai_bot",
+  "debug_mode",
+  "ai_section",
+  "openai_assistant_id",
+  "enable_code_interpreter",
+  "column_break_khmi",
+  "allow_bot_to_write_documents",
+  "enable_file_search",
+  "section_break_lwkx",
+  "instruction",
+  "dynamic_instructions",
+  "bot_functions"
  ],
  "fields": [
   {
@@ -63,12 +77,94 @@
   {
    "fieldname": "column_break_lhoo",
    "fieldtype": "Column Break"
+  },
+  {
+   "depends_on": "eval: doc.is_ai_bot",
+   "fieldname": "ai_section",
+   "fieldtype": "Section Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_ai_bot",
+   "fieldtype": "Check",
+   "label": "Is AI Bot?"
+  },
+  {
+   "depends_on": "eval: doc.is_ai_bot",
+   "documentation_url": "https://platform.openai.com/docs/assistants/overview",
+   "fieldname": "openai_assistant_id",
+   "fieldtype": "Data",
+   "label": "OpenAI Assistant ID"
+  },
+  {
+   "fieldname": "column_break_khmi",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "allow_bot_to_write_documents",
+   "fieldtype": "Check",
+   "label": "Allow Bot to Write Documents"
+  },
+  {
+   "fieldname": "ai_tab",
+   "fieldtype": "Tab Break",
+   "label": "AI"
+  },
+  {
+   "fieldname": "section_break_lwkx",
+   "fieldtype": "Section Break"
+  },
+  {
+   "depends_on": "eval: doc.is_ai_bot;",
+   "description": "You can use Jinja variables here to customize the instruction to the bot at run time if dynamic instructions are enabled.",
+   "fieldname": "instruction",
+   "fieldtype": "Long Text",
+   "label": "Instruction"
+  },
+  {
+   "default": "0",
+   "description": "Enable this if you want the bot to be able to read PDF files and scan them.\n\nFile search enables the assistant with knowledge from files that you upload. Once a file is uploaded, the assistant automatically decides when to retrieve content based on user requests.",
+   "documentation_url": "https://platform.openai.com/docs/assistants/tools/file-search",
+   "fieldname": "enable_file_search",
+   "fieldtype": "Check",
+   "label": "Enable File Search"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval: doc.is_ai_bot;",
+   "description": "Dynamic Instructions allow you to embed Jinja tags in your instruction to the bot. Hence the instruction would be different based on the user who is calling the bot or the data in your system. These instructions are computed every time the bot is called. Check this if you want to embed things like Employee ID, Company Name etc in your instructions dynamically",
+   "fieldname": "dynamic_instructions",
+   "fieldtype": "Check",
+   "label": "Dynamic Instructions"
+  },
+  {
+   "depends_on": "eval: doc.is_ai_bot;",
+   "fieldname": "bot_functions",
+   "fieldtype": "Table",
+   "label": "Bot Functions",
+   "options": "Raven Bot Functions"
+  },
+  {
+   "default": "0",
+   "description": " Enable this if you want the bot to be able to process files like Excel sheets or data from Insights.\n                    <br>\n                    OpenAI Assistants run code in a sandboxed environment (on OpenAI servers) to do this.",
+   "documentation_url": "https://platform.openai.com/docs/assistants/tools/code-interpreter",
+   "fieldname": "enable_code_interpreter",
+   "fieldtype": "Check",
+   "label": "Enable Code Interpreter"
+  },
+  {
+   "default": "0",
+   "description": "If enabled, stack traces of errors will be sent as messages by the bot ",
+   "fieldname": "debug_mode",
+   "fieldtype": "Check",
+   "label": "Debug Mode"
   }
  ],
  "image_field": "image",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-03-29 23:16:44.406120",
+ "modified": "2024-10-02 23:01:52.263158",
  "modified_by": "Administrator",
  "module": "Raven Bot",
  "name": "Raven Bot",
diff --git a/raven/raven_bot/doctype/raven_bot/raven_bot.py b/raven/raven_bot/doctype/raven_bot/raven_bot.py
index 373c22b81..0bf65fb27 100644
--- a/raven/raven_bot/doctype/raven_bot/raven_bot.py
+++ b/raven/raven_bot/doctype/raven_bot/raven_bot.py
@@ -1,9 +1,13 @@
 # Copyright (c) 2024, The Commit Company and contributors
 # For license information, please see license.txt
 
+import json
+
 import frappe
+from frappe import _
 from frappe.model.document import Document
 
+from raven.ai.openai_client import get_open_ai_client
 from raven.utils import get_raven_user
 
 
@@ -16,14 +20,42 @@ class RavenBot(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
+		from raven.raven_ai.doctype.raven_bot_functions.raven_bot_functions import RavenBotFunctions
+
+		allow_bot_to_write_documents: DF.Check
+		bot_functions: DF.Table[RavenBotFunctions]
 		bot_name: DF.Data
+		debug_mode: DF.Check
 		description: DF.SmallText | None
+		dynamic_instructions: DF.Check
+		enable_code_interpreter: DF.Check
+		enable_file_search: DF.Check
 		image: DF.AttachImage | None
+		instruction: DF.LongText | None
+		is_ai_bot: DF.Check
 		is_standard: DF.Check
 		module: DF.Link | None
+		openai_assistant_id: DF.Data | None
 		raven_user: DF.Link | None
 	# end: auto-generated types
 
+	def validate(self):
+		if self.is_ai_bot and not self.instruction:
+			frappe.throw(_("Please provide an instruction for this AI Bot."))
+
+		self.validate_functions()
+
+	def validate_functions(self):
+		if not self.allow_bot_to_write_documents:
+			for f in self.bot_functions:
+				needs_write = frappe.db.get_value(
+					"Raven AI Function", f.function, "requires_write_permissions"
+				)
+				if needs_write:
+					frappe.throw(
+						f"This bot is not allowed to write documents. Please remove the function {f.function} or allow the bot to write documents."
+					)
+
 	def on_update(self):
 		"""
 		When a bot is updated, create/update the Raven User for it
@@ -51,6 +83,94 @@ def on_update(self):
 
 			self.db_set("raven_user", raven_user.name)
 
+		if self.is_ai_bot:
+			if not self.openai_assistant_id:
+				self.create_openai_assistant()
+			else:
+				self.update_openai_assistant()
+
+	def before_insert(self):
+		if self.is_ai_bot and not self.openai_assistant_id:
+			self.create_openai_assistant()
+
+	def on_trash(self):
+		if self.openai_assistant_id:
+			self.delete_openai_assistant()
+
+		if self.raven_user:
+			frappe.db.set_value("Raven User", self.raven_user, "bot", None)
+			self.db_set("raven_user", None)
+			frappe.delete_doc("Raven User", self.raven_user)
+
+	def create_openai_assistant(self):
+		# Create an OpenAI Assistant for the bot
+		client = get_open_ai_client()
+
+		assistant = client.beta.assistants.create(
+			instructions=self.instruction,
+			model="gpt-4o",
+			name=self.bot_name,
+			description=self.description or "",
+			tools=self.get_tools_for_assistant(),
+		)
+
+		self.db_set("openai_assistant_id", assistant.id)
+
+	def update_openai_assistant(self):
+		# Update the OpenAI Assistant for the bot
+
+		# Additional check because it is being used in Raven AI Function
+		if not self.is_ai_bot:
+			return
+
+		client = get_open_ai_client()
+
+		assistant = client.beta.assistants.update(
+			self.openai_assistant_id,
+			instructions=self.instruction,
+			name=self.bot_name,
+			description=self.description or "",
+			tools=self.get_tools_for_assistant(),
+			model="gpt-4o",
+		)
+
+	def get_tools_for_assistant(self):
+		# Add the function to the assistant
+		tools = []
+
+		if self.enable_file_search:
+			tools.append(
+				{
+					"type": "file_search",
+				}
+			)
+
+		if self.enable_code_interpreter:
+			tools.append(
+				{
+					"type": "code_interpreter",
+				}
+			)
+
+		for f in self.bot_functions:
+			function_def = frappe.db.get_value("Raven AI Function", f.function, "function_definition")
+			if function_def:
+				tools.append({"type": "function", "function": json.loads(function_def)})
+
+		return tools
+
+	def delete_openai_assistant(self):
+		# Delete the OpenAI Assistant for the bot
+		try:
+			client = get_open_ai_client()
+			client.beta.assistants.delete(self.openai_assistant_id)
+		except Exception:
+			frappe.log_error(
+				f"Error deleting OpenAI Assistant {self.openai_assistant_id} for bot {self.name}"
+			)
+
+	# Raven Bot Methods
+
 	def is_member(self, channel_id: str) -> None | str:
 		"""
 		Check if the bot is a member of the channel
@@ -116,7 +236,12 @@ def get_dm_channel_id(self, user_id: str) -> str | None:
 		return None
 
 	def send_message(
-		self, channel_id: str, text: str = None, link_doctype: str = None, link_document: str = None
+		self,
+		channel_id: str,
+		text: str = None,
+		link_doctype: str = None,
+		link_document: str = None,
+		markdown: bool = False,
 	) -> str:
 		"""
 		Send a text message to a channel
@@ -132,6 +257,9 @@ def send_message(
 
 		Returns the message ID of the message sent
 		"""
+
+		if markdown:
+			text = frappe.utils.md_to_html(text)
 		doc = frappe.get_doc(
 			{
 				"doctype": "Raven Message",
diff --git a/raven/raven_channel_management/doctype/raven_channel/raven_channel.json b/raven/raven_channel_management/doctype/raven_channel/raven_channel.json
index 55d3a665e..1b2b2f48d 100644
--- a/raven/raven_channel_management/doctype/raven_channel/raven_channel.json
+++ b/raven/raven_channel_management/doctype/raven_channel/raven_channel.json
@@ -24,7 +24,11 @@
   "section_break_wlnt",
   "last_message_timestamp",
   "column_break_eckt",
-  "last_message_details"
+  "last_message_details",
+  "ai_tab",
+  "is_ai_thread",
+  "openai_thread_id",
+  "thread_bot"
  ],
  "fields": [
   {
@@ -142,6 +146,32 @@
    "fieldtype": "Check",
    "label": "Is Thread",
    "read_only": 1
+  },
+  {
+   "fieldname": "ai_tab",
+   "fieldtype": "Tab Break",
+   "label": "AI"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_ai_thread",
+   "fieldtype": "Check",
+   "in_standard_filter": 1,
+   "label": "Is AI Thread",
+   "read_only": 1
+  },
+  {
+   "fieldname": "openai_thread_id",
+   "fieldtype": "Data",
+   "label": "OpenAI Thread ID",
+   "read_only": 1
+  },
+  {
+   "fieldname": "thread_bot",
+   "fieldtype": "Link",
+   "label": "Thread Bot",
+   "options": "Raven Bot",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
@@ -155,7 +185,7 @@
    "link_fieldname": "channel_id"
   }
  ],
- "modified": "2024-08-18 20:45:00.510115",
+ "modified": "2024-08-23 07:35:09.979962",
  "modified_by": "Administrator",
  "module": "Raven Channel Management",
  "name": "Raven Channel",
diff --git a/raven/raven_channel_management/doctype/raven_channel/raven_channel.py b/raven/raven_channel_management/doctype/raven_channel/raven_channel.py
index 99bef6715..e18ab3439 100644
--- a/raven/raven_channel_management/doctype/raven_channel/raven_channel.py
+++ b/raven/raven_channel_management/doctype/raven_channel/raven_channel.py
@@ -17,6 +17,7 @@ class RavenChannel(Document):
 
 		channel_description: DF.SmallText | None
 		channel_name: DF.Data
+		is_ai_thread: DF.Check
 		is_archived: DF.Check
 		is_direct_message: DF.Check
 		is_self_message: DF.Check
@@ -26,6 +27,8 @@ class RavenChannel(Document):
 		last_message_timestamp: DF.Datetime | None
 		linked_doctype: DF.Link | None
 		linked_document: DF.DynamicLink | None
+		openai_thread_id: DF.Data | None
+		thread_bot: DF.Link | None
 		type: DF.Literal["Private", "Public", "Open"]
 	# end: auto-generated types
 
@@ -50,6 +53,25 @@ def on_trash(self):
 		# Delete the pinned channels
 		frappe.db.delete("Raven Pinned Channels", {"channel_id": self.name})
 
+		# If the channel was a thread, (i.e. a message exists with the same name), remove the 'is_thread' flag from the message
+		if self.is_thread and frappe.db.exists("Raven Message", {"name": self.name}):
+			message_channel_id = frappe.get_cached_value("Raven Message", self.name, "channel_id")
+			frappe.db.set_value("Raven Message", self.name, "is_thread", 0)
+			# Update the message which used to be a thread
+			frappe.publish_realtime(
+				"message_edited",
+				{
+					"channel_id": message_channel_id,
+					"sender": frappe.session.user,
+					"message_id": self.name,
+					"message_details": {
+						"is_thread": 0,
+					},
+				},
+				doctype="Raven Channel",
+				docname=message_channel_id,
+			)
+
 	def after_insert(self):
 		"""
 		After inserting a channel, we need to check if it is a direct message channel or not.
diff --git a/raven/raven_messaging/doctype/raven_message/raven_message.py b/raven/raven_messaging/doctype/raven_message/raven_message.py
index 6c2676ba6..12b078ee3 100644
--- a/raven/raven_messaging/doctype/raven_message/raven_message.py
+++ b/raven/raven_messaging/doctype/raven_message/raven_message.py
@@ -10,6 +10,7 @@
 from frappe.utils import get_datetime, get_system_timezone
 from pytz import timezone, utc
 
+from raven.ai.ai import handle_ai_thread_message, handle_bot_dm
 from raven.notification import send_notification_to_topic, send_notification_to_user
 from raven.utils import track_channel_visit
 
@@ -61,7 +62,7 @@ def before_validate(self):
 		except Exception:
 			pass
 
-		if not self.is_new():
+		if not self.is_new() and not self.flags.is_ai_streaming:
 			# this is not a new message, so it's a previous message being edited
 			old_doc = self.get_doc_before_save()
 			if old_doc.text != self.text:
@@ -117,9 +118,79 @@ def before_insert(self):
 			}
 
 	def after_insert(self):
-		# TODO: Enqueue this
 		self.publish_unread_count_event()
 
+		if self.message_type == "Text":
+			self.handle_ai_message()
+
+	def handle_ai_message(self):
+
+		# If the message was sent by a bot, do not call the function
+		if self.is_bot_message:
+			return
+
+		# If AI Integration is not enabled, do not call the function
+		raven_settings = frappe.get_cached_doc("Raven Settings")
+		if not raven_settings.enable_ai_integration:
+			return
+
+		# Check if this channel is an AI Thread channel
+
+		channel_doc = frappe.get_cached_doc("Raven Channel", self.channel_id)
+
+		is_ai_thread = channel_doc.is_ai_thread
+
+		if is_ai_thread and channel_doc.openai_thread_id:
+			frappe.enqueue(
+				method=handle_ai_thread_message,
+				message=self,
+				timeout=600,
+				channel=channel_doc,
+				at_front=True,
+				job_name="handle_ai_thread_message",
+			)
+
+			return
+
+		# If not a part of a AI Thread, then check if this is a DM to a bot - if yes, then we should create a new thread
+
+		is_dm = channel_doc.is_direct_message
+
+		# Only DMs to bots need to be handled (for now)
+
+		if not is_dm:
+			return
+
+		# Get the bot user
+		peer_user = frappe.db.get_value(
+			"Raven Channel Member",
+			{"channel_id": self.channel_id, "user_id": ("!=", self.owner)},
+			"user_id",
+		)
+
+		if not peer_user:
+			return
+
+		# Get the bot user doc
+		peer_user_doc = frappe.get_cached_doc("Raven User", peer_user)
+
+		if peer_user_doc.type != "Bot" or not peer_user_doc.bot:
+			return
+
+		bot = frappe.get_cached_doc("Raven Bot", peer_user_doc.bot)
+
+		if not bot.is_ai_bot:
+			return
+
+		frappe.enqueue(
+			method=handle_bot_dm,
+			message=self,
+			bot=bot,
+			timeout=600,
+			job_name="handle_bot_dm",
+			at_front=True,
+		)
+
 	def publish_unread_count_event(self):
 		frappe.db.set_value(
 			"Raven Channel",
@@ -151,18 +222,21 @@ def publish_unread_count_event(self):
 					{"channel_id": self.channel_id, "user_id": ("!=", frappe.session.user)},
 					"user_id",
 				)
-				peer_user_id = frappe.get_cached_value("Raven User", peer_raven_user, "user")
 
-				frappe.publish_realtime(
-					"raven:unread_channel_count_updated",
-					{
-						"channel_id": self.channel_id,
-						"play_sound": True,
-						"sent_by": self.owner,
-					},
-					user=peer_user_id,
-					after_commit=True,
-				)
+				peer_user_doc = frappe.get_cached_doc("Raven User", peer_raven_user)
+
+				if peer_user_doc.type == "User":
+
+					frappe.publish_realtime(
+						"raven:unread_channel_count_updated",
+						{
+							"channel_id": self.channel_id,
+							"play_sound": True,
+							"sent_by": self.owner,
+						},
+						user=peer_user_doc.user,
+						after_commit=True,
+					)
 
 			# Need to send this to sender as well since they need to update the last message timestamp
 			frappe.publish_realtime(
@@ -275,12 +349,18 @@ def send_notification_for_direct_message(self):
 		if not peer_raven_user:
 			return
 
+		peer_raven_user_doc = frappe.get_cached_doc("Raven User", peer_raven_user)
+
+		# Do not send notification to a bot
+		if peer_raven_user_doc.type == "Bot":
+			return
+
 		message = self.get_notification_message_content()
 
 		owner_name = self.get_message_owner_name()
 
 		send_notification_to_user(
-			user_id=peer_raven_user,
+			user_id=peer_raven_user_doc.user,
 			user_image_id=self.owner,
 			title=owner_name,
 			message=message,
@@ -389,7 +469,7 @@ def on_update(self):
 		# TEMP: this is a temp fix for the Desk interface
 		self.publish_deprecated_event_for_desk()
 
-		if self.is_edited or self.is_thread:
+		if self.is_edited or self.is_thread or self.flags.editing_metadata:
 			frappe.publish_realtime(
 				"message_edited",
 				{
@@ -399,6 +479,7 @@ def on_update(self):
 					"message_details": {
 						"text": self.text,
 						"content": self.content,
+						"channel_id": self.channel_id,
 						"file": self.file,
 						"poll_id": self.poll_id,
 						"message_type": self.message_type,
@@ -429,7 +510,7 @@ def on_update(self):
 				if not self.file:
 					return
 
-			if self.message_type == "Poll":
+			if self.message_type == "Poll" or (self.link_doctype and self.link_document):
 				# If the message is a poll, then we need to wait for the poll to be created
 				after_commit = True
 
@@ -441,6 +522,7 @@ def on_update(self):
 					"message_id": self.name,
 					"message_details": {
 						"text": self.text,
+						"channel_id": self.channel_id,
 						"content": self.content,
 						"file": self.file,
 						"message_type": self.message_type,
@@ -475,10 +557,16 @@ def on_update(self):
 				after_commit=after_commit,
 			)
 			# track the visit of the user to the channel if a new message is created
-			frappe.enqueue(method=track_channel_visit, channel_id=self.channel_id, user=self.owner)
+			track_channel_visit(channel_id=self.channel_id, user=self.owner)
+			# frappe.enqueue(method=track_channel_visit, channel_id=self.channel_id, user=self.owner)
 
 			self.send_push_notification()
 
+			# If this is a new messagge (only applicable for files in on_update), then handle the AI message
+			if self.message_type == "File" or self.message_type == "Image":
+				if self.file:
+					self.handle_ai_message()
+
 	def on_trash(self):
 		# delete all the reactions for the message
 		frappe.db.delete("Raven Message Reaction", {"message": self.name})
diff --git a/yarn.lock b/yarn.lock
index 359e72f1f..7939f857a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -936,6 +936,13 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
+"@babel/runtime@^7.12.5":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.6.tgz#9afc3289f7184d8d7f98b099884c26317b9264d2"
+  integrity sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
 "@babel/template@^7.24.7", "@babel/template@^7.25.0":
   version "7.25.0"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a"
@@ -4990,6 +4997,13 @@ react-dropzone@^14.2.3:
     file-selector "^0.6.0"
     prop-types "^15.8.1"
 
+react-error-boundary@^4.0.13:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.0.13.tgz#80386b7b27b1131c5fbb7368b8c0d983354c7947"
+  integrity sha512-b6PwbdSv8XeOSYvjt8LpgpKrZ0yGdtZokYwkwV2wlcZbxgopHX/hgPl5VgpnoVOWd868n1hktM8Qm4b+02MiLQ==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+
 react-hook-form@^7.52.2:
   version "7.52.2"
   resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.52.2.tgz#ff40f4776250b86ddfcde6be68d34aa82b1c60fe"
@@ -5201,16 +5215,16 @@ reusify@^1.0.4:
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
 rollup@^2.43.1:
-  version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+  version "2.79.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.2.tgz#f150e4a5db4b121a21a747d762f701e5e9f49090"
+  integrity sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==
   optionalDependencies:
     fsevents "~2.3.2"
 
 rollup@^3.27.1:
-  version "3.29.4"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981"
-  integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==
+  version "3.29.5"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.5.tgz#8a2e477a758b520fb78daf04bca4c522c1da8a54"
+  integrity sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==
   optionalDependencies:
     fsevents "~2.3.2"