diff --git a/.vscode/settings.json b/.vscode/settings.json
index 42e000e..87ca8ef 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,5 +2,17 @@
     "spellchecker.ignoreWordsList": [
         "mTLS",
         "Wireguard"
+    ],
+    "sqltools.connections": [
+        {
+            "previewLimit": 50,
+            "server": "localhost",
+            "port": 5432,
+            "driver": "PostgreSQL",
+            "name": "drop",
+            "database": "drop",
+            "username": "drop",
+            "password": "drop"
+        }
     ]
-}
\ No newline at end of file
+}
diff --git a/composables/icons.ts b/composables/icons.ts
new file mode 100644
index 0000000..ca465ab
--- /dev/null
+++ b/composables/icons.ts
@@ -0,0 +1,6 @@
+import { IconsLinuxLogo, IconsWindowsLogo } from "#components";
+
+export const PLATFORM_ICONS = {
+  [PlatformClient.Linux]: IconsLinuxLogo,
+  [PlatformClient.Windows]: IconsWindowsLogo,
+};
diff --git a/pages/admin/library/[id]/import.vue b/pages/admin/library/[id]/import.vue
index 5a3bfdd..1d94a1c 100644
--- a/pages/admin/library/[id]/import.vue
+++ b/pages/admin/library/[id]/import.vue
@@ -1,39 +1,69 @@
 <template>
   <div class="flex flex-col gap-y-4 max-w-lg">
-    <Listbox as="div" v-on:update:model-value="(value) => updateCurrentlySelectedVersion(value)"
-      :model-value="currentlySelectedVersion">
-      <ListboxLabel class="block text-sm font-medium leading-6 text-zinc-100">Select version to import</ListboxLabel>
+    <Listbox
+      as="div"
+      v-on:update:model-value="(value) => updateCurrentlySelectedVersion(value)"
+      :model-value="currentlySelectedVersion"
+    >
+      <ListboxLabel class="block text-sm font-medium leading-6 text-zinc-100"
+        >Select version to import</ListboxLabel
+      >
       <div class="relative mt-2">
         <ListboxButton
-          class="relative w-full cursor-default rounded-md bg-zinc-950 py-1.5 pl-3 pr-10 text-left text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-800 focus:outline-none focus:ring-2 focus:ring-blue-600 sm:text-sm sm:leading-6">
+          class="relative w-full cursor-default rounded-md bg-zinc-950 py-1.5 pl-3 pr-10 text-left text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-800 focus:outline-none focus:ring-2 focus:ring-blue-600 sm:text-sm sm:leading-6"
+        >
           <span v-if="currentlySelectedVersion != -1" class="block truncate">{{
             versions[currentlySelectedVersion]
           }}</span>
-          <span v-else class="block truncate text-zinc-600">Please select a directory...</span>
-          <span class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
-            <ChevronUpDownIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
+          <span v-else class="block truncate text-zinc-600"
+            >Please select a directory...</span
+          >
+          <span
+            class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2"
+          >
+            <ChevronUpDownIcon
+              class="h-5 w-5 text-gray-400"
+              aria-hidden="true"
+            />
           </span>
         </ListboxButton>
 
-        <transition leave-active-class="transition ease-in duration-100" leave-from-class="opacity-100"
-          leave-to-class="opacity-0">
+        <transition
+          leave-active-class="transition ease-in duration-100"
+          leave-from-class="opacity-100"
+          leave-to-class="opacity-0"
+        >
           <ListboxOptions
-            class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md bg-zinc-900 py-1 text-base shadow-lg ring-1 ring-zinc-800 focus:outline-none sm:text-sm">
-            <ListboxOption as="template" v-for="(version, versionIdx) in versions" :key="version" :value="versionIdx"
-              v-slot="{ active, selected }">
-              <li :class="[
-                active ? 'bg-blue-600 text-white' : 'text-zinc-100',
-                'relative cursor-default select-none py-2 pl-3 pr-9',
-              ]">
-                <span :class="[
-                  selected ? 'font-semibold' : 'font-normal',
-                  'block truncate',
-                ]">{{ version }}</span>
+            class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md bg-zinc-900 py-1 text-base shadow-lg ring-1 ring-zinc-800 focus:outline-none sm:text-sm"
+          >
+            <ListboxOption
+              as="template"
+              v-for="(version, versionIdx) in versions"
+              :key="version"
+              :value="versionIdx"
+              v-slot="{ active, selected }"
+            >
+              <li
+                :class="[
+                  active ? 'bg-blue-600 text-white' : 'text-zinc-100',
+                  'relative cursor-default select-none py-2 pl-3 pr-9',
+                ]"
+              >
+                <span
+                  :class="[
+                    selected ? 'font-semibold' : 'font-normal',
+                    'block truncate',
+                  ]"
+                  >{{ version }}</span
+                >
 
