diff --git a/packages/kittik-shape-code/src/Code.ts b/packages/kittik-shape-code/src/Code.ts
index 3199084..82bdcd5 100644
--- a/packages/kittik-shape-code/src/Code.ts
+++ b/packages/kittik-shape-code/src/Code.ts
@@ -1,10 +1,14 @@
 import { Shape, ShapeRenderable } from 'kittik-shape-basic';
 import { Canvas } from 'terminal-canvas';
+import { CodeOptions } from './CodeOptions';
 import { DEFAULT_THEME } from './themes/default';
 import { js_beautify as beautify } from 'js-beautify';
 import redeyed from 'redeyed';
 
-export class Code extends Shape implements ShapeRenderable {
+export { CodeObject } from './CodeObject';
+export { CodeOptions } from './CodeOptions';
+
+export class Code extends Shape implements CodeOptions, ShapeRenderable {
   public get text (): string {
     return beautify(this.rawText, { indent_size: 2 });
   }
diff --git a/packages/kittik-shape-code/src/CodeObject.ts b/packages/kittik-shape-code/src/CodeObject.ts
new file mode 100644
index 0000000..731afa5
--- /dev/null
+++ b/packages/kittik-shape-code/src/CodeObject.ts
@@ -0,0 +1,6 @@
+import { CodeOptions } from './CodeOptions';
+import { ShapeObject } from 'kittik-shape-basic';
+
+export interface CodeObject extends ShapeObject {
+  options?: Partial<CodeOptions>
+}
diff --git a/packages/kittik-shape-code/src/CodeOptions.ts b/packages/kittik-shape-code/src/CodeOptions.ts
new file mode 100644
index 0000000..5c46b7d
--- /dev/null
+++ b/packages/kittik-shape-code/src/CodeOptions.ts
@@ -0,0 +1,3 @@
+import { ShapeOptions } from 'kittik-shape-basic';
+
+export type CodeOptions = ShapeOptions;
diff --git a/packages/kittik-shape-rectangle/src/Rectangle.ts b/packages/kittik-shape-rectangle/src/Rectangle.ts
index 69d1852..b957b61 100644
--- a/packages/kittik-shape-rectangle/src/Rectangle.ts
+++ b/packages/kittik-shape-rectangle/src/Rectangle.ts
@@ -1,7 +1,11 @@
 import { Shape, ShapeRenderable } from 'kittik-shape-basic';
 import { Canvas } from 'terminal-canvas';
+import { RectangleOptions } from './RectangleOptions';
 
-export class Rectangle extends Shape implements ShapeRenderable {
+export { RectangleObject } from './RectangleObject';
+export { RectangleOptions } from './RectangleOptions';
+
+export class Rectangle extends Shape implements RectangleOptions, ShapeRenderable {
   public render <T extends Canvas>(canvas: T): void {
     super.render(canvas);
 
diff --git a/packages/kittik-shape-rectangle/src/RectangleObject.ts b/packages/kittik-shape-rectangle/src/RectangleObject.ts
new file mode 100644
index 0000000..5b730a5
--- /dev/null
+++ b/packages/kittik-shape-rectangle/src/RectangleObject.ts
@@ -0,0 +1,6 @@
+import { RectangleOptions } from './RectangleOptions';
+import { ShapeObject } from 'kittik-shape-basic';
+
+export interface RectangleObject extends ShapeObject {
+  options?: Partial<RectangleOptions>
+}
diff --git a/packages/kittik-shape-rectangle/src/RectangleOptions.ts b/packages/kittik-shape-rectangle/src/RectangleOptions.ts
new file mode 100644
index 0000000..07adb05
--- /dev/null
+++ b/packages/kittik-shape-rectangle/src/RectangleOptions.ts
@@ -0,0 +1,3 @@
+import { ShapeOptions } from 'kittik-shape-basic';
+
+export type RectangleOptions = ShapeOptions;
diff --git a/packages/kittik-slide/src/shape/ShapeBuilder.ts b/packages/kittik-slide/src/shape/ShapeBuilder.ts
index edfd00a..87362c1 100644
--- a/packages/kittik-slide/src/shape/ShapeBuilder.ts
+++ b/packages/kittik-slide/src/shape/ShapeBuilder.ts
@@ -1,69 +1,61 @@
-import { SHAPES, ShapeType } from './Shapes';
-import { ShapeObject, ShapeOptions, ShapeRenderable } from 'kittik-shape-basic';
+import { SHAPES, ShapeOptions, ShapeType } from './Shapes';
+import { ShapeObject, ShapeRenderable } from 'kittik-shape-basic';
 
-export class ShapeBuilder implements ShapeObject {
-  public type: ShapeType;
-  public options?: Partial<ShapeOptions>;
+export class ShapeBuilder<T extends ShapeType, O extends ShapeOptions<T>> implements ShapeObject {
+  public type: T;
+  public options: Partial<O>;
 
-  public constructor (type: ShapeType) {
+  public constructor (type: T) {
     this.type = type;
+    this.options = {};
   }
 
-  public static start (type: ShapeType): ShapeBuilder {
+  public static start <T extends ShapeType, O extends ShapeOptions<T>>(type: T): ShapeBuilder<T, O> {
     return new this(type);
   }
 
-  public withType (type: ShapeType): this {
+  public withType (type: T): this {
     this.type = type;
-
     return this;
   }
 
-  public withOptions (options: Partial<ShapeOptions>): this {
+  public withOptions (options: Partial<O>): this {
     this.options = { ...this.options, ...options };
-
     return this;
   }
 
-  public withText (text: string): this {
-    this.options = { ...this.options, text };
-
+  public withText (text: O['text']): this {
+    this.options.text = text;
     return this;
   }
 
-  public withX (x: string): this {
-    this.options = { ...this.options, x };
-
+  public withX (x: O['x']): this {
+    this.options.x = x;
     return this;
   }
 
-  public withY (y: string): this {
-    this.options = { ...this.options, y };
-
+  public withY (y: O['y']): this {
+    this.options.y = y;
     return this;
   }
 
-  public withWidth (width: string): this {
-    this.options = { ...this.options, width };
-
+  public withWidth (width: O['width']): this {
+    this.options.width = width;
     return this;
   }
 
-  public withHeight (height: string): this {
-    this.options = { ...this.options, height };
-
+  public withHeight (height: O['height']): this {
+    this.options.height = height;
     return this;
   }
 
-  public withBackground (background: string): this {
-    this.options = { ...this.options, background };
-
+  public withBackground (background: O['background']): this {
+    this.options.background = background;
     return this;
   }
 
-  public withForeground (foreground: string): this {
-    this.options = { ...this.options, foreground };
-
+  public withForeground (foreground: O['foreground']): this {
+    this.options.foreground = foreground;
     return this;
   }
 
diff --git a/packages/kittik-slide/src/shape/Shapes.ts b/packages/kittik-slide/src/shape/Shapes.ts
index 28881c2..d5dabed 100644
--- a/packages/kittik-slide/src/shape/Shapes.ts
+++ b/packages/kittik-slide/src/shape/Shapes.ts
@@ -1,14 +1,37 @@
-import { ShapeObject, ShapeRenderable } from 'kittik-shape-basic';
-import { Code } from 'kittik-shape-code';
-import { FigText } from 'kittik-shape-fig-text';
-import { Image } from 'kittik-shape-image';
-import { Rectangle } from 'kittik-shape-rectangle';
-import { Text } from 'kittik-shape-text';
+import { Code, CodeObject, CodeOptions } from 'kittik-shape-code';
+import { FigText, FigTextObject, FigTextOptions } from 'kittik-shape-fig-text';
+import { Image, ImageObject, ImageOptions } from 'kittik-shape-image';
+import { Rectangle, RectangleObject, RectangleOptions } from 'kittik-shape-rectangle';
+import { Text, TextObject, TextOptions } from 'kittik-shape-text';
+import { Shape } from 'kittik-shape-basic';
 
 export type ShapeType = 'Code' | 'FigText' | 'Image' | 'Rectangle' | 'Text';
 
-// eslint-disable-next-line @typescript-eslint/no-extra-parens
-export const SHAPES = new Map<ShapeType, { fromObject: <T extends ShapeObject>(obj: T) => ShapeRenderable }>([
+export type ShapeOptions<T extends ShapeType> = T extends 'Code'
+  ? CodeOptions
+  : T extends 'FigText'
+    ? FigTextOptions
+    : T extends 'Image'
+      ? ImageOptions
+      : T extends 'Rectangle'
+        ? RectangleOptions
+        : T extends 'Text'
+          ? TextOptions
+          : never;
+
+export type ShapeObject<T extends ShapeType> = T extends 'Code'
+  ? CodeObject
+  : T extends 'FigText'
+    ? FigTextObject
+    : T extends 'Image'
+      ? ImageObject
+      : T extends 'Rectangle'
+        ? RectangleObject
+        : T extends 'Text'
+          ? TextObject
+          : never;
+
+export const SHAPES = new Map<ShapeType, typeof Shape>([
   ['Code', Code],
   ['FigText', FigText],
   ['Image', Image],