diff --git a/src/windows/tabs/tabWindow.ts b/src/windows/tabs/tabWindow.ts
index a1a1352..9355d88 100644
--- a/src/windows/tabs/tabWindow.ts
+++ b/src/windows/tabs/tabWindow.ts
@@ -62,24 +62,29 @@ export interface TabWindowParams extends BaseWindowParams
 /**
  * Create a new flexiblely designed window that has tabs. An arrow function can be used to create windows to fit a specific viewmodel.
  *
- * @example <caption>Create a simple window</caption>
- *
+ * @example
  * const template = tabwindow({ title: "Hello world!" })
  *
  * template.open()
- *
- * @example <caption>Create a window based on a viewmodel</caption>
- *
+ */
+export function tabwindow(params: TabWindowParams): WindowTemplate<void>;
+/**
+ * Create a new flexiblely designed window that has tabs. An arrow function can be used to create windows to fit a specific viewmodel.
+ * *
+ * @example
  * class MyModel
  * {
  *     header: store("Hello world!")
  * };
- * const template = tabwindow<MyModel>(model => ({ title: model.header }))
+ *
+ * const template = tabwindow<MyModel>(model =>
+ * ({
+ *     title: model.header
+ * }))
  *
  * template.open(new MyModel())
  */
-export function tabwindow<TModel>(params: (model: TModel) => TabWindowParams): WindowTemplate<TModel>;
-export function tabwindow(params: TabWindowParams): WindowTemplate<void>;
+export function tabwindow<TModel extends object>(params: (model: TModel) => TabWindowParams): WindowTemplate<TModel>;
 export function tabwindow<T>(params: ((model: T) => TabWindowParams) | TabWindowParams): WindowTemplate<T>
 {
 	Log.debug("tabwindow() started");
diff --git a/src/windows/window.ts b/src/windows/window.ts
index 7e7a385..d4e3cf5 100644
--- a/src/windows/window.ts
+++ b/src/windows/window.ts
@@ -31,24 +31,29 @@ export interface WindowParams extends BaseWindowParams, FlexibleDirectionalLayou
 /**
  * Create a new flexiblely designed window.
  *
- * @example <caption>Create a simple window</caption>
- *
+ * @example
  * const template = window({ title: "Hello world!" })
  *
  * template.open()
+ */
+export function window(params: WindowParams): WindowTemplate<void>;
+/**
+ * Create a new flexiblely designed window with a viewmodel.
  *
- * @example <caption>Create a window based on a viewmodel</caption>
- *
+ * @example
  * class MyModel
  * {
  *     header: store("Hello world!")
  * };
- * const template = window<MyModel>(model => ({ title: model.header }))
+ *
+ * const template = window<MyModel>(model =>
+ * ({
+ *     title: model.header
+ * }))
  *
  * template.open(new MyModel())
  */
-export function window<TModel>(params: (model: TModel) => WindowParams): WindowTemplate<TModel>;
-export function window(params: WindowParams): WindowTemplate<void>;
+export function window<TModel extends object>(params: (model: TModel) => WindowParams): WindowTemplate<TModel>;
 export function window<T>(params: ((model: T) => WindowParams) | WindowParams): WindowTemplate<T>
 {
 	Log.debug("window() started");