-                <span v-if="selected" :class="[
-                  active ? 'text-white' : 'text-blue-600',
-                  'absolute inset-y-0 right-0 flex items-center pr-4',
-                ]">
+                <span
+                  v-if="selected"
+                  :class="[
+                    active ? 'text-white' : 'text-blue-600',
+                    'absolute inset-y-0 right-0 flex items-center pr-4',
+                  ]"
+                >
                   <CheckIcon class="h-5 w-5" aria-hidden="true" />
                 </span>
               </li>
@@ -43,59 +73,331 @@
       </div>
     </Listbox>
 
-    <div class="flex flex-col gap-8" v-if="versionSettings">
+    <div class="flex flex-col gap-8" v-if="versionGuesses">
+      <!-- setup executable -->
       <div>
-        <label for="startup" class="block text-sm font-medium leading-6 text-zinc-100">Startup
-          executable/command</label>
-        <p class="text-zinc-400 text-xs">Executable to launch the game</p>
-        <div class="mt-2">
-          <div
-            class="flex rounded-md shadow-sm bg-zinc-950 ring-1 ring-inset ring-zinc-800 focus-within:ring-2 focus-within:ring-inset focus-within:ring-blue-600">
-            <span class="flex select-none items-center pl-3 text-zinc-500 sm:text-sm">(install_dir)/</span>
-            <input type="text" name="startup" id="startup" v-model="versionSettings.startup"
-              class="block flex-1 border-0 py-1.5 pl-1 bg-transparent text-zinc-100 placeholder:text-zinc-400 focus:ring-0 sm:text-sm sm:leading-6"
-              placeholder="my-game.exe" />
-          </div>
-        </div>
-      </div>
-      <div>
-        <label for="startup" class="block text-sm font-medium leading-6 text-zinc-100">Setup executable/command</label>
+        <label
+          for="startup"
+          class="block text-sm font-medium leading-6 text-zinc-100"
+          >Setup executable/command</label
+        >
         <p class="text-zinc-400 text-xs">Ran once when the game is installed</p>
         <div class="mt-2">
           <div
-            class="flex rounded-md shadow-sm bg-zinc-950 ring-1 ring-inset ring-zinc-800 focus-within:ring-2 focus-within:ring-inset focus-within:ring-blue-600">
-            <span class="flex select-none items-center pl-3 text-zinc-500 sm:text-sm">(install_dir)/</span>
-            <input type="text" name="startup" id="startup" v-model="versionSettings.setup"
-              class="block flex-1 border-0 py-1.5 pl-1 bg-transparent text-zinc-100 placeholder:text-zinc-400 focus:ring-0 sm:text-sm sm:leading-6"
-              placeholder="setup.exe" />
+            class="flex w-fit rounded-md shadow-sm bg-zinc-950 ring-1 ring-inset ring-zinc-800 focus-within:ring-2 focus-within:ring-inset focus-within:ring-blue-600"
+          >
+            <span
+              class="flex select-none items-center pl-3 text-zinc-500 sm:text-sm"
+              >(install_dir)/</span
+            >
+            <Combobox
+              as="div"
+              :value="versionSettings.setup"
+              @update:model-value="(v) => updateSetupCommand(v)"
+              nullable
+            >
+              <div class="relative">
+                <ComboboxInput
+                  class="block flex-1 border-0 py-1.5 pl-1 bg-transparent text-zinc-100 placeholder:text-zinc-400 focus:ring-0 sm:text-sm sm:leading-6"
+                  @change="setupProcessQuery = $event.target.value"
+                  @blur="setupProcessQuery = ''"
+                  :placeholder="'setup.exe'"
+                />
+                <ComboboxButton
+                  v-if="launchFilteredVersionGuesses?.length ?? 0 > 0"
+                  class="absolute inset-y-0 right-0 flex items-center rounded-r-md px-2 focus:outline-none"
+                >
+                  <ChevronUpDownIcon
+                    class="size-5 text-gray-400"
+                    aria-hidden="true"
+                  />
+                </ComboboxButton>
+
+                <ComboboxOptions
+                  class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md bg-zinc-900 py-1 text-base shadow-lg ring-1 ring-white/5 focus:outline-none sm:text-sm"
+                >
+                  <ComboboxOption
+                    v-for="guess in setupFilteredVersionGuesses"
+                    :key="guess.filename"
+                    :value="guess.filename"
+                    as="template"
+                    v-slot="{ active, selected }"
+                  >
+                    <li
+                      :class="[
+                        'relative cursor-default select-none py-2 pl-3 pr-9',
+                        active
+                          ? 'bg-blue-600 text-white outline-none'
+                          : 'text-zinc-100',
+                      ]"
+                    >
+                      <span
+                        :class="[
+                          'inline-flex items-center gap-x-2 block truncate',
+                          selected && 'font-semibold',
+                        ]"
+                      >
+                        {{ guess.filename }}
+                        <component
+                          :is="PLATFORM_ICONS[guess.platform as PlatformClient]"
+                          class="size-5"
+                        />
+                      </span>
+
+                      <span
+                        v-if="selected"
+                        :class="[
+                          'absolute inset-y-0 right-0 flex items-center pr-4',
+                          active ? 'text-white' : 'text-blue-600',
+                        ]"
+                      >
+                        <CheckIcon class="size-5" aria-hidden="true" />
+                      </span>
+                    </li>
+                  </ComboboxOption>
+                  <ComboboxOption
+                    :value="launchProcessQuery"
+                    v-if="launchProcessQuery"
+                    v-slot="{ active, selected }"
+                  >
+                    <li
+                      :class="[
+                        'relative cursor-default select-none py-2 pl-3 pr-9',
+                        active
+                          ? 'bg-blue-600 text-white outline-none'
+                          : 'text-gray-900',
+                      ]"
+                    >
+                      <span
+                        :class="['block truncate', selected && 'font-semibold']"
+                      >
+                        "{{ launchProcessQuery }}"
+                      </span>
+
+                      <span
+                        v-if="selected"
+                        :class="[
+                          'absolute inset-y-0 right-0 flex items-center pr-4',
+                          active ? 'text-white' : 'text-blue-600',
+                        ]"
+                      >
+                        <CheckIcon class="size-5" aria-hidden="true" />
+                      </span>
+                    </li>
+                  </ComboboxOption>
+                </ComboboxOptions>
+              </div>
+            </Combobox>
+            <input
+              type="text"
+              name="startup"
+              id="startup"
+              v-model="versionSettings.setupArgs"
+              class="border-l border-zinc-700 block flex-1 border-0 py-1.5 pl-2 bg-transparent text-zinc-100 placeholder:text-zinc-400 focus:ring-0 sm:text-sm sm:leading-6"
+              placeholder="--setup"
+            />
           </div>
         </div>
       </div>
