diff --git a/actions/gptscript.tsx b/actions/gptscript.tsx
index 9cffe7e2..607ed470 100644
--- a/actions/gptscript.tsx
+++ b/actions/gptscript.tsx
@@ -1,6 +1,6 @@
 "use server"
 
-import { Tool, Block } from '@gptscript-ai/gptscript';
+import { Tool, Block, Text } from '@gptscript-ai/gptscript';
 import { gpt } from '@/config/env';
 
 export const rootTool = async (toolContent: string): Promise<Tool> => {
@@ -16,6 +16,11 @@ export const parse = async (toolContent: string): Promise<Tool[]> => {
     return parsedTool.filter((block) => block.type === 'tool') as Tool[];
 }
 
+export const getTexts = async (toolContent: string): Promise<Text[]> => {
+    const parsedTool = await gpt().parseTool(toolContent);
+    return parsedTool.filter((block) => block.type === 'text');
+}
+
 export const stringify = async (script: Block[]): Promise<string> => {
     return gpt().stringify(script);
 }
\ No newline at end of file
diff --git a/app/explore/page.tsx b/app/explore/page.tsx
index 0346edc1..2023f766 100644
--- a/app/explore/page.tsx
+++ b/app/explore/page.tsx
@@ -77,8 +77,7 @@ export default function Explore() {
 
     return (
         <div className="w-full px-10 h-full overflow-y-scroll mx-auto pt-10">
-            <div>
-                <div className="flex space-x-4 mb-4">
+            <div className="flex w-full justify-end space-x-2 mb-6">
                     <Select radius="lg" label="Owners" color="primary" isDisabled={!owners.length} size="sm" aria-label="owners" selectionMode="multiple" className="w-1/6" variant="bordered" classNames={{label: 'text-gray-500 dark:text-gray-400', value:'text-black dark:text-white'}}
                         onSelectionChange={(keys) => { setFilteredOwners(keys as Set<string>)}}
                     >
@@ -96,7 +95,6 @@ export default function Explore() {
                     >
                         {tags.map((tag) => <SelectItem key={tag} value={tag}>{tag}</SelectItem>)}
                     </Select>
-                </div>
                 <Input 
                     startContent={<GoSearch />}
                     placeholder="Search for an agent..."
@@ -104,7 +102,7 @@ export default function Explore() {
                     variant="bordered"
                     isClearable
                     size="lg"
-                    className="w-full"
+                    className="w-1/5"
                     onChange={(e) => {
                         setQuery(e.target.value)
                         if (e.target.value === '') refresh()
@@ -116,7 +114,6 @@ export default function Explore() {
                     })}
                 />
             </div>
-            <Divider className="my-10"/>
             {loading ?
                 <Loading /> :
                 <div className={'pb-10'}>
diff --git a/app/page.tsx b/app/page.tsx
index ef768250..98e46c90 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -17,7 +17,7 @@ function RunFile() {
                 <div className="border-t-1 dark:border-zinc-800" style={{width: `100vw`, height: `calc(100vh - 50px)`}}>
                     <div className="w-full h-full flex pb-10">
                         <Threads />
-                        <div className="mx-auto w-[75%] 2xl:w-[60%] 3xl:[w-50%]">
+                        <div className="mx-auto w-[75%] 2xl:w-[55%] 3xl:[w-50%]">
                             <Script 
                                 enableThreads 
                                 className="pb-10"
diff --git a/components/edit/configure/code.tsx b/components/edit/configure/code.tsx
index bbb2a4b4..dd61e439 100644
--- a/components/edit/configure/code.tsx
+++ b/components/edit/configure/code.tsx
@@ -118,7 +118,7 @@ const Code = ({code, onChange, dependencies, onDependenciesChange}: CodeProps) =
                             <Editor
                                 height="35vh"
                                 language={LanguageSyntax[language]}
-                                theme={theme === "dark" ? "hc-black" : "vs-light"}
+                                theme={theme === "dark" ? "vs-dark" : "vs-light"}
                                 value={code}
                                 onChange={(code) => {onChange(code || '')}}
                                 options={{
@@ -153,7 +153,7 @@ const Code = ({code, onChange, dependencies, onDependenciesChange}: CodeProps) =
                                         height="100%"
                                         width="100%"
                                         language={LanguageSyntax[language]}
-                                        theme={theme === "dark" ? "hc-black" : "vs-light"}
+                                        theme={theme === "dark" ? "vs-dark" : "vs-light"}
                                         value={code}
                                         onChange={(code) => {onChange(code || '')}}
                                         options={{
@@ -191,7 +191,7 @@ const Code = ({code, onChange, dependencies, onDependenciesChange}: CodeProps) =
                                 <Editor
                                     height="35vh"
                                     language={LanguageDependencyFileSyntax[language]}
-                                    theme={theme === "dark" ? "hc-black" : "vs-light"}
+                                    theme={theme === "dark" ? "vs-dark" : "vs-light"}
                                     value={dependencies}
                                     onChange={(code) => {onDependenciesChange(code || '', languageDependencyFile(language))}}
                                     options={{
@@ -226,7 +226,7 @@ const Code = ({code, onChange, dependencies, onDependenciesChange}: CodeProps) =
                                             height="100%"
                                             width="100%"
                                             language={LanguageDependencyFileSyntax[language]}
-                                            theme={theme === "dark" ? "hc-black" : "vs-light"}
+                                            theme={theme === "dark" ? "vs-dark" : "vs-light"}
                                             value={code}
                                             onChange={(code) => {onChange(code || '')}}
                                             options={{
diff --git a/components/edit/configure/imports.tsx b/components/edit/configure/imports.tsx
index 56a64c50..348af5b6 100644
--- a/components/edit/configure/imports.tsx
+++ b/components/edit/configure/imports.tsx
@@ -27,11 +27,13 @@ const Imports: React.FC<ImportsProps> = ({tools, setTools, className, collapsed,
             setLocalTools(tools.filter((t) => !(
                 t.startsWith("https://")  ||
                 t.startsWith("http://")   ||
+                t.startsWith("sys.")      || // not local, but considered remote for the purposes of this component
                 t.startsWith("github.com")
             )));
             setRemoteTools(tools.filter((t) => 
                 t.startsWith("https://")  ||
                 t.startsWith("http://")   ||
+                t.startsWith("sys.")      || // not local, but considered remote for the purposes of this component
                 t.startsWith("github.com")
             ));
         }
@@ -75,7 +77,7 @@ const Imports: React.FC<ImportsProps> = ({tools, setTools, className, collapsed,
                             <div className="truncate w-full border-2 dark:border-zinc-700 text-sm pl-2 rounded-lg flex justify-between items-center">
                                 <div className="flex items-center space-x-2">
                                     {iconForTool(tool)}
-                                    <p className="capitalize">{tool.split("/").pop()?.replace(/-/g, " ")}</p>
+                                    <p className="capitalize">{tool.split("/").pop()?.replace(/-/g, " ").replace("sys.", "")}</p>
                                 </div>
                                 <Button
                                     variant="light"
diff --git a/components/edit/configure/imports/toolCatalog.tsx b/components/edit/configure/imports/toolCatalog.tsx
index e9ead2a3..d7bfd534 100644
--- a/components/edit/configure/imports/toolCatalog.tsx
+++ b/components/edit/configure/imports/toolCatalog.tsx
@@ -1,4 +1,4 @@
-import {useContext, useEffect, useState} from "react";
+import {useCallback, useContext, useEffect, useState} from "react";
 import {
     Button,
     Card,
@@ -13,6 +13,8 @@ import {AiOutlineKubernetes, AiOutlineSlack} from "react-icons/ai";
 import {PiMicrosoftOutlookLogoDuotone} from "react-icons/pi";
 import {RiNotionFill} from "react-icons/ri";
 import {FaGithub} from "react-icons/fa";
+import { Tool } from "@gptscript-ai/gptscript";
+import Loading from "@/components/loading";
 
 const priorityTools = [
     {
@@ -87,8 +89,15 @@ interface ToolCatalogProps {
 
 }
 
+interface ToolsSiteResponse {
+    tools: Record<string, Tool[]>;
+}
+
 const ToolCatalog: React.FC<ToolCatalogProps> = ({tools, addTool, removeTool}) => {
     const [url, setUrl] = useState("");
+    const [query, setQuery] = useState("");
+    const [searchResults, setSearchResults] = useState({} as ToolsSiteResponse);
+    const [loading, setLoading] = useState(false);
 
     useEffect(() => {
         if (!tools) return;
@@ -108,20 +117,53 @@ const ToolCatalog: React.FC<ToolCatalogProps> = ({tools, addTool, removeTool}) =
         })
     }, []);
 
+    const search = useCallback(() => {
+        if (!query) {
+            setSearchResults({} as ToolsSiteResponse);
+            return;
+        }
+        setLoading(true);
+        fetch('https://tools.gptscript.ai/api/search?q=' + query)
+            .then((res) => res.json())
+            .then((data) => {
+                setSearchResults(data);
+            })
+            .catch((error) => console.error(error))
+            .finally(() => setLoading(false));
+    }, [query]);
+
     return (
         <div>
             <div className="mt-24 mb-10 px-10 flex w-full justify-between items-center">
                 <h1 className="text-3xl font-bold text-primary lg:text-4xl">Tool catalog</h1>
                 <div className="flex space-x-4 justify-end items-center w-4/6">
                     <Input
+                        aria-label="Search on tools.gptscript.ai..."
                         startContent={<GoSearch />}
-                        placeholder="Search for tools..."
+                        placeholder="Search on tools.gptscript.ai..."
                         isClearable
                         color="primary"
                         variant="flat"
+                        value={query}
+                        onChange={(e) => {
+                            if (e.target.value === "") {
+                                setSearchResults({} as ToolsSiteResponse);
+                            } 
+                            setQuery(e.target.value)
+                        }}
+                        onClear={() => {
+                            setQuery("");
+                            setSearchResults({} as ToolsSiteResponse);
+                        }}
+                        onKeyDown={(e) => {
+                            if (e.key === "Enter") {
+                                search();
+                            }
+                        }}
                         className="w-2/6"
                     />
                     <Select 
+                        aria-label="Filter tools by type"
                         variant="flat"
                         color="primary"
                         placeholder="All"
@@ -138,83 +180,119 @@ const ToolCatalog: React.FC<ToolCatalogProps> = ({tools, addTool, removeTool}) =
                     </Select>
                 </div>
             </div>
-            <div className="px-10">
-                <Divider/>
-            </div>
-            
-            <div className="h-full w-full grid grid-cols-1 lg:grid-cols-2 2xl:grid-cols-3 3xl:grid-cols-4 gap-x-10 overflow-y-auto p-10">
-                <Card className="h-[275px] p-4">
-                        <GoLink className="text-7xl"/>
-                        <div className="bg-zinc-50 dark:bg-zinc-800 p-4 rounded-xl mt-4">
-                            <h2 className="text-xl mb-4 font-bold">Add by URL</h2>
-                            <p className="text-sm mb-2">Add a tool to the catalog by providing a URL.</p>
-                            <div className="flex space-x-2">
-                                <Input
-                                    size="sm"
-                                    placeholder="URL for tool..."
-                                    color="primary"
-                                    variant="flat"
-                                    value={url}
-                                    onChange={(e) => {
-                                        setUrl(e.target.value.replace("https://github.com", "github.com"))
-                                    }}
-                                />
-                                <Button
-                                    size="sm"
-                                    className="mb-2"
-                                    isIconOnly
-                                    radius="full"
-                                    variant="flat"
-                                    startContent={<GoPlus />}
-                                    color="primary"
-                                    onPress={() => {
-                                        addTool(url)
-                                        priorityTools.push({
-                                            name: url.split("/").pop()?.replace(/-/g, " ") || "Custom Tool",
-                                            description: "A custom tool you added.",
-                                            url: url,
-                                            tags: [url, "from-url"],
-                                            icon: <GoTools className="text-7xl"/>
-                                        })
-                                        setUrl("")
-                                    }}
-                                />
-                            </div>
-                        </div>
-                    </Card>
-                {priorityTools.map((tool) => (
-                    <Card key={tool.name} className="h-[275px] p-4">
-                        <div className="flex justify-between">
-                            {tool.icon}
-                            <Button
-                                size="md"
-                                className="mb-2"
-                                isIconOnly
-                                radius="full"
-                                variant="flat"
-                                startContent={tools?.includes(tool.url) ? <GoCheck /> : <GoPlus />}
-                                color={tools?.includes(tool.url) ? 'success' : 'primary'}
-                                onPress={() => {
-                                    if (tools?.includes(tool.url)) {
-                                        removeTool(tool.url);
-                                    } else {
-                                        addTool(tool.url)
-                                    }
-                                }}
-                            />
-                        </div>
-                        <div className="bg-zinc-50 dark:bg-zinc-800 p-4 rounded-xl mt-4 pb-8">
-                            <h2 className="text-xl mb-4 font-bold capitalize">{tool.name}</h2>
-                            <p className="truncate text-sm">{tool.description}</p>
-                            <div className="w-full overflow-x-auto flex space-x-2 mt-2">
-                                {tool.tags.map((tag) => (
-                                    <Chip key={tag} size="sm">{tag}</Chip>
-                                ))}
+
+            {searchResults && Object.keys(searchResults).length > 0 ? (
+                <div>
+                    <div className="h-full w-full grid grid-cols-1 lg:grid-cols-2 2xl:grid-cols-3 3xl:grid-cols-4 gap-10 overflow-y-auto p-10">
+                        {Object.keys(searchResults.tools).map((repo) => (
+                            <Card key={repo} className="h-[275px] p-4">
+                                <div className="flex justify-between">
+                                    <GoTools className="text-7xl"/>
+                                    <Button
+                                        size="md"
+                                        className="mb-2"
+                                        isIconOnly
+                                        radius="full"
+                                        variant="flat"
+                                        startContent={tools?.includes(repo) ? <GoCheck /> : <GoPlus />}
+                                        color={tools?.includes(repo) ? 'success' : 'primary'}
+                                        onPress={() => {
+                                            if (tools?.includes(repo)) {
+                                                removeTool(repo);
+                                            } else {
+                                                addTool(repo)
+                                            }
+                                        }}
+                                    />
+                                </div>
+                                <div className="bg-zinc-50 dark:bg-zinc-800 p-4 rounded-xl mt-4 pb-8 h-[200px]">
+                                    <h2 className="text-xl mb-4 font-bold capitalize">{repo.split("/").pop()?.replace(/-/g, " ").replace("sys.", "") || "Custom Tool"}</h2>
+                                    <p className="truncate text-sm">{searchResults.tools[repo][0]?.description || "No description provided."}</p>
+                                </div>
+                            </Card>
+                        ))}
+                    </div>
+                </div>
+            ) : loading ?
+                (
+                    <Loading />
+                ) :
+                (
+                    <div className="h-full w-full grid grid-cols-1 lg:grid-cols-2 2xl:grid-cols-3 3xl:grid-cols-4 gap-10 overflow-y-auto p-10">
+                        <Card className="h-[275px] p-4">
+                            <GoLink className="text-7xl"/>
+                            <div className="bg-zinc-50 dark:bg-zinc-800 p-4 rounded-xl mt-4">
+                                <h2 className="text-xl mb-4 font-bold">Add by URL</h2>
+                                <p className="text-sm mb-2">Add a tool to the catalog by providing a URL.</p>
+                                <div className="flex space-x-2">
+                                    <Input
+                                        size="sm"
+                                        placeholder="URL for tool..."
+                                        color="primary"
+                                        variant="flat"
+                                        value={url}
+                                        onChange={(e) => {
+                                            setUrl(e.target.value.replace("https://github.com", "github.com"))
+                                        }}
+                                    />
+                                    <Button
+                                        size="sm"
+                                        className="mb-2"
+                                        isIconOnly
+                                        radius="full"
+                                        variant="flat"
+                                        startContent={<GoPlus />}
+                                        color="primary"
+                                        onPress={() => {
+                                            addTool(url)
+                                            priorityTools.push({
+                                                name: url.split("/").pop()?.replace(/-/g, " ") || "Custom Tool",
+                                                description: "A custom tool you added.",
+                                                url: url,
+                                                tags: [url, "from-url"],
+                                                icon: <GoTools className="text-7xl"/>
+                                            })
+                                            setUrl("")
+                                        }}
+                                    />
+                                </div>
                             </div>
-                        </div>
-                    </Card>
-                ))}
-            </div>
+                        </Card>
+                        {priorityTools.map((tool) => (
+                            <Card key={tool.name} className="h-[275px] p-4">
+                                <div className="flex justify-between">
+                                    {tool.icon}
+                                    <Button
+                                        size="md"
+                                        className="mb-2"
+                                        isIconOnly
+                                        radius="full"
+                                        variant="flat"
+                                        startContent={tools?.includes(tool.url) ? <GoCheck /> : <GoPlus />}
+                                        color={tools?.includes(tool.url) ? 'success' : 'primary'}
+                                        onPress={() => {
+                                            if (tools?.includes(tool.url)) {
+                                                removeTool(tool.url);
+                                            } else {
+                                                addTool(tool.url)
+                                            }
+                                        }}
+                                    />
+                                </div>
+                                <div className="bg-zinc-50 dark:bg-zinc-800 p-4 rounded-xl mt-4 pb-8">
+                                    <h2 className="text-xl mb-4 font-bold capitalize">{tool.name}</h2>
+                                    <p className="truncate text-sm">{tool.description}</p>
+                                    <div className="w-full overflow-x-auto flex space-x-2 mt-2">
+                                        {tool.tags.map((tag) => (
+                                            <Chip key={tag} size="sm">{tag}</Chip>
+                                        ))}
+                                    </div>
+                                </div>
+                            </Card>
+                        ))}
+                    </div>
+                )
+            }
         </div>
     );
 };
diff --git a/components/edit/scriptNav.tsx b/components/edit/scriptNav.tsx
index dc81fd69..e4de37b8 100644
--- a/components/edit/scriptNav.tsx
+++ b/components/edit/scriptNav.tsx
@@ -2,9 +2,9 @@ import React, {useState, useEffect, useContext} from "react";
 import {fetchScripts} from "@/actions/scripts/fetch";
 import {Dropdown, DropdownTrigger, DropdownMenu, DropdownItem, DropdownSection, Button} from "@nextui-org/react";
 import {IoMenu} from "react-icons/io5";
-import {FaRegFileCode} from "react-icons/fa";
+import {FaCopy, FaRegFileCode} from "react-icons/fa";
 import {VscNewFile} from "react-icons/vsc";
-import {GoCode, GoPerson, GoSidebarCollapse, GoSidebarExpand} from "react-icons/go";
+import {GoCode, GoCopy, GoPerson, GoSidebarCollapse, GoSidebarExpand} from "react-icons/go";
 import {ParsedScript, getScripts} from "@/actions/me/scripts";
 import { EditContext } from "@/contexts/edit";
 import { PiExport } from "react-icons/pi";
@@ -62,10 +62,10 @@ const ScriptNav: React.FC<ScriptNavProps> = ({className, collapsed, setCollapsed
                 </DropdownItem>
                 <DropdownSection title="Actions" showDivider>
                     <DropdownItem startContent={<VscNewFile/>} key="new">
-                        New script
+                        New assistant
                     </DropdownItem>
-                    <DropdownItem startContent={<PiExport/>} key="export">
-                        Export to GPTScript
+                    <DropdownItem startContent={<FaCopy/>} key="export">
+                        Copy assistant to clipboard
                     </DropdownItem>
                 </DropdownSection>
                 <DropdownSection title="My Assistants">
diff --git a/components/script/messages.tsx b/components/script/messages.tsx
index 47bbe633..2fc6d95c 100644
--- a/components/script/messages.tsx
+++ b/components/script/messages.tsx
@@ -58,6 +58,7 @@ const Message = ({message, noAvatar, restart}: { message: Message, noAvatar?: bo
                                         base: `bg-white p-6 text-sm border dark:border-none dark:bg-zinc-900 ${
                                             message.error && "border-danger dark:border-danger"
                                         }`,
+                                        name: `text-lg text-default-600`
                                     }}
                                 />
                             </Tooltip>
diff --git a/contexts/edit.tsx b/contexts/edit.tsx
index 86084258..7b14a190 100644
--- a/contexts/edit.tsx
+++ b/contexts/edit.tsx
@@ -1,7 +1,7 @@
 import React, {createContext, useState, useEffect, useCallback, useRef} from 'react';
 import {Tool, Text, Block} from '@gptscript-ai/gptscript';
 import {getScript, updateScript} from '@/actions/me/scripts';
-import { parse, stringify} from '@/actions/gptscript';
+import { parse, stringify, getTexts } from '@/actions/gptscript';
 import { getModels } from '@/actions/models';
 
 const DEBOUNCE_TIME = 1000; // milliseconds
@@ -76,7 +76,7 @@ const EditContextProvider: React.FC<EditContextProps> = ({scriptPath, children})
         getScript(scriptPath)
             .then(async (script) => {
                 const parsedScript = await parse(script.content || '')
-                const texts = findTexts(parsedScript);
+                const texts = await getTexts(script.content || '');
                 setScript(parsedScript);
                 setRoot(findRoot(parsedScript));
                 setTexts(texts);
@@ -142,10 +142,6 @@ const EditContextProvider: React.FC<EditContextProps> = ({scriptPath, children})
         return withoutRoot.filter((block) => block.type === 'tool') as Tool[];
     }, [root])
 
-    const findTexts = (script: Block[]): Text[] => {
-        return script.filter((block) => block.type === 'text') as Text[];
-    }
-
     // note: The update function is debounced to prevent too many requests. The
     //       lodash debounce function was not used because it was causing issues.
     //       It is also worth noting that this deletes text tools.
@@ -208,7 +204,6 @@ const EditContextProvider: React.FC<EditContextProps> = ({scriptPath, children})
 
     const dependenciesToText = (dependencies: DependencyBlock[]): Text[] => {
         return dependencies
-            .filter((dep) => dep.content.trim() !== '') // Filter out empty dependencies
             .map((dep) => {
                 return {
                     id: `${dep.forTool}-${dep.type}`,