diff --git a/README.md b/README.md
index 0cf66fa..26f15d3 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,7 @@ To use Internet search you need a [Tavily API key](https://app.tavily.com/home).
 
 ## DONE
 
+- [x] DALL-E as tool
 - [x] Google Gemini API
 - [x] Prompt anywhere
 - [x] Cancel commands
diff --git a/css/panel.css b/css/panel.css
index 2eaf639..0c1e61f 100644
--- a/css/panel.css
+++ b/css/panel.css
@@ -4,7 +4,7 @@
   font-size: 10pt;
   padding-left: 32px;
   padding-right: 32px;
-  margin-bottom: 24px;
+  margin-bottom: 16px;
 }
 
 .settings form .group label {
diff --git a/css/themes/base.css b/css/themes/base.css
index b4f567d..84bf477 100644
--- a/css/themes/base.css
+++ b/css/themes/base.css
@@ -4,6 +4,10 @@
   margin-bottom: 32px;
 }
 
+.message .image-container {
+  margin-bottom: 12px;
+}
+
 .message .body, .message .actions {
   margin: 0px 32px; 
 }
@@ -108,4 +112,9 @@
 
 .message .image-container:hover .download {
   display: block;
-}
\ No newline at end of file
+}
+
+.message.assistant .actions {
+  position: relative;
+  top: -16px;
+}
diff --git a/css/themes/openai.css b/css/themes/openai.css
index 0dec406..b5183cd 100644
--- a/css/themes/openai.css
+++ b/css/themes/openai.css
@@ -43,13 +43,7 @@
   border-radius: 8px;
 }
 
-.messages.openai .message.text .actions {
+.messages.openai .message .actions {
   position: relative;
   top: -16px;
 }
-
-.messages.openai .message.image .actions {
-  position: relative;
-  top: -4px;
-}
-
diff --git a/defaults/settings.json b/defaults/settings.json
index ad3f44a..88ee697 100644
--- a/defaults/settings.json
+++ b/defaults/settings.json
@@ -11,7 +11,6 @@
   },
   "instructions": {
     "default": "You are a helpful assistant. You are here to help the user with any questions they have.",
-    "routing": "Your role is to determine if the following request is a text or an image generation request. You just reply TEXT or IMAGE.",
     "titling": "You are an assistant whose task is to find the best title for the conversation below. The title should be just a few words.",
     "titling_user": "Provide a title for the conversation above. Do not return anything other than the title. Do not wrap responses in quotes."
   },
@@ -106,6 +105,9 @@
   "plugins": {
     "browse": {},
     "python": {},
-    "tavily": {}
+    "tavily": {},
+    "dalle": {
+      "enabled": true
+    }
   }
 }
diff --git a/src/App.vue b/src/App.vue
index a5490fc..6075937 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -17,14 +17,12 @@ onMounted(() => {
   let platform = {
     'win32': 'windows',
     'darwin': 'macos',
-  }[window.api.platform]||''
+  }[window.api.platform]||'generic'
 
   // add it everywhere
-  if (platform) {
-    window.platform = platform
-    document.platform = platform
-    document.querySelector('body').classList.add(platform)
-  }
+  window.platform = platform
+  document.platform = platform
+  document.querySelector('body').classList.add(platform)
 
 })
 
diff --git a/src/components/MessageItem.vue b/src/components/MessageItem.vue
index 0dfe703..23c9ff8 100644
--- a/src/components/MessageItem.vue
+++ b/src/components/MessageItem.vue
@@ -9,18 +9,15 @@
 
       <!-- attachment -->
       <div v-if="message.attachment">
-        <Attachment :attachment="message.attachment" class="attachment" @image-click="onFullscreen" />
+        <Attachment :attachment="message.attachment" class="attachment" @image-click="onClickAttachment(message.attachment)" />
       </div>
 
-      <!-- image -->
-      <div v-if="message.type == 'image'" class="image-container">
-        <img :src="imageUrl" class="image" @click="onFullscreen(imageUrl)" @load="onImageLoaded(message)"/>
-        <BIconDownload class="download" @click="onDownload(message)" />
-      </div>
+      <!-- image for backwards compatibility -->
+      <MessageItemImage :image-url="imageUrl" @image-loaded="onImageLoaded(message)" v-if="message.type == 'image'" />
 
       <!-- text -->
-      <div v-if="message.type == 'text'">
-        <div v-if="message.content !== null" v-html="mdRender(message.content)" class="text"></div>
+      <div v-if="message.type == 'text' && message.content !== null">
+        <MessageItemBody :message="message" @image-loaded="onImageLoaded" />
       </div>
 
       <!-- transient information -->
@@ -30,24 +27,7 @@
       </div>
 
     </div>
-    <div class="actions" v-if="hovered">
-      <div class="action copy" v-if="message.role == 'assistant' && !message.transient" @click="onCopy(message)">
-        <BIconClipboard /> {{ copyLabel }}
-      </div>
-      <div class="action read" v-if="message.role == 'assistant' && message.type == 'text' && !message.transient" @click="onToggleRead(message)">
-        <span v-if="mgsAudioState(message) == 'playing'"><BIconStopCircle/> Stop</span>
-        <span v-else-if="mgsAudioState(message) == 'loading'"><BIconXCircle/> Cancel</span>
-        <span v-else><BIconPlayCircle /> Read</span>
-        <audio/>
-      </div>
-      <div class="action edit" v-if="message.role == 'user' && message.type == 'text' && !message.transient" @click="onEdit(message)">
-        <BIconPencil /> Edit
-      </div>
-    </div>
-    <div class="fullscreen" v-if="fullScreenImageUrl" @click="onCloseFullscreen">
-      <img :src="fullScreenImageUrl"/>
-      <BIconXLg class="close" />
-    </div>
+    <MessageItemActions :message="message" v-if="hovered" />
   </div>
 </template>
 
@@ -55,7 +35,9 @@
 
 import { ref, computed, onMounted, onUnmounted } from 'vue'
 import { store } from '../services/store'
-import useAudioPlayer from '../composables/audio'
+import MessageItemBody from './MessageItemBody.vue'
+import MessageItemImage from './MessageItemImage.vue'
+import MessageItemActions from './MessageItemActions.vue'
 import Chat from '../models/chat'
 import Message from '../models/message'
 import Loader from './Loader.vue'