+      <!-- setup mode -->
+      <SwitchGroup as="div" class="flex items-center justify-between">
+        <span class="flex flex-grow flex-col">
+          <SwitchLabel
+            as="span"
+            class="text-sm font-medium leading-6 text-zinc-100"
+            passive
+            >Setup mode</SwitchLabel
+          >
+          <SwitchDescription as="span" class="text-sm text-zinc-400"
+            >When enabled, this version does not have a launch command, and
+            simply runs the executable on the user's computer. Useful for games
+            that only distribute installer and not portable
+            files.</SwitchDescription
+          >
+        </span>
+        <Switch
+          v-model="versionSettings.onlySetup"
+          :class="[
+            versionSettings.onlySetup ? 'bg-blue-600' : 'bg-zinc-800',
+            'relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2',
+          ]"
+        >
+          <span
+            aria-hidden="true"
+            :class="[
+              versionSettings.onlySetup ? 'translate-x-5' : 'translate-x-0',
+              'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out',
+            ]"
+          />
+        </Switch>
+      </SwitchGroup>
+      <div class="relative">
+        <label
+          for="startup"
+          class="block text-sm font-medium leading-6 text-zinc-100"
+          >Launch executable/command</label
+        >
+        <p class="text-zinc-400 text-xs">Executable to launch the game</p>
+        <div class="mt-2">
+          <div
+            class="flex w-fit rounded-md shadow-sm bg-zinc-950 ring-1 ring-inset ring-zinc-800 focus-within:ring-2 focus-within:ring-inset focus-within:ring-blue-600"
+          >
+            <span
+              class="flex select-none items-center pl-3 text-zinc-500 sm:text-sm"
+              >(install_dir)/</span
+            >
+            <Combobox
+              as="div"
+              :value="versionSettings.launch"
+              @update:model-value="(v) => updateLaunchCommand(v)"
+              nullable
+            >
+              <div class="relative">
+                <ComboboxInput
+                  class="block flex-1 border-0 py-1.5 pl-1 bg-transparent text-zinc-100 placeholder:text-zinc-400 focus:ring-0 sm:text-sm sm:leading-6"
+                  @change="launchProcessQuery = $event.target.value"
+                  @blur="launchProcessQuery = ''"
+                  :placeholder="'game.exe'"
+                />
+                <ComboboxButton
+                  v-if="launchFilteredVersionGuesses?.length ?? 0 > 0"
+                  class="absolute inset-y-0 right-0 flex items-center rounded-r-md px-2 focus:outline-none"
+                >
+                  <ChevronUpDownIcon
+                    class="size-5 text-gray-400"
+                    aria-hidden="true"
+                  />
+                </ComboboxButton>
+
+                <ComboboxOptions
+                  class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md bg-zinc-900 py-1 text-base shadow-lg ring-1 ring-white/5 focus:outline-none sm:text-sm"
+                >
+                  <ComboboxOption
+                    v-for="guess in launchFilteredVersionGuesses"
+                    :key="guess.filename"
+                    :value="guess.filename"
+                    as="template"
+                    v-slot="{ active, selected }"
+                  >
+                    <li
+                      :class="[
+                        'relative cursor-default select-none py-2 pl-3 pr-9',
+                        active
+                          ? 'bg-blue-600 text-white outline-none'
+                          : 'text-zinc-100',
+                      ]"
+                    >
+                      <span
+                        :class="[
+                          'inline-flex items-center gap-x-2 block truncate',
+                          selected && 'font-semibold',
+                        ]"
+                      >
+                        {{ guess.filename }}
+                        <component
+                          :is="PLATFORM_ICONS[guess.platform as PlatformClient]"
+                          class="size-5"
+                        />
+                      </span>
+
+                      <span
+                        v-if="selected"
+                        :class="[
+                          'absolute inset-y-0 right-0 flex items-center pr-4',
+                          active ? 'text-white' : 'text-blue-600',
+                        ]"
+                      >
+                        <CheckIcon class="size-5" aria-hidden="true" />
+                      </span>
+                    </li>
+                  </ComboboxOption>
+                  <ComboboxOption
+                    :value="launchProcessQuery"
+                    v-if="launchProcessQuery"
+                    v-slot="{ active, selected }"
+                  >
+                    <li
+                      :class="[
+                        'relative cursor-default select-none py-2 pl-3 pr-9',
+                        active
+                          ? 'bg-blue-600 text-white outline-none'
+                          : 'text-gray-900',
+                      ]"
+                    >
+                      <span
+                        :class="['block truncate', selected && 'font-semibold']"
+                      >
+                        "{{ launchProcessQuery }}"
+                      </span>
+
+                      <span
+                        v-if="selected"
+                        :class="[
+                          'absolute inset-y-0 right-0 flex items-center pr-4',
+                          active ? 'text-white' : 'text-blue-600',
+                        ]"
+                      >
+                        <CheckIcon class="size-5" aria-hidden="true" />
+                      </span>
+                    </li>
+                  </ComboboxOption>
+                </ComboboxOptions>
+              </div>
+            </Combobox>
+            <input
+              type="text"
+              name="startup"
+              id="startup"
+              v-model="versionSettings.launchArgs"
+              class="border-l border-zinc-700 block flex-1 border-0 py-1.5 pl-2 bg-transparent text-zinc-100 placeholder:text-zinc-400 focus:ring-0 sm:text-sm sm:leading-6"
+              placeholder="--launch"
+            />
+          </div>
+        </div>
+        <div
+          class="absolute inset-0 bg-zinc-900/50"
+          v-if="versionSettings.onlySetup"
+        />
+      </div>
+
       <PlatformSelector v-model="versionSettings.platform">
         Version platform
       </PlatformSelector>
       <SwitchGroup as="div" class="flex items-center justify-between">
         <span class="flex flex-grow flex-col">
