diff --git a/src/controls/SetColorSpace.svelte b/src/controls/SetColorSpace.svelte
index bbee5fbe..c2d9487e 100644
--- a/src/controls/SetColorSpace.svelte
+++ b/src/controls/SetColorSpace.svelte
@@ -4,28 +4,48 @@
   import { buttonStyle } from "../lib/styles";
   export let colorSpace: string;
   export let onChange: (e: any) => void;
-  // const notAllowed = new Set(["rgb", "hsv", "hsl", "srgb", "lch", "oklch"]);
-  // const notAllowed = new Set(["rgb", "lch", "oklch", "srgb"]);
-  const notAllowed = new Set(["rgb", "oklch", "srgb", "jzazbz", "oklab"]);
-  $: options = Object.keys(colorPickerConfig)
-    .filter((x) => !notAllowed.has(x))
+  const notAllowed = new Set(["rgb"]);
+  $: basicOptions = Object.keys(colorPickerConfig)
+    .filter((x) => !notAllowed.has(x) && !colorPickerConfig[x].advancedSpace)
     .sort((a, b) => {
       if (a === "lab") return -1;
       if (b === "lab") return 1;
       return a.localeCompare(b);
     });
+
+  $: advancedSpaceOptions = Object.keys(colorPickerConfig).filter(
+    (x) => !notAllowed.has(x) && colorPickerConfig[x].advancedSpace
+  );
 </script>
 
 <Tooltip>
-  <div slot="content" class="flex flex-col max-w-md" let:onClick>
+  <div slot="content" class="flex flex-col max-w-md">
     <div class="font-bold">Set Color Space</div>
     <div class="text-sm">
-      Note that changing between color space can be a lossy process and colors
-      may alter slightly
+      Select the color space to use for the color picker.
+    </div>
+    <div class="grid grid-cols-4 mt-2">
+      {#each basicOptions as space}
+        <button
+          class={`${buttonStyle} justify-self-start`}
+          class:font-bold={space === colorSpace}
+          on:click={() => onChange(space)}
+        >
+          {space.toUpperCase()}
+        </button>
+        <span class="text-sm italic col-span-3">
+          {colorPickerConfig[space].description}
+        </span>
+      {/each}
+    </div>
+
+    <div class="font-bold">Advanced Color Space</div>
+    <div class="text-sm">
+      These color spaces provide more control over the color representation, but
+      may be less intuitive or familiar
     </div>
     <div class="grid grid-cols-4 mt-2">
-      {#each options as space}
-        <!-- <div class="flex"> -->
+      {#each advancedSpaceOptions as space}
         <button
           class={`${buttonStyle} justify-self-start`}
           class:font-bold={space === colorSpace}
@@ -36,7 +56,6 @@
         <span class="text-sm italic col-span-3">
           {colorPickerConfig[space].description}
         </span>
-        <!-- </div> -->
       {/each}
     </div>
   </div>
diff --git a/src/lib/Color.ts b/src/lib/Color.ts
index 42bded85..9b93b84f 100644
--- a/src/lib/Color.ts
+++ b/src/lib/Color.ts
@@ -12,6 +12,7 @@ export class Color {
   static stepSize: Channels = [1, 1, 1];
   static channelNames: string[] = [];
   static description: string = "";
+  static advancedSpace = true;
   static dimensionToChannel: Record<"x" | "y" | "z", string> = {
     x: "",
     y: "",
@@ -229,6 +230,7 @@ class CIELAB extends Color {
   static dimensionToChannel = { x: "a", y: "b", z: "L" };
   static description =
     "CIELAB is a perceptually uniform color space. Roughly, L is lightness, a is red-green, and b is blue-yellow. This is the default color space for Color Buddy.";
+  static advancedSpace = false;
   axisLabel = (num: number) => `${Math.round(num)}`;
 
   toString(): string {
@@ -250,6 +252,7 @@ class HSV extends Color {
   static dimensionToChannel = { x: "s", y: "h", z: "v" };
   static description =
     "HSV is a cylindrical color space. H is hue, S is saturation, and V is value.";
+  static advancedSpace = false;
   toString(): string {
     const [h, s, v] = this.stringChannels();
     return `color(hsv ${h} ${s} ${v})`;
@@ -312,6 +315,7 @@ class HSL extends Color {
   static dimensionToChannel = { x: "s", y: "h", z: "l" };
   static description =
     "HSL is a cylindrical color space. H is hue, S is saturation, and L is lightness.";
+  static advancedSpace = false;
   isPolar = true;
 
   toString(): string {
@@ -333,6 +337,7 @@ class LCH extends Color {
   static dimensionToChannel = { x: "c", y: "h", z: "l" };
   static description =
     "LCH is a cylindrical color space. L is lightness, C is chroma, and H is hue.";
+  static advancedSpace = false;
   isPolar = true;
   axisLabel = (num: number) => `${Math.round(num)}`;
 }
@@ -347,6 +352,14 @@ class OKLAB extends Color {
   static dimensionToChannel = { x: "a", y: "b", z: "l" };
   static description =
     "OKLAB is a perceptually uniform color space. It is a refinement of CIELAB. ";
+  toString(): string {
+    const [l, a, b] = Object.values(this.channels);
+    return `oklab(${l} ${a} ${b})`;
+  }
+  toPrettyString(): string {
+    const [l, a, b] = this.prettyChannels();
+    return `oklab(${l} ${a} ${b})`;
+  }
 }
 
 class OKLCH extends Color {
@@ -481,8 +494,8 @@ const colorDirectory = {
   jzazbz: JZAZBZ,
   lab: CIELAB,
   lch: LCH,
-  // oklab: OKLAB,
-  // oklch: OKLCH,
+  oklab: OKLAB,
+  oklch: OKLCH,
   rgb: RGB,
   // srgb: RGB,
   srgb: SRGB,
@@ -498,6 +511,7 @@ export const colorPickerConfig = Object.fromEntries(
     return [
       name,
       {
+        advancedSpace: space.advancedSpace,
         axisLabel: exampleColor.axisLabel,
         description: space.description,
         isPolar: exampleColor.isPolar,