@@ -73,12 +55,7 @@ const props = defineProps({
 const emits = defineEmits(['image-loaded'])
 
 const hovered = ref(false)
-const fullScreenImageUrl = ref(null)
 const copyLabel = ref('Copy')
-const audioState = ref({
-  state: 'idle',
-  messageId: null,
-})
 
 // onUpdated is not called for an unknown reason
 // so let's hack it
@@ -89,23 +66,18 @@ onMounted(() => {
       link.target = "_blank"
     })
   }, 599)
-  useAudioPlayer().addListener(onAudioPlayerStatus)
 })
 
 onUnmounted(() => {
   clearInterval(updateLinkInterval)
-  useAudioPlayer().removeListener(onAudioPlayerStatus)
 })
 
-const mgsAudioState = (message) => {
-  return message.uuid == audioState.value.messageId ? audioState.value.state : 'idle'
-}
-
 const authorName = computed(() => {
   return props.message.role === 'assistant' ? 'Assistant' : 'You'
 })
 
 const imageUrl = computed(() => {
+
   if (props.message.type !== 'image' || typeof props.message.content !== 'string') {
     return null
   } else if (props.message.content.startsWith('http')) {
@@ -116,6 +88,7 @@ const imageUrl = computed(() => {
   } else {
     return 'data:image/png;base64,' + props.message.content
   }
+
 })
 
 // using simple css :hover
@@ -125,57 +98,12 @@ const onHover = (value) => {
   hovered.value = value
 }
 
-const onImageLoaded = (message) => {
-  emits('image-loaded', message)
-}
-
-const onCopy = (message) => {
-  if (message.type == 'text') {
-    window.api.clipboard.writeText(message.content)
-  } else if (message.type == 'image') {
-    window.api.clipboard.writeImage(message.content)
-  }
-  copyLabel.value = 'Copied!'
-  setTimeout(() => copyLabel.value = 'Copy', 1000)
-}
-
-const onAudioPlayerStatus = (status) => {
-  audioState.value = { state: status.state, messageId: status.uuid }
-}
-
-const onToggleRead = async (message) => {
-  await useAudioPlayer().play(document.querySelector('.read audio'),message.uuid, message.content)
-}
-
-const onEdit = (message) => {
-  emitEvent('set-prompt', message)
-}
-
-const onFullscreen = (url) => {
-  fullScreenImageUrl.value = url
-  window.api.fullscreen(true)
+const onClickAttachment = (attachment) => {
+  emitEvent('fullScreen', attachment.url)
 }
 
-const onCloseFullscreen = () => {
-  fullScreenImageUrl.value = null
-  window.api.fullscreen(false)
-}
-
-const onDownload = (message) => {
-  window.api.file.download({
-    url: message.content,
-    properties: {
-      filename: 'image.png',
-    }
-  })
-}
-
-const mdRender = (content) => {
-  if (store.chatFilter) {
-    const regex = new RegExp(store.chatFilter, 'gi')
-    content = content.replace(regex, (match) => `==${match}==`);
-  }
-  return window.api.markdown.render(content)
+const onImageLoaded = (message) => {
+  emits('image-loaded', message)
 }
 
 </script>
@@ -195,59 +123,8 @@ const mdRender = (content) => {
 
 <style scoped>
 
-.message .body img {
-  cursor: pointer;
-}
-
-.fullscreen {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: black;
-  padding: 8px;
-  z-index: 100;
+img {
   cursor: pointer;
-  -webkit-app-region: no-drag;
-}
-
-.fullscreen img {
-  height: 100%;
-  width: 100%;
-  object-fit: contain;
-}
-
-.fullscreen .close {
-  color: white;
-  position: absolute;
-  top: 16px;
-  right: 16px;
-  font-size: 14pt;
-}
-
-.actions {
-
-  .action {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    margin-left: 8px;
-
-    &:first-child {
-      margin-left: 0px;
-    }
-
-    svg {
-      margin-right: 4px;
-    }
-
-    &.read svg {
-      position: relative;
-      top: 1.5px;
-    }
-  }
-
 }
 
 .transient {
diff --git a/src/components/MessageItemActions.vue b/src/components/MessageItemActions.vue
new file mode 100644
index 0000000..882cac3
--- /dev/null
+++ b/src/components/MessageItemActions.vue
@@ -0,0 +1,99 @@
+<template>
+  <div class="actions">
+    <div class="action copy" v-if="message.role == 'assistant' && !message.transient" @click="onCopy(message)">
+      <BIconClipboard /> {{ copyLabel }}
+    </div>
+    <div class="action read" v-if="message.role == 'assistant' && message.type == 'text' && !message.transient" @click="onToggleRead(message)">
+      <span v-if="mgsAudioState(message) == 'playing'"><BIconStopCircle/> Stop</span>
+      <span v-else-if="mgsAudioState(message) == 'loading'"><BIconXCircle/> Cancel</span>
+      <span v-else><BIconPlayCircle /> Read</span>
+      <audio/>
+    </div>
+    <div class="action edit" v-if="message.role == 'user' && message.type == 'text' && !message.transient" @click="onEdit(message)">
+      <BIconPencil /> Edit
+    </div>
+  </div>
+</template>
+
+<script setup>
+
+import { ref, onMounted, onUnmounted } from 'vue'
+import useAudioPlayer from '../composables/audio'
+import Message from '../models/message'
+
+import useEventBus from '../composables/useEventBus'
+const { emitEvent } = useEventBus()
+
+const props = defineProps({
+  message: Message
+})
+
+const copyLabel = ref('Copy')
+const audioState = ref({
+  state: 'idle',
+  messageId: null,
+})
+
+onMounted(() => {
+  useAudioPlayer().addListener(onAudioPlayerStatus)
+})
+
+onUnmounted(() => {
+  useAudioPlayer().removeListener(onAudioPlayerStatus)
+})
+
+const mgsAudioState = (message) => {
+  return message.uuid == audioState.value.messageId ? audioState.value.state : 'idle'
+}
+
+const onCopy = (message) => {
+  if (message.type == 'text') {
+    window.api.clipboard.writeText(message.content)
+  } else if (message.type == 'image') {
+    window.api.clipboard.writeImage(message.content)
+  }
+  copyLabel.value = 'Copied!'
+  setTimeout(() => copyLabel.value = 'Copy', 1000)
+}
+
+const onAudioPlayerStatus = (status) => {
+  audioState.value = { state: status.state, messageId: status.uuid }
+}
+
+const onToggleRead = async (message) => {
+  await useAudioPlayer().play(document.querySelector('.read audio'),message.uuid, message.content)
+}
+
+const onEdit = (message) => {
+  emitEvent('set-prompt', message)
+}
+
+</script>
+
+<style scoped>
+
+.actions {
+
+  .action {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-left: 8px;
+
+    &:first-child {
+      margin-left: 0px;
+    }
+
+    svg {
+      margin-right: 4px;
+    }
+
+    &.read svg {
+      position: relative;
+      top: 1.5px;
+    }
+  }
+
+}
+
+</style>
\ No newline at end of file
diff --git a/src/components/MessageItemBody.vue b/src/components/MessageItemBody.vue
new file mode 100644
index 0000000..76ad865
--- /dev/null
+++ b/src/components/MessageItemBody.vue
@@ -0,0 +1,82 @@
+<template>
+  <div v-if="message.type == 'text'">
+    <div v-for="block in blocks">
+      <div v-if="block.type == 'text'" v-html="mdRender(block.content)" class="text"></div>
+      <MessageItemImage :image-url="block.content" @image-loaded="onImageLoaded(message)" v-else-if="block.type == 'image'" />
+    </div>
+  </div>
+</template>
+
+<script setup>
+
+import { computed } from 'vue'
+import { store } from '../services/store'
+import MessageItemImage from './MessageItemImage.vue'
+import Message from '../models/message'
+
+const props = defineProps({
+  message: Message
+})
+
+const blocks = computed(() => {
+
+  // extract each <img> in a separate block
+  let match
+  let lastIndex = 0
+  const blocks = []
+  const regex = /!\[([^\]]*)\]\(([^\)]*)\)/g
+  while (match = regex.exec(props.message.content)) {
+
+    // 1st add test until here
+    if (match.index > lastIndex) {
+      blocks.push({ type: 'text', content: props.message.content.substring(lastIndex, match.index) })
+    }
+
+    // now image
+    let imageUrl = decodeURIComponent(match[2])
+    if (!imageUrl.startsWith('http') && !imageUrl.startsWith('file://')) {
+      imageUrl = `file://${imageUrl}`
+    }
+    blocks.push({ type: 'image', content: imageUrl })
+
+    // continue
+    lastIndex = regex.lastIndex
+  }
+
+  // add last block
+  blocks.push({ type: 'text', content: props.message.content.substring(lastIndex) })
+
+  // done
+  return blocks
+
+})
+
+const emits = defineEmits(['image-loaded'])
+
+const onImageLoaded = (message) => {
+  emits('image-loaded', message)
+}
+
+const mdRender = (content) => {
+
+  // highlight code
+  if (store.chatFilter) {
+    const regex = new RegExp(store.chatFilter, 'gi')
+    content = content.replace(regex, (match) => `==${match}==`);
+  }
+
+  // do it
+  return window.api.markdown.render(content)
+}
+
+</script>
+
+<style>
+.message .body .katex-html {
+  display: none;
+}
+</style>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/MessageItemImage.vue b/src/components/MessageItemImage.vue
new file mode 100644
index 0000000..e7ad1a4
--- /dev/null
+++ b/src/components/MessageItemImage.vue
@@ -0,0 +1,47 @@
+<template>
+  <div class="image-container">
+    <img :src="imageUrl" class="image" @click="onFullscreen(imageUrl)" @load="onImageLoaded()"/>
+    <BIconDownload class="download" @click="onDownload()" />
+  </div>
+</template>
+
+<script setup>
+
+import { ref, computed } from 'vue'
+
+import useEventBus from '../composables/useEventBus'
+const { emitEvent } = useEventBus()
+
+const props = defineProps({
+  imageUrl: String,
+})
+
+const emits = defineEmits(['image-loaded'])
+
+const onImageLoaded = () => {
+  emits('image-loaded')
+}
+
+const onFullscreen = (url) => {
+  emitEvent('fullScreen', url)
+}
+
+const onDownload = () => {
+  console.log('download', props.imageUrl)
+  window.api.file.download({
+    url: props.imageUrl,
+    properties: {
+      filename: 'image.png',
+    }
+  })
+}
+
+</script>
+
+<style scoped>
+
+img {
+  cursor: pointer;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/components/MessageList.vue b/src/components/MessageList.vue
index 740bc3a..af10ed5 100644
--- a/src/components/MessageList.vue
+++ b/src/components/MessageList.vue
@@ -9,6 +9,10 @@
       <BIconArrowDown />
     </div>
   </div>
+  <div class="fullscreen" v-if="fullScreenImageUrl" @click="onCloseFullScreen">
+    <img :src="fullScreenImageUrl"/>
+    <BIconXLg class="close" />
+  </div>
 </template>
 
 <script setup>
@@ -23,6 +27,7 @@ const { onEvent } = useEventBus()
 
 const divScroller = ref(null)
 const overflown = ref(false)
+const fullScreenImageUrl = ref(null)
 
 const chatTheme = computed(() => store.config.appearance.chat.theme)
 
@@ -32,9 +37,20 @@ defineProps({
 
 onMounted(() => {
   onEvent('newChunk', onNewChunk)
+  onEvent('fullScreen', onFullscreen)
   scrollDown()
 })
 
+const onFullscreen = (imageUrl) => {
+  fullScreenImageUrl.value = imageUrl
+  window.api.fullscreen(true)
+}
+
+const onCloseFullScreen = () => {
+  fullScreenImageUrl.value = null
+  window.api.fullscreen(false)
+}
+
 const onImageLoaded = (message) => {
   if (!overflown.value) {
     scrollDown()
@@ -104,4 +120,31 @@ const onScroll = () => {
   cursor: pointer;
 }
 
+.fullscreen {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: black;
+  padding: 8px;
+  z-index: 100;
+  cursor: pointer;
+  -webkit-app-region: no-drag;
+}
+
+.fullscreen img {
+  height: 100%;
+  width: 100%;
+  object-fit: contain;
+}
+
+.fullscreen .close {
+  color: white;
+  position: absolute;
+  top: 16px;
+  right: 16px;
+  font-size: 14pt;
+}
+
 </style>
diff --git a/src/models/message.ts b/src/models/message.ts
index f7b04d2..509755c 100644
--- a/src/models/message.ts
+++ b/src/models/message.ts
@@ -9,7 +9,7 @@ export default class implements Message {
   uuid: string
   createdAt: number
   role: LlmRole
-  type: string
+  type: string // backwards compatibility: everything is text now
   content: string
   attachment: Attachment
   transient: boolean
diff --git a/src/plugins/dalle.ts b/src/plugins/dalle.ts
new file mode 100644
index 0000000..603e712
--- /dev/null
+++ b/src/plugins/dalle.ts
@@ -0,0 +1,96 @@
+
+import { anyDict } from '../types/index.d'
+import { PluginConfig, PluginParameter } from '../types/plugin.d'
+import { store } from '../services/store'
+import { saveFileContents } from '../services/download'
+import Plugin from './plugin'
+import OpenAI from 'openai'
+
+export default class extends Plugin {
+
+  constructor(config: PluginConfig) {
+    super(config)
+  }
+
+  isEnabled(): boolean {
+    return store.config.engines.openai.apiKey != null
+  }
+
+  getName(): string {
+    return 'dalle_image_generation'
+  }
+
+  getDescription(): string {
+    return 'Generate an image based on a prompt. Returns the path of the image saved on disk.'
+  }
+
+  getPreparationDescription(): string {
+    return this.getRunningDescription()
+  }
+      
+  getRunningDescription(): string {
+    return 'Painting pixels…'
+  }
+
+  getParameters(): PluginParameter[] {
+    return [
+      {
+        name: 'prompt',
+        type: 'string',
+        description: 'The description of the image',
+        required: true
+      },
+      // {
+      //   name: 'size',
+      //   type: 'string',
+      //   description: 'The size of the image',
+      //   required: false
+      // },
+      // {
+      //   name: 'style',
+      //   type: 'string',
+      //   description: 'The style of the image',
+      //   required: false
+      // },
+      // {
+      //   name: 'n',
+      //   type: 'number',
+      //   description: 'Number of images to generate',
+      //   required: false
+      // },
+    ]
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async execute(parameters: anyDict): Promise<anyDict> {
+
+    // init
+    const client = new OpenAI({
+      apiKey: store.config.engines.openai.apiKey,
+      dangerouslyAllowBrowser: true
+    })
+
+    // call
+    const model = store.config.engines.openai.model.image
+    console.log(`[openai] prompting model ${model}`)
+    const response = await client.images.generate({
+      model: model,
+      prompt: parameters?.prompt,
+      response_format: 'b64_json',
+      size: parameters?.size,
+      style: parameters?.style,
+      n: parameters?.n || 1,
+    })
+
+    // save the content on disk
+    const filename = saveFileContents('png', response.data[0].b64_json)
+
+
+    // return an object
+    return {
+      path: `file://${filename}`
+    }
+
+  }  
+
+}
diff --git a/src/plugins/plugins.ts b/src/plugins/plugins.ts
index 875a71e..c691d61 100644
--- a/src/plugins/plugins.ts
+++ b/src/plugins/plugins.ts
@@ -3,9 +3,11 @@ import { anyDict } from '../types/index.d'
 import BrowsePlugin from '../plugins/browse'
 import TavilyPlugin from '../plugins/tavily'
 import PythonPlugin from '../plugins/python'
+import DallePlugin from '../plugins/dalle'
 
 export const availablePlugins: anyDict = {
   browse: BrowsePlugin, 
+  dalle: DallePlugin,
   python:  PythonPlugin,
   tavily: TavilyPlugin,
 }
diff --git a/src/screens/Main.vue b/src/screens/Main.vue
index 5ce3c22..dc994fd 100644
--- a/src/screens/Main.vue
+++ b/src/screens/Main.vue
@@ -64,7 +64,6 @@ onMounted(() => {
       assistant.value.prompt(prompt.value, {
         engine: engine.value,
         model: model.value,
-        route: false,
         save: false,
       }, (chunk) => {
       emitEvent('newChunk', chunk)
diff --git a/src/services/anthropic.ts b/src/services/anthropic.ts
index 41630f2..7a5e86a 100644
--- a/src/services/anthropic.ts
+++ b/src/services/anthropic.ts
@@ -29,10 +29,6 @@ export default class extends LlmEngine {
     return ['*']
   }
 
-  getRountingModel(): string|null {
-    return null
-  }
-
   async getModels(): Promise<any[]> {
 
     // need an api key
diff --git a/src/services/assistant.ts b/src/services/assistant.ts
index 2d4b5f2..6aca2a5 100644
--- a/src/services/assistant.ts
+++ b/src/services/assistant.ts
@@ -7,7 +7,6 @@ import Message from '../models/message'
 import LlmEngine from './engine'
 import { store } from './store'
 import { igniteEngine } from './llm'
-import { download, saveFileContents } from './download'
 import { countryCodeToName } from './i18n'
 
 export default class {
@@ -51,32 +50,6 @@ export default class {
     return this.llm !== null
   }
 
-  async route(prompt: string) {
-    
-    try {
-    
-      // check if routing possibble
-      const routingModel = this.llm.getRountingModel()
-      if (routingModel === null) {
-        return null
-      }
-      
-      // build messages
-      const messages = [
-        new Message('system', this.config.instructions.routing),
-        new Message('user', prompt)
-      ]
-
-      // now get it
-      const route = await this.llm.complete(messages, { model: routingModel })
-      return route.content
-
-    } catch (error) {
-      console.error('Error while trying to route query', error)
-      return null
-    }
-
-  }
 
   async prompt(prompt: string, opts: LlmCompletionOpts, callback: (chunk: LlmChunk) => void): Promise<void> {
 
@@ -128,16 +101,8 @@ export default class {
     this.chat.lastMessage().setText(null)
     callback?.call(null, null)
 
-    // route
-    let route = null
-    if (opts.route == null || opts.route !== false) {
-      route = await this.route(prompt)
-    }
-    if (route === 'IMAGE') {
-      await this.generateImage(prompt, opts, callback)
-    } else {
-      await this.generateText(opts, callback)
-    }
+    // generate text
+    await this.generateText(opts, callback)
 
     // check if we need to update title
     if (this.chat.messages.filter((msg) => msg.role === 'assistant').length === 1) {
@@ -197,46 +162,6 @@ export default class {
   
   }
 
-  async generateImage(prompt: string, opts: LlmCompletionOpts, callback: (chunk: LlmChunk) => void): Promise<void> {
-
-    // we need this to be const during generation
-    const llm = this.llm
-    const message = this.chat.lastMessage()
-
-    // inform
-    message.setToolCall('Painting pixels…')    
-
-    try {
-
-      // generate 
-      const response = await llm.image(prompt, opts)
-
-      // we need to download/write it locally
-      let filename = null
-      if (response.url) {
-        filename = download(response.url)
-      } else if (response.content) {
-        filename = saveFileContents('png', response.content)
-      }
-      if (!filename) {
-        throw new Error('Could not save image')
-      }
-
-      // save
-      message.setImage(`file://${filename}`)
-      callback?.call(null, {
-        text: filename,
-        done: true
-      })
-
-    } catch (error) {
-      console.error(error)
-      message.setText('Sorry, I could not generate an image for that prompt.')
-      callback?.call(null, null)
-    }
-
-  }
-
   async stop() {
     if (this.stream) {
       await this.llm?.stop(this.stream)
diff --git a/src/services/engine.ts b/src/services/engine.ts
index bf0a2d3..ee0f729 100644
--- a/src/services/engine.ts
+++ b/src/services/engine.ts
@@ -30,10 +30,6 @@ export default class LlmEngine {
     throw new Error('Not implemented')
   }
   
-  getRountingModel(): string|null {
-    throw new Error('Not implemented')
-  }
-
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   async complete(thread: Message[], opts: LlmCompletionOpts): Promise<LlmResponse> {
     throw new Error('Not implemented')
diff --git a/src/services/google.ts b/src/services/google.ts
index 4e226cb..9bd35ab 100644
--- a/src/services/google.ts
+++ b/src/services/google.ts
@@ -31,10 +31,6 @@ export default class extends LlmEngine {
     return ['gemini-1.5-flash-latest', 'models/gemini-1.5-pro-latest', 'models/gemini-pro-vision', '*vision*']
   }
 
-  getRountingModel(): string | null {
-    return null
-  }
-
   async getModels(): Promise<any[]> {
 
     // need an api key
diff --git a/src/services/groq.ts b/src/services/groq.ts
index 5e0ad8f..97b2efb 100644
--- a/src/services/groq.ts
+++ b/src/services/groq.ts
@@ -31,10 +31,6 @@ export default class extends LlmEngine {
     return []
   }
 
-  getRountingModel(): string|null {
-    return null
-  }
-
   async getModels(): Promise<any[]> {
 
     // need an api key
diff --git a/src/services/mistralai.ts b/src/services/mistralai.ts
index deab784..5b7eb72 100644
--- a/src/services/mistralai.ts
+++ b/src/services/mistralai.ts
@@ -32,10 +32,6 @@ export default class extends LlmEngine {
     return []
   }
 
-  getRountingModel(): string|null {
-    return null
-  }
-
   async getModels(): Promise<any[]> {
 
     // need an api key
diff --git a/src/services/ollama.ts b/src/services/ollama.ts
index c66748f..5418c3c 100644
--- a/src/services/ollama.ts
+++ b/src/services/ollama.ts
@@ -35,10 +35,6 @@ export default class extends LlmEngine {
     return ['llava-llama3:latest', 'llava:latest', '*llava*']
   }
 
-  getRountingModel(): string|null {
-    return null
-  }
-
   async getModels(): Promise<any[]> {
     try {
       const response = await this.client.list()
diff --git a/src/services/openai.ts b/src/services/openai.ts
index a24ae9f..e38c521 100644
--- a/src/services/openai.ts
+++ b/src/services/openai.ts
@@ -36,10 +36,6 @@ export default class extends LlmEngine {
     return [/*'*4o*', */ 'gpt-4-turbo', 'gpt-4-vision', '*vision*']
   }
 
-  getRountingModel(): string | null {
-    return 'gpt-3.5-turbo'
-  }
-
   async getModels(): Promise<any[]> {
 
     // need an api key
@@ -156,7 +152,7 @@ export default class extends LlmEngine {
     // now tool calling
     if (chunk.choices[0]?.finish_reason === 'tool_calls') {
 
-      // add tools
+      // iterate on tools
       for (const toolCall of this.toolCalls) {
 
         // first notify
@@ -167,8 +163,9 @@ export default class extends LlmEngine {
 
         // now execute
         const args = JSON.parse(toolCall.args)
+        console.log(`[openai] tool call ${toolCall.function} with ${JSON.stringify(args)}`)
         const content = await this.callTool(toolCall.function, args)
-        console.log(`[openai] tool call ${toolCall.function} with ${JSON.stringify(args)} => ${JSON.stringify(content).substring(0, 128)}`)
+        console.log(`[openai] tool call ${toolCall.function} => ${JSON.stringify(content).substring(0, 128)}`)
 
         // add tool call message
         this.currentThread.push({
diff --git a/src/settings/SettingsDall-E.vue b/src/settings/SettingsDall-E.vue
new file mode 100644
index 0000000..15b7ba8
--- /dev/null
+++ b/src/settings/SettingsDall-E.vue
@@ -0,0 +1,82 @@
+<template>
+  <div>
+    <div class="description">
+      This plugin allows LLM engines to create images using OpenAI DALL-E models. You need to have entered your OpenAI API key in the Models tab.
+    </div>
+    <div class="group">
+      <label>Enabled</label>
+      <input type="checkbox" v-model="enabled" @change="save" />
+    </div>
+    <div class="group">
+      <label>Image model</label>
+      <select v-model="image_model" :disabled="image_models.length == 0" @change="save">
+        <option v-for="model in image_models" :key="model.id" :value="model.id">{{ model.name }}
+        </option>
+      </select>
+      <button @click.prevent="onRefresh">{{ refreshLabel }}</button>
+    </div>
+  </div>  
+</template>
+
+<script setup>
+
+import { ref } from 'vue'
+import { store } from '../services/store'
+import { loadOpenAIModels } from '../services/llm'
+import InputObfuscated from '../components/InputObfuscated.vue'
+
+const enabled = ref(false)
+const refreshLabel = ref('Refresh')
+const image_model = ref(null)
+const image_models = ref([])
+
+const load = () => {
+  enabled.value = store.config.plugins.dalle.enabled || false
+  image_models.value = store.config.engines.openai?.models?.image || []
+  image_model.value = store.config.engines.openai?.model?.image || ''
+}
+
+const onRefresh = async () => {
+  refreshLabel.value = 'Refreshing…'
+  setTimeout(() => getModels(), 500)
+}
+
+const setEphemeralRefreshLabel = (text) => {
+  refreshLabel.value = text
+  setTimeout(() => refreshLabel.value = 'Refresh', 2000)
+}
+
+const getModels = async () => {
+
+  // load
+  let success = await loadOpenAIModels()
+  if (!success) {
+    image_models.value = []
+    setEphemeralRefreshLabel('Error!')
+    return
+  }
+
+  // reload
+  load()
+
+  // done
+  setEphemeralRefreshLabel('Done!')
+
+}
+
+const save = () => {
+  store.config.plugins.dalle.enabled = enabled.value
+  store.config.engines.openai.model.image = image_model.value
+  store.saveSettings()
+}
+
+defineExpose({ load })
+
+</script>
+
+<style scoped>
+@import '../../css/dialog.css';
+@import '../../css/tabs.css';
+@import '../../css/form.css';
+@import '../../css/panel.css';
+</style>
diff --git a/src/settings/SettingsOpenAI.vue b/src/settings/SettingsOpenAI.vue
index ad684af..44a10a7 100644
--- a/src/settings/SettingsOpenAI.vue
+++ b/src/settings/SettingsOpenAI.vue
@@ -9,28 +9,19 @@
     </div>
     <div class="group">
       <label>Chat model</label>
-      <select v-model="chat_model" :disabled="chat_models.length == 0" @change="save">
-        <option v-for="model in chat_models" :key="model.id" :value="model.id">{{ model.name }}
-        </option>
-      </select>
-      <button @click.prevent="onRefresh">{{ refreshLabel }}</button>
-    </div>
-    <div class="group">
-      <label>Image model</label>
       <div class="subgroup">
-        <select v-model="image_model" :disabled="image_models.length == 0" @change="save">
-          <option v-for="model in image_models" :key="model.id" :value="model.id">{{ model.name }}
+        <select v-model="chat_model" :disabled="chat_models.length == 0" @change="save">
+          <option v-for="model in chat_models" :key="model.id" :value="model.id">{{ model.name }}
           </option>
-        </select><br />
+        </select>
         <a href="https://platform.openai.com/docs/models/continuous-model-upgrades" target="_blank">More about OpenAI models</a>
         <a href="https://openai.com/pricing" target="_blank">OpenAI pricing</a>
       </div>
-      <button style="visibility: hidden">{{ refreshLabel }}</button>
+      <button @click.prevent="onRefresh">{{ refreshLabel }}</button>
     </div>
   </div>  
 </template>
 
-
 <script setup>
 
 import { ref } from 'vue'
@@ -41,16 +32,12 @@ import InputObfuscated from '../components/InputObfuscated.vue'
 const apiKey = ref(null)
 const refreshLabel = ref('Refresh')
 const chat_model = ref(null)
-const image_model = ref(null)
 const chat_models = ref([])
-const image_models = ref([])
 
 const load = () => {
   apiKey.value = store.config.engines.openai?.apiKey || ''
   chat_models.value = store.config.engines.openai?.models?.chat || []
-  image_models.value = store.config.engines.openai?.models?.image || []
   chat_model.value = store.config.engines.openai?.model?.chat || ''
-  image_model.value = store.config.engines.openai?.model?.image || ''
 }
 
 const onRefresh = async () => {
@@ -69,7 +56,6 @@ const getModels = async () => {
   let success = await loadOpenAIModels()
   if (!success) {
     chat_models.value = []
-    image_models.value = []
     setEphemeralRefreshLabel('Error!')
     return
   }
@@ -92,10 +78,7 @@ const onKeyChange = () => {
 
 const save = () => {
   store.config.engines.openai.apiKey = apiKey.value
-  store.config.engines.openai.model = {
-    chat: chat_model.value,
-    image: image_model.value
-  }
+  store.config.engines.openai.model.chat = chat_model.value
   store.saveSettings()
 }
 
diff --git a/src/settings/SettingsPlugins.vue b/src/settings/SettingsPlugins.vue
index 7231746..fbcdddf 100644
--- a/src/settings/SettingsPlugins.vue
+++ b/src/settings/SettingsPlugins.vue
@@ -21,8 +21,10 @@ import { availablePlugins } from '../plugins/plugins'
 import SettingsBrowse from './SettingsBrowse.vue'
 import SettingsPython from './SettingsPython.vue'
 import SettingsTavily from './SettingsTavily.vue'
+import SettingsDallE from './SettingsDall-E.vue'
 import logoPython from '../../assets/python.svg'
 import logoTavily from '../../assets/tavily.svg'
+import logoOpenAI from '../../assets/openai.svg'
 
 const currentPlugin = ref(Object.keys(availablePlugins)[0])
 const pluginSettings = ref(null)
@@ -35,11 +37,13 @@ const plugins = computed(() => {
         browse: 'Browse',
         tavily: 'Tavily Search',
         python: 'Python',
+        dalle: 'DALL-E',
       }[plugin],
       logo: {
         browse: { image: logoTavily },
         tavily: { image: logoTavily },
         python: { image: logoPython },
+        dalle: { image: logoOpenAI },
       }[plugin],
     }
   })
@@ -49,6 +53,7 @@ const currentView = computed(() => {
   if (currentPlugin.value == 'browse') return SettingsBrowse
   if (currentPlugin.value == 'python') return SettingsPython
   if (currentPlugin.value == 'tavily') return SettingsTavily
+  if (currentPlugin.value == 'dalle') return SettingsDallE
 })
 
 const selectPlugin = (plugin) => {
diff --git a/src/types/config.d.ts b/src/types/config.d.ts
index b5bf91b..f501bb3 100644
--- a/src/types/config.d.ts
+++ b/src/types/config.d.ts
@@ -26,7 +26,6 @@ interface LLMConfig {
 
 interface InstructionsConfig {
   default: string
-  routing: string
   titling: string
   titling_user: string
 }
diff --git a/src/types/llm.d.ts b/src/types/llm.d.ts
index b956c6d..a97f50f 100644
--- a/src/types/llm.d.ts
+++ b/src/types/llm.d.ts
@@ -17,7 +17,6 @@ interface LlmCompletionOpts {
   model?: string
   save?: boolean
   attachment?: Attachment
-  route?: boolean
   size?: '256x256' | '512x512' | '1024x1024' | '1792x1024' | '1024x1792' | null
   style?: 'vivid' | 'natural' | null
   maxTokens?: number
diff --git a/tests/components/message_item.test.ts b/tests/components/message_item.test.ts
index d9398a6..9d25274 100644
--- a/tests/components/message_item.test.ts
+++ b/tests/components/message_item.test.ts
@@ -36,7 +36,6 @@ beforeAll(() => {
       encode: (data: string) => { return Buffer.from(data).toString('base64') },
       decode: (data: string) => { return Buffer.from(data, 'base64').toString() },
     },
-    fullscreen: vi.fn(),
     file: {
       download: vi.fn(),
     },
@@ -224,13 +223,3 @@ test('Format math equations OpenAI', async () => {
   const wrapper = await mount(botMessageText)
   expect(wrapper.find('.body p[class=katex-block]').exists()).toBe(true)
 })
-
-test('Fullscreen image', async () => {
-  const wrapper = await mount(botMessageImage)
-  await wrapper.find('.body img.image').trigger('click')
-  expect(wrapper.find('.fullscreen').exists()).toBe(true)
-  expect(window.api.fullscreen).toHaveBeenCalledWith(true)
-  await wrapper.find('.fullscreen').trigger('click')
-  expect(wrapper.find('.fullscreen').exists()).toBe(false)
-  expect(window.api.fullscreen).toHaveBeenCalledWith(false)
-})
diff --git a/tests/components/message_list.test.ts b/tests/components/message_list.test.ts
index 2535e4b..8cdddd5 100644
--- a/tests/components/message_list.test.ts
+++ b/tests/components/message_list.test.ts
@@ -8,19 +8,10 @@ import defaults from '../../defaults/settings.json'
 import Message from '../../src/models/message'
 import Chat from '../../src/models/chat'
 
-enableAutoUnmount(afterAll)
-
-const onEventMock = vi.fn()
-const emitEventMock = vi.fn()
+import useEventBus from '../../src/composables/useEventBus'
+const { emitEvent } = useEventBus()
 
-vi.mock('../../src/composables/useEventBus.js', async () => {
-  return { default: () => {
-    return {
-      onEvent: onEventMock,
-      emitEvent: emitEventMock
-    }
-  }}
-})
+enableAutoUnmount(afterAll)
 
 let wrapper: VueWrapper<any>
 
@@ -28,6 +19,7 @@ beforeAll(() => {
 
   // api
   window.api = {
+    fullscreen: vi.fn(),
     markdown: {
       render: renderMarkdown
     }
@@ -38,7 +30,6 @@ beforeAll(() => {
 
   // wrapper
   wrapper = mount(MessageList)
-  expect(onEventMock).toHaveBeenCalled()
 })
 
 beforeEach(() => {
@@ -51,6 +42,7 @@ test('Render', () => {
   expect(wrapper.find('.overflow').exists()).toBe(false)
   expect(wrapper.findAll('.message')).toHaveLength(0)
   expect(wrapper.find('.messages').attributes('class')).toContain('openai')
+  expect(wrapper.find('.fullscreen').exists()).toBe(false)
 })
 
 test('Theme support', async () => {
@@ -85,3 +77,13 @@ test('Shows user and assistant messages', async () => {
   await wrapper.setProps({ chat: chat })
   expect(wrapper.findAll('.message')).toHaveLength(2)
 })
+
+test('Fullscreen image', async () => {
+  emitEvent('fullScreen', 'https://example.com/image.jpg')
+  await wrapper.vm.$nextTick()
+  expect(wrapper.find('.fullscreen').exists()).toBe(true)
+  expect(window.api.fullscreen).toHaveBeenCalledWith(true)
+  await wrapper.find('.fullscreen').trigger('click')
+  expect(wrapper.find('.fullscreen').exists()).toBe(false)
+  expect(window.api.fullscreen).toHaveBeenCalledWith(false)
+})
diff --git a/tests/mocks/llm.ts b/tests/mocks/llm.ts
index 4b54768..d0234e0 100644
--- a/tests/mocks/llm.ts
+++ b/tests/mocks/llm.ts
@@ -34,10 +34,6 @@ export default class LlmMock extends LlmEngine {
     return model == 'vision'
   }
 
-  getRountingModel(): string|null {
-    return 'chat'
-  }
-
   async getModels(): Promise<any[]> {
     return [
       { id: 'chat', name: 'Chat' },
@@ -47,15 +43,6 @@ export default class LlmMock extends LlmEngine {
   }
 
   async complete(thread: Message[], opts: LlmCompletionOpts): Promise<LlmResponse> {
-
-    // routing
-    if (thread[0].content.includes('routing')) {
-      if (thread[1].content.includes('image')) {
-        return { type: 'text', content: 'IMAGE' }
-      }
-      return { type: 'text', content: 'TEXT' }
-    }
-
     return {
       type: 'text',
       content: JSON.stringify([
diff --git a/tests/unit/anywhere.test.ts b/tests/unit/anywhere.test.ts
index 191e20a..03e35cc 100644
--- a/tests/unit/anywhere.test.ts
+++ b/tests/unit/anywhere.test.ts
@@ -44,7 +44,6 @@ beforeAll(() => {
   store.config.llm.engine = 'mock'
   store.config.instructions = {
     default: 'You are a chat assistant',
-    routing: 'You are a routing assistant',
     titling: 'You are a titling assistant'
   }
   store.config.getActiveModel = () => 'chat'
diff --git a/tests/unit/assistant.test.ts b/tests/unit/assistant.test.ts
index cf7844e..fdcf455 100644
--- a/tests/unit/assistant.test.ts
+++ b/tests/unit/assistant.test.ts
@@ -48,7 +48,6 @@ beforeEach(() => {
   store.config.llm.engine = 'mock'
   store.config.instructions = {
     default: 'You are a chat assistant',
-    routing: 'You are a routing assistant',
     titling: 'You are a titling assistant'
   }
   store.config.engines.mock = {
@@ -75,14 +74,6 @@ test('Assistant Chat', async () => {
   expect(assistant.chat.title).toBe('[{"role":"system","content":"You are a titling assistant"},{"role":"user","content":"Hello LLM"},{"role":"assistant","content":"[{\\"role\\":\\"system\\",\\"content\\":\\"You are a chat assistant\\"},{\\"role\\":\\"user\\",\\"content\\":\\"Hello LLM\\"},{\\"role\\":\\"assistant\\",\\"content\\":\\"Be kind. Don\'t mock me\\"}]"},{"role":"user"},{"role":"assistant","content":"Be kind. Don\'t mock me"}]')
 })
 
-test('Assistant Image', async () => {
-  const content = await prompt('Create an image of a dragon')
-  expect(content).toBe('local_file.png')
-  expect(assistant.chat.lastMessage().type).toBe('image')
-  expect(assistant.chat.lastMessage().content).toBe('file://local_file.png')
-  expect(assistant.chat.messages.length).toBe(3)
-})
-
 test('Assistant Attachment', async () => {
   assistant.setChat(new Chat())
   await assistant.attach({
diff --git a/tests/unit/commander.test.ts b/tests/unit/commander.test.ts
index a898bfb..818331e 100644
--- a/tests/unit/commander.test.ts
+++ b/tests/unit/commander.test.ts
@@ -47,7 +47,6 @@ beforeAll(() => {
   store.config.llm.engine = 'mock'
   store.config.instructions = {
     default: 'You are a chat assistant',
-    routing: 'You are a routing assistant',
     titling: 'You are a titling assistant'
   }
   store.config.getActiveModel = () => 'chat'
diff --git a/tests/unit/engine_anthropic.test.ts b/tests/unit/engine_anthropic.test.ts
index 25429dd..21306ee 100644
--- a/tests/unit/engine_anthropic.test.ts
+++ b/tests/unit/engine_anthropic.test.ts
@@ -63,7 +63,6 @@ test('Anthropic Basic', async () => {
   expect(anthropic.isVisionModel('claude-3-haiku-20240307')).toBe(true)
   expect(anthropic.isVisionModel('claude-3-sonnet-20240229')).toBe(true)
   expect(anthropic.isVisionModel('claude-3-opus-2024022')).toBe(true)
-  expect(anthropic.getRountingModel()).toBeNull()
 })
 
 test('Anthropic completion', async () => {
diff --git a/tests/unit/engine_google.test.ts b/tests/unit/engine_google.test.ts
index 43cf689..aed2da9 100644
--- a/tests/unit/engine_google.test.ts
+++ b/tests/unit/engine_google.test.ts
@@ -47,7 +47,6 @@ test('Google Basic', async () => {
   expect(google.isVisionModel('models/gemini-pro')).toBe(false)
   expect(google.isVisionModel('gemini-1.5-flash-latest')).toBe(true)
   expect(google.isVisionModel('models/gemini-1.5-pro-latest')).toBe(true)
-  expect(google.getRountingModel()).toBeNull()
 })
 
 test('Google completion', async () => {
diff --git a/tests/unit/engine_groq.test.ts b/tests/unit/engine_groq.test.ts
index c427a27..c15e5dc 100644
--- a/tests/unit/engine_groq.test.ts
+++ b/tests/unit/engine_groq.test.ts
@@ -59,7 +59,6 @@ test('Groq Basic', async () => {
   expect(groq.getName()).toBe('groq')
   expect(groq.isVisionModel('llama2-70b-4096')).toBe(false)
   expect(groq.isVisionModel('llama3-70b-8192')).toBe(false)
-  expect(groq.getRountingModel()).toBeNull()
 })
 
 test('Groq  completion', async () => {
diff --git a/tests/unit/engine_mistralai.test.ts b/tests/unit/engine_mistralai.test.ts
index 62eb630..3efd8e3 100644
--- a/tests/unit/engine_mistralai.test.ts
+++ b/tests/unit/engine_mistralai.test.ts
@@ -51,7 +51,6 @@ test('MistralAI Basic', async () => {
   expect(mistralai.getName()).toBe('mistralai')
   expect(mistralai.isVisionModel('mistral-medium')).toBe(false)
   expect(mistralai.isVisionModel('mistral-large')).toBe(false)
-  expect(mistralai.getRountingModel()).toBeNull()
 })
 
 test('MistralAI  completion', async () => {
diff --git a/tests/unit/engine_ollama.test.ts b/tests/unit/engine_ollama.test.ts
index dcbc698..6baf2d6 100644
--- a/tests/unit/engine_ollama.test.ts
+++ b/tests/unit/engine_ollama.test.ts
@@ -53,7 +53,6 @@ test('Ollama Basic', async () => {
   expect(ollama.getName()).toBe('ollama')
   expect(ollama.isVisionModel('llava:latest')).toBe(true)
   expect(ollama.isVisionModel('llama2:latest')).toBe(false)
-  expect(ollama.getRountingModel()).toBeNull()
 })
 
 test('Ollama completion', async () => {
diff --git a/tests/unit/engine_openai.test.ts b/tests/unit/engine_openai.test.ts
index 1b546dc..590ede2 100644
--- a/tests/unit/engine_openai.test.ts
+++ b/tests/unit/engine_openai.test.ts
@@ -85,7 +85,6 @@ test('OpenAI Basic', async () => {
   expect(openAI.isVisionModel('gpt-4-turbo')).toBe(true)
   expect(openAI.isVisionModel('gpt-4-vision')).toBe(true)
   expect(openAI.isVisionModel('gpt-4-vision-preview')).toBe(true)
-  expect(openAI.getRountingModel()).toMatch(/3.5/)
 })
 
 test('OpenAI completion', async () => {