-          <SwitchLabel as="span" class="text-sm font-medium leading-6 text-zinc-100" passive>Update mode</SwitchLabel>
-          <SwitchDescription as="span" class="text-sm text-zinc-400">When enabled, these files will be installed on top
-            of (overwriting)
+          <SwitchLabel
+            as="span"
+            class="text-sm font-medium leading-6 text-zinc-100"
+            passive
+            >Update mode</SwitchLabel
+          >
+          <SwitchDescription as="span" class="text-sm text-zinc-400"
+            >When enabled, these files will be installed on top of (overwriting)
             the previous version's. If multiple "update modes" are chained
-            together, they are applied in order.</SwitchDescription>
+            together, they are applied in order.</SwitchDescription
+          >
         </span>
-        <Switch v-model="delta" :class="[
-          delta ? 'bg-blue-600' : 'bg-zinc-800',
-          'relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2',
-        ]">
-          <span aria-hidden="true" :class="[
-            delta ? 'translate-x-5' : 'translate-x-0',
-            'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out',
-          ]" />
+        <Switch
+          v-model="versionSettings.delta"
+          :class="[
+            versionSettings.delta ? 'bg-blue-600' : 'bg-zinc-800',
+            'relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2',
+          ]"
+        >
+          <span
+            aria-hidden="true"
+            :class="[
+              versionSettings.delta ? 'translate-x-5' : 'translate-x-0',
+              'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out',
+            ]"
+          />
         </Switch>
       </SwitchGroup>
       <Disclosure as="div" class="py-2" v-slot="{ open }">
         <dt>
           <DisclosureButton
-            class="border-b border-zinc-600 pb-2 flex w-full items-start justify-between text-left text-zinc-100">
+            class="border-b border-zinc-600 pb-2 flex w-full items-start justify-between text-left text-zinc-100"
+          >
             <span class="text-base/7 font-semibold">Advanced options</span>
             <span class="ml-6 flex h-7 items-center">
               <ChevronUpIcon v-if="!open" class="size-6" aria-hidden="true" />
@@ -103,34 +405,63 @@
             </span>
           </DisclosureButton>
         </dt>
-        <DisclosurePanel as="dd" class="bg-zinc-950/30 p-3 rounded-b-lg mt-2 flex flex-col gap-y-4">
+        <DisclosurePanel
+          as="dd"
+          class="bg-zinc-950/30 p-3 rounded-b-lg mt-2 flex flex-col gap-y-4"
+        >
           <!-- UMU launcher configuration -->
-          <div v-if="versionSettings.platform == PlatformClient.Linux" class="flex flex-col gap-y-4">
+          <div
+            v-if="versionSettings.platform == PlatformClient.Windows"
+            class="flex flex-col gap-y-4"
+          >
             <SwitchGroup as="div" class="flex items-center justify-between">
               <span class="flex flex-grow flex-col">
-                <SwitchLabel as="span" class="text-sm font-medium leading-6 text-zinc-100" passive>Override UMU Launcher
-                  Game ID</SwitchLabel>
-                <SwitchDescription as="span" class="text-sm text-zinc-400">By default, Drop uses a non-ID when launching
-                  with UMU
-                  Launcher. In order to get the right patches for some games, you
-                  may have to manually set this field.</SwitchDescription>
+                <SwitchLabel
+                  as="span"
+                  class="text-sm font-medium leading-6 text-zinc-100"
+                  passive
+                  >Override UMU Launcher Game ID</SwitchLabel
+                >
+                <SwitchDescription as="span" class="text-sm text-zinc-400"
+                  >By default, Drop uses a non-ID when launching with UMU
+                  Launcher. In order to get the right patches for some games,
+                  you may have to manually set this field.</SwitchDescription
+                >
               </span>
-              <Switch v-model="umuIdEnabled" :class="[
-                umuIdEnabled ? 'bg-blue-600' : 'bg-zinc-800',
-                'relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2',
-              ]">
-                <span aria-hidden="true" :class="[
-                  umuIdEnabled ? 'translate-x-5' : 'translate-x-0',
-                  'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out',
-                ]" />
+              <Switch
+                v-model="umuIdEnabled"
+                :class="[
+                  umuIdEnabled ? 'bg-blue-600' : 'bg-zinc-800',
+                  'relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2',
+                ]"
+              >
+                <span
+                  aria-hidden="true"
+                  :class="[
+                    umuIdEnabled ? 'translate-x-5' : 'translate-x-0',
+                    'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out',
+                  ]"
+                />
               </Switch>
             </SwitchGroup>
             <div>
-              <label for="umu-id" class="block text-sm font-medium leading-6 text-zinc-100">UMU Launcher ID</label>
+              <label
+                for="umu-id"
+                class="block text-sm font-medium leading-6 text-zinc-100"
+                >UMU Launcher ID</label
+              >
               <div class="mt-2">
-                <input id="umu-id" name="umu-id" type="text" autocomplete="umu-id" required :disabled="!umuIdEnabled"
-                  v-model="umuId" placeholder="umu-starcitizen"
-                  class="block w-full rounded-md border-0 py-1.5 px-3 bg-zinc-950 disabled:bg-zinc-900/80 text-zinc-100 disabled:text-zinc-400 shadow-sm ring-1 ring-inset ring-zinc-700 disabled:ring-zinc-800 placeholder:text-zinc-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 sm:text-sm sm:leading-6" />
+                <input
+                  id="umu-id"
+                  name="umu-id"
+                  type="text"
+                  autocomplete="umu-id"
+                  required
+                  :disabled="!umuIdEnabled"
+                  v-model="umuId"
+                  placeholder="umu-starcitizen"
+                  class="block w-full rounded-md border-0 py-1.5 px-3 bg-zinc-950 disabled:bg-zinc-900/80 text-zinc-100 disabled:text-zinc-400 shadow-sm ring-1 ring-inset ring-zinc-700 disabled:ring-zinc-800 placeholder:text-zinc-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 sm:text-sm sm:leading-6"
+                />
               </div>
             </div>
           </div>
@@ -141,7 +472,11 @@
         </DisclosurePanel>
       </Disclosure>
 
-      <LoadingButton @click="startImport_wrapper" class="w-fit" :loading="importLoading">
+      <LoadingButton
+        @click="startImport_wrapper"
+        class="w-fit"
+        :loading="importLoading"
+      >
         Import
       </LoadingButton>
       <div v-if="importError" class="mt-4 w-fit rounded-md bg-red-600/10 p-4">
@@ -157,17 +492,27 @@
         </div>
       </div>
     </div>
-    <div v-else-if="currentlySelectedVersion != -1" role="status"
-      class="inline-flex text-zinc-100 font-display font-semibold items-center gap-x-4">
+    <div
+      v-else-if="currentlySelectedVersion != -1"
+      role="status"
+      class="inline-flex text-zinc-100 font-display font-semibold items-center gap-x-4"
+    >
       Loading version metadata...
-      <svg aria-hidden="true" class="w-6 h-6 text-transparent animate-spin fill-white" viewBox="0 0 100 101" fill="none"
-        xmlns="http://www.w3.org/2000/svg">
+      <svg
+        aria-hidden="true"
+        class="w-6 h-6 text-transparent animate-spin fill-white"
+        viewBox="0 0 100 101"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
         <path
           d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
-          fill="currentColor" />
+          fill="currentColor"
+        />
         <path
           d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
-          fill="currentFill" />
+          fill="currentFill"
+        />
       </svg>
       <span class="sr-only">Loading...</span>
     </div>
@@ -188,6 +533,12 @@ import {
   Disclosure,
   DisclosureButton,
   DisclosurePanel,
+  Combobox,
+  ComboboxButton,
+  ComboboxInput,
+  ComboboxLabel,
+  ComboboxOption,
+  ComboboxOptions,
 } from "@headlessui/vue";
 import { XCircleIcon } from "@heroicons/vue/16/solid";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
@@ -209,21 +560,72 @@ const versions = await $fetch(
   }
 );
 const currentlySelectedVersion = ref(-1);
-const versionSettings = ref<
-  { platform: string; startup: string; setup: string } | undefined
->();
-const delta = ref(false);
+const versionSettings = ref<{
+  platform: string;
+
+  onlySetup: boolean;
+  launch: string;
+  launchArgs: string;
+  setup: string;
+  setupArgs: string;
+
+  delta: boolean;
+  umuId: string;
+}>({
+  platform: "",
+  launch: "",
+  launchArgs: "",
+  setup: "",
+  setupArgs: "",
+  delta: false,
+  onlySetup: false,
+  umuId: "",
+});
+
+const versionGuesses = ref<Array<{ platform: string; filename: string }>>();
+const launchProcessQuery = ref("");
+const setupProcessQuery = ref("");
+
+const launchFilteredVersionGuesses = computed(() =>
+  versionGuesses.value?.filter((e) =>
+    e.filename.toLowerCase().includes(launchProcessQuery.value.toLowerCase())
+  )
+);
+const setupFilteredVersionGuesses = computed(() =>
+  versionGuesses.value?.filter((e) =>
+    e.filename.toLowerCase().includes(setupProcessQuery.value.toLowerCase())
+  )
+);
+
+function updateLaunchCommand(value: string) {
+  versionSettings.value.launch = value;
+  autosetPlatform(value);
+}
+
+function updateSetupCommand(value: string) {
+  versionSettings.value.setup = value;
+  autosetPlatform(value);
+}
+
+function autosetPlatform(value: string) {
+  if (!versionGuesses.value) return;
+  if (versionSettings.value.platform) return;
+  const guessIndex = versionGuesses.value.findIndex(
+    (e) => e.filename === value
+  );
+  if (guessIndex == -1) return;
+  versionSettings.value.platform = versionGuesses.value[guessIndex].platform;
+}
 
-const _umuId = ref("");
 const umuIdEnabled = ref(false);
 const umuId = computed({
   get() {
-    if (umuIdEnabled.value) return _umuId.value;
+    if (umuIdEnabled.value) return versionSettings.value.umuId;
     return undefined;
   },
   set(v) {
     if (umuIdEnabled.value && v) {
-      _umuId.value = v;
+      versionSettings.value.umuId = v;
     }
   },
 });
@@ -240,11 +642,7 @@ async function updateCurrentlySelectedVersion(value: number) {
       gameId
     )}&version=${encodeURIComponent(version)}`
   );
-  versionSettings.value = {
-    platform: results.platformGuess,
-    startup: results.startupGuess,
-    setup: "",
-  };
+  versionGuesses.value = results;
 }
 
 async function startImport() {
@@ -254,10 +652,7 @@ async function startImport() {
     body: {
       id: gameId,
       version: versions[currentlySelectedVersion.value],
-      platform: versionSettings.value.platform,
-      startup: versionSettings.value.startup,
-      setup: versionSettings.value.setup,
-      delta: delta.value,
+      ...versionSettings.value,
     },
   });
   router.push(`/admin/task/${taskId.taskId}`);
diff --git a/pages/store/[id]/index.vue b/pages/store/[id]/index.vue
index 8867caa..37a76ee 100644
--- a/pages/store/[id]/index.vue
+++ b/pages/store/[id]/index.vue
@@ -72,7 +72,7 @@
                 >
                   <component
                     v-for="platform in platforms"
-                    :is="icons[platform]"
+                    :is="PLATFORM_ICONS[platform]"
                     class="text-blue-600 w-6 h-6"
                   />
                   <span
@@ -217,10 +217,7 @@ const rating = Math.round(game.mReviewRating * 5);
 const ratingArray = Array(5)
   .fill(null)
   .map((_, i) => i + 1 <= rating);
-const icons = {
-  [PlatformClient.Linux]: IconsLinuxLogo,
-  [PlatformClient.Windows]: IconsWindowsLogo,
-};
+
 
 useHead({
   title: game.mName,
diff --git a/prisma/migrations/20241230053403_add_args_and_only_setup/migration.sql b/prisma/migrations/20241230053403_add_args_and_only_setup/migration.sql
new file mode 100644
index 0000000..14383ee
--- /dev/null
+++ b/prisma/migrations/20241230053403_add_args_and_only_setup/migration.sql
@@ -0,0 +1,6 @@
+-- AlterTable
+ALTER TABLE "GameVersion" ADD COLUMN     "launchArgs" TEXT[],
+ADD COLUMN     "onlySetup" BOOLEAN NOT NULL DEFAULT false,
+ADD COLUMN     "setupArgs" TEXT[],
+ALTER COLUMN "launchCommand" DROP NOT NULL,
+ALTER COLUMN "setupCommand" DROP NOT NULL;
diff --git a/prisma/schema/content.prisma b/prisma/schema/content.prisma
index ab003d1..b099ff9 100644
--- a/prisma/schema/content.prisma
+++ b/prisma/schema/content.prisma
@@ -42,10 +42,16 @@ model GameVersion {
 
     created DateTime @default(now())
 
-    platform        Platform
-    launchCommand   String // Command to run to start. Platform-specific. Windows games on Linux will wrap this command in Proton/Wine
-    setupCommand    String // Command to setup game (dependencies and such)
-    umuIdOverride   String?
+    platform Platform
+
+    launchCommand String? // Command to run to start. Platform-specific. Windows games on Linux will wrap this command in Proton/Wine
+    launchArgs    String[]
+    setupCommand  String? // Command to setup game (dependencies and such)
+    setupArgs     String[]
+    onlySetup     Boolean  @default(false)
+
+    umuIdOverride String?
+
     dropletManifest Json // Results from droplet
 
     versionIndex Int
diff --git a/server/api/v1/admin/import/version/index.post.ts b/server/api/v1/admin/import/version/index.post.ts
index ba28628..1dfe99a 100644
--- a/server/api/v1/admin/import/version/index.post.ts
+++ b/server/api/v1/admin/import/version/index.post.ts
@@ -1,5 +1,6 @@
 import prisma from "~/server/internal/db/database";
 import libraryManager from "~/server/internal/library";
+import { parsePlatform } from "~/server/internal/utils/parseplatform";
 
 export default defineEventHandler(async (h3) => {
   const user = await h3.context.session.getAdminUser(h3);
@@ -8,35 +9,32 @@ export default defineEventHandler(async (h3) => {
   const body = await readBody(h3);
   const gameId = body.id;
   const versionName = body.version;
-  const platform = body.platform;
-  const startup = body.startup;
-  const setup = body.setup ?? "";
-  const delta = body.delta ?? false;
-  const umuId = body.umuId;
 
-  // startup & delta require more complex checking logic
-  if (!gameId || !versionName || !platform)
+  const platform = body.platform as string | undefined;
+  const launch = (body.launch ?? "") as string;
+  const launchArgs = (body.launchArgs ?? "") as string;
+  const setup = (body.setup ?? "") as string;
+  const setupArgs = (body.setupArgs ?? "") as string;
+  const onlySetup = body.onlySetup ?? (false as boolean);
+  const delta = (body.delta ?? false) as boolean;
+  const umuId = (body.umuId ?? "") as string;
+
+  if (!gameId || !versionName)
     throw createError({
       statusCode: 400,
-      statusMessage:
-        "ID, version, platform, setup, and startup (if not in update mode) are required.",
+      statusMessage: "Game ID and version are required.",
     });
 
-  if (umuId && typeof umuId !== "string")
-    throw createError({
-      statusCode: 400,
-      statusMessage: "If specified, UMU ID must be a string.",
-    });
+  if (!platform)
+    throw createError({ statusCode: 400, statusMessage: "Missing platform." });
 
-  if (!delta && !startup)
-    throw createError({
-      statusCode: 400,
-      statusMessage: "Startup executable is required for non-update versions",
-    });
+  const platformParsed = parsePlatform(platform);
+  if (!platformParsed)
+    throw createError({ statusCode: 400, statusMessage: "Invalid platform." });
 
   if (delta) {
     const validOverlayVersions = await prisma.gameVersion.count({
-      where: { gameId: gameId, platform: platform, delta: false },
+      where: { gameId: gameId, platform: platformParsed, delta: false },
     });
     if (validOverlayVersions == 0)
       throw createError({
@@ -46,17 +44,39 @@ export default defineEventHandler(async (h3) => {
       });
   }
 
-  const taskId = await libraryManager.importVersion(
-    gameId,
-    versionName,
-    {
-      platform,
-      startup,
-      setup,
-      umuId,
-    },
-    delta
-  );
+  if (umuId && typeof umuId !== "string")
+    throw createError({
+      statusCode: 400,
+      statusMessage: "If specified, UMU ID must be a string.",
+    });
+
+  if (onlySetup) {
+    if (!setup)
+      throw createError({
+        statusCode: 400,
+        statusMessage: 'Setup required in "setup mode".',
+      });
+  } else {
+    if (!delta && !launch)
+      throw createError({
+        statusCode: 400,
+        statusMessage: "Startup executable is required for non-update versions",
+      });
+  }
+
+  // startup & delta require more complex checking logic
+  const taskId = await libraryManager.importVersion(gameId, versionName, {
+    platform,
+    onlySetup,
+
+    launch,
+    launchArgs,
+    setup,
+    setupArgs,
+
+    umuId,
+    delta,
+  });
   if (!taskId)
     throw createError({
       statusCode: 400,
diff --git a/server/api/v1/client/metadata/versions.get.ts b/server/api/v1/client/metadata/versions.get.ts
index 92c9094..40437e3 100644
--- a/server/api/v1/client/metadata/versions.get.ts
+++ b/server/api/v1/client/metadata/versions.get.ts
@@ -15,15 +15,6 @@ export default defineClientEventHandler(async (h3, {}) => {
     where: {
       gameId: id,
     },
-    select: {
-      versionIndex: true,
-      versionName: true,
-      platform: true,
-      setupCommand: true,
-      launchCommand: true,
-      delta: true,
-      dropletManifest: true,
-    },
     orderBy: {
       versionIndex: "desc", // Latest one first
     },
diff --git a/server/internal/library/index.ts b/server/internal/library/index.ts
index dfe0267..2ed0a4e 100644
--- a/server/internal/library/index.ts
+++ b/server/internal/library/index.ts
@@ -170,8 +170,9 @@ class LibraryManager {
         for (const checkExt of checkExts) {
           if (checkExt != ext) continue;
           const fuzzyValue = fuzzy(filename, game.mName);
+          const relative = path.relative(targetDir, file);
           options.push({
-            filename: file,
+            filename: relative,
             platform: platform,
             match: fuzzyValue,
           });
@@ -180,19 +181,8 @@ class LibraryManager {
     }
 
     const sortedOptions = options.sort((a, b) => b.match - a.match);
-    let startupGuess = "";
-    let platformGuess = "";
-    if (sortedOptions.length > 0) {
-      const finalChoice = sortedOptions[0];
-      const finalChoiceRelativePath = path.relative(
-        targetDir,
-        finalChoice.filename
-      );
-      startupGuess = finalChoiceRelativePath;
-      platformGuess = finalChoice.platform;
-    }
 
-    return { startupGuess, platformGuess };
+    return sortedOptions;
   }
 
   // Checks are done in least to most expensive order
@@ -212,11 +202,16 @@ class LibraryManager {
     versionName: string,
     metadata: {
       platform: string;
+      onlySetup: boolean;
+
       setup: string;
-      startup: string;
-      umuId: string | undefined;
-    },
-    delta = false
+      setupArgs: string;
+      launch: string;
+      launchArgs: string;
+      delta: boolean;
+
+      umuId: string;
+    }
   ) {
     const taskId = `import:${gameId}:${versionName}`;
 
@@ -264,19 +259,41 @@ class LibraryManager {
         });
 
         // Then, create the database object
-        const version = await prisma.gameVersion.create({
-          data: {
-            gameId: gameId,
-            versionName: versionName,
-            platform: platform,
-            setupCommand: metadata.setup,
-            launchCommand: metadata.startup,
-            umuIdOverride: metadata.umuId,
-            dropletManifest: manifest,
-            versionIndex: currentIndex,
-            delta: delta,
-          },
-        });
+        if (metadata.onlySetup) {
+          await prisma.gameVersion.create({
+            data: {
+              gameId: gameId,
+              versionName: versionName,
+              dropletManifest: manifest,
+              versionIndex: currentIndex,
+              delta: metadata.delta,
+              umuIdOverride: metadata.umuId,
+              platform: platform,
+
+              onlySetup: true,
+              setupCommand: metadata.setup,
+              setupArgs: metadata.setupArgs.split(" "),
+            },
+          });
+        } else {
+          await prisma.gameVersion.create({
+            data: {
+              gameId: gameId,
+              versionName: versionName,
+              dropletManifest: manifest,
+              versionIndex: currentIndex,
+              delta: metadata.delta,
+              umuIdOverride: metadata.umuId,
+              platform: platform,
+
+              onlySetup: false,
+              setupCommand: metadata.setup,
+              setupArgs: metadata.setupArgs.split(" "),
+              launchCommand: metadata.launch,
+              launchArgs: metadata.launchArgs.split(" "),
+            },
+          });
+        }
 
         log("Successfully created version!");