diff --git a/package.json b/package.json
index 5ffe7d7f..0fd7ac04 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "docs": "typedoc && node ./website/docs/scripts/fixdocs.js"
   },
   "dependencies": {
-    "@nodegui/nodegui": "^0.40.1",
+    "@nodegui/nodegui": "^0.57.1",
     "@types/react-reconciler": "^0.18.0",
     "phin": "3.5.1",
     "react-deep-force-update": "^2.1.3",
diff --git a/src/components/AbstractComponents/RNAbstractButton.ts b/src/components/AbstractComponents/RNAbstractButton.ts
index fc993b30..09092f4b 100644
--- a/src/components/AbstractComponents/RNAbstractButton.ts
+++ b/src/components/AbstractComponents/RNAbstractButton.ts
@@ -4,7 +4,7 @@ import { QAbstractButton } from "@nodegui/nodegui";
 
 /**
  * The Button component provides ability to add and manipulate native button widgets. It is based on
- * [NodeGui's QPushButton](https://docs.nodegui.org/docs/api/QPushButton).
+ * [NodeGui's QPushButton](https://docs.nodegui.org/docs/api/generated/classes/QPushButton).
  * ## Example
  * ```javascript
  * import React from "react";
@@ -30,15 +30,15 @@ export interface AbstractButtonProps<Signals extends QAbstractButtonSignals>
    */
   children?: string;
   /**
-   * Sets the given text to the button. [QPushButton: setText](https://docs.nodegui.org/docs/api/QPushButton#buttonsettexttext)
+   * Sets the given text to the button. [QPushButton: setText](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonsettexttext)
    */
   text?: string;
   /**
-   * Sets an icon in the button. [QPushButton: setIcon](https://docs.nodegui.org/docs/api/QPushButton#buttonseticonicon)
+   * Sets an icon in the button. [QPushButton: setIcon](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonseticonicon)
    */
   icon?: QIcon;
   /**
-   * Sets an icon size in the button. [QPushButton: setIconSize](https://docs.nodegui.org/docs/api/QPushButton#buttonseticonsize)
+   * Sets an icon size in the button. [QPushButton: setIconSize](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonseticonsize)
    */
   iconSize?: QSize;
 }
diff --git a/src/components/Action/RNAction.ts b/src/components/Action/RNAction.ts
index ba44cd5c..485ca481 100644
--- a/src/components/Action/RNAction.ts
+++ b/src/components/Action/RNAction.ts
@@ -38,7 +38,7 @@ export interface ActionProps extends RNProps {
   icon?: QIcon;
 
   /**
-   * Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+   * Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
    */
   id?: string;
 
diff --git a/src/components/AnimatedImage/RNAnimatedImage.ts b/src/components/AnimatedImage/RNAnimatedImage.ts
index b39dcdea..1b7f7062 100644
--- a/src/components/AnimatedImage/RNAnimatedImage.ts
+++ b/src/components/AnimatedImage/RNAnimatedImage.ts
@@ -1,4 +1,4 @@
-import { QLabel, NodeWidget, QMovie, QSize } from "@nodegui/nodegui";
+import { QLabel, QWidget, QMovie, QSize } from "@nodegui/nodegui";
 import { TextProps, setTextProps } from "../Text/RNText";
 import { RNWidget } from "../config";
 import { throwUnsupported, isValidUrl } from "../../utils/helpers";
@@ -44,16 +44,16 @@ export class RNAnimatedImage extends QLabel implements RNWidget {
   setProps(newProps: AnimatedImageProps, oldProps: AnimatedImageProps): void {
     setAnimatedImageProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "animatedimage";
diff --git a/src/components/BoxView/RNBoxView.ts b/src/components/BoxView/RNBoxView.ts
index 9cc7e455..15035f3f 100644
--- a/src/components/BoxView/RNBoxView.ts
+++ b/src/components/BoxView/RNBoxView.ts
@@ -2,12 +2,13 @@ import {
   QWidget,
   QBoxLayoutSignals,
   QBoxLayout,
-  NodeWidget,
   Direction,
+  QLayout,
+  QObjectSignals,
 } from "@nodegui/nodegui";
 import { ViewProps, setViewProps } from "../View/RNView";
 import { RNComponent } from "../config";
-import { NodeDialog } from "@nodegui/nodegui/dist/lib/QtWidgets/QDialog";
+import { QDialog } from "@nodegui/nodegui/dist/lib/QtWidgets/QDialog";
 
 export interface BoxViewProps extends ViewProps<QBoxLayoutSignals> {
   direction?: Direction;
@@ -20,7 +21,7 @@ const setBoxViewProps = (
 ) => {
   const setter: BoxViewProps = {
     set direction(direction: Direction) {
-      widget.layout?.setDirection(direction);
+      widget.layout()?.setDirection(direction);
     },
   };
   Object.assign(setter, newProps);
@@ -33,33 +34,36 @@ const setBoxViewProps = (
 export class RNBoxView extends QWidget implements RNComponent {
   native: any;
   initialProps?: BoxViewProps;
-  children: Array<NodeWidget<any>> = [];
-  get layout() {
-    return super.layout as QBoxLayout | undefined;
+  _children: Array<QWidget<any>> = [];
+
+  layout(): QBoxLayout | null {
+    return super.layout() as any;
   }
-  set layout(l: QBoxLayout | undefined) {
-    super.layout = l;
+
+  setLayout(layout: QBoxLayout): void {
+    super.setLayout(layout);
   }
+
   setProps(newProps: BoxViewProps, oldProps: BoxViewProps): void {
-    if (this.layout) {
+    if (this.layout()) {
       setBoxViewProps(this, newProps, oldProps);
     } else {
       this.initialProps = newProps;
     }
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     this.appendChild(child);
   }
-  appendChild(child: NodeWidget<any>): void {
-    if (child instanceof NodeDialog) {
+  appendChild(child: QWidget<any>): void {
+    if (child instanceof QDialog) {
       return;
     }
     const updateChild = () => {
-      this.layout?.addWidget(child);
-      this.children.push(child);
+      this.layout()?.addWidget(child);
+      this._children.push(child);
     };
 
-    if (this.layout) {
+    if (this.layout()) {
       updateChild();
 
       return;
@@ -67,7 +71,6 @@ export class RNBoxView extends QWidget implements RNComponent {
 
     const layout = new QBoxLayout(Direction.LeftToRight);
     this.setLayout(layout);
-    this.layout = layout;
 
     // Newly created layout, so set initial props
     if (this.initialProps) {
@@ -76,11 +79,11 @@ export class RNBoxView extends QWidget implements RNComponent {
 
     updateChild();
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
-    if (child instanceof NodeDialog) {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
+    if (child instanceof QDialog) {
       return;
     }
-    const prevIndex = this.children.indexOf(beforeChild);
+    const prevIndex = this._children.indexOf(beforeChild);
 
     if (prevIndex === -1) {
       throw new Error(
@@ -88,14 +91,14 @@ export class RNBoxView extends QWidget implements RNComponent {
       );
     }
 
-    this.children.splice(prevIndex, 0, child);
-    this.layout?.insertWidget(prevIndex, child);
+    this._children.splice(prevIndex, 0, child);
+    this.layout()?.insertWidget(prevIndex, child);
   }
-  removeChild(child: NodeWidget<any>): void {
-    const prevIndex = this.children.indexOf(child);
+  removeChild(child: QWidget<any>): void {
+    const prevIndex = this._children.indexOf(child);
 
     if (prevIndex !== -1) {
-      this.children.splice(prevIndex, 1);
+      this._children.splice(prevIndex, 1);
     }
 
     child.close();
diff --git a/src/components/Button/RNButton.ts b/src/components/Button/RNButton.ts
index f5c9f62a..f2bac8fe 100644
--- a/src/components/Button/RNButton.ts
+++ b/src/components/Button/RNButton.ts
@@ -1,4 +1,4 @@
-import { QPushButton, NodeWidget, QPushButtonSignals } from "@nodegui/nodegui";
+import { QPushButton, QWidget, QPushButtonSignals } from "@nodegui/nodegui";
 import {
   AbstractButtonProps,
   setAbstractButtonProps
@@ -8,7 +8,7 @@ import { throwUnsupported } from "../../utils/helpers";
 
 /**
  * The Button component provides ability to add and manipulate native button widgets. It is based on
- * [NodeGui's QPushButton](https://docs.nodegui.org/docs/api/QPushButton).
+ * [NodeGui's QPushButton](https://docs.nodegui.org/docs/api/generated/classes/QPushButton).
  * ## Example
  * ```javascript
  * import React from "react";
@@ -29,7 +29,7 @@ import { throwUnsupported } from "../../utils/helpers";
  */
 export interface ButtonProps extends AbstractButtonProps<QPushButtonSignals> {
   /**
-   * Sets whether the button border is raised. [QPushButton: setFlat](https://docs.nodegui.org/docs/api/QPushButton#buttonsetflatisflat)
+   * Sets whether the button border is raised. [QPushButton: setFlat](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonsetflatisflat)
    */
   flat?: boolean;
 }
@@ -52,16 +52,16 @@ const setButtonProps = (
  * @ignore
  */
 export class RNButton extends QPushButton implements RNWidget {
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   setProps(newProps: ButtonProps, oldProps: ButtonProps) {
diff --git a/src/components/CheckBox/RNCheckBox.ts b/src/components/CheckBox/RNCheckBox.ts
index e8441210..43b98773 100644
--- a/src/components/CheckBox/RNCheckBox.ts
+++ b/src/components/CheckBox/RNCheckBox.ts
@@ -1,4 +1,4 @@
-import { QCheckBox, NodeWidget, QCheckBoxSignals } from "@nodegui/nodegui";
+import { QCheckBox, QWidget, QCheckBoxSignals } from "@nodegui/nodegui";
 import { RNWidget } from "../config";
 import { throwUnsupported } from "../../utils/helpers";
 import {
@@ -8,7 +8,7 @@ import {
 
 /**
  * The CheckBox component provides ability to add and manipulate native button widgets. It is based on
- * [NodeGui's QCheckBox](https://docs.nodegui.org/docs/api/QCheckBox).
+ * [NodeGui's QCheckBox](https://docs.nodegui.org/docs/api/generated/classes/QCheckBox).
  * ## Example
  * ```javascript
  * import React from "react";
@@ -29,7 +29,7 @@ import {
  */
 export interface CheckBoxProps extends AbstractButtonProps<QCheckBoxSignals> {
   /**
-   * This property holds whether the button is checked. [QCheckBox: setChecked](https://docs.nodegui.org/docs/api/QCheckBox/#checkboxsetcheckedcheck)
+   * This property holds whether the button is checked. [QCheckBox: setChecked](https://docs.nodegui.org/docs/api/generated/classes/QCheckBox/#checkboxsetcheckedcheck)
    */
   checked?: boolean;
 }
@@ -55,16 +55,16 @@ export class RNCheckBox extends QCheckBox implements RNWidget {
   setProps(newProps: CheckBoxProps, oldProps: CheckBoxProps): void {
     setCheckBoxProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "checkbox";
diff --git a/src/components/ColorDialog/RNColorDialog.ts b/src/components/ColorDialog/RNColorDialog.ts
index b6b2fa54..5686fcef 100644
--- a/src/components/ColorDialog/RNColorDialog.ts
+++ b/src/components/ColorDialog/RNColorDialog.ts
@@ -1,4 +1,4 @@
-import { NodeWidget, QColor, QColorDialog, QColorDialogSignals } from "@nodegui/nodegui";
+import { QWidget, QColor, QColorDialog, QColorDialogSignals } from "@nodegui/nodegui";
 import { ColorDialogOption } from "@nodegui/nodegui/dist/lib/QtWidgets/QColorDialog";
 import { throwUnsupported } from "../../utils/helpers";
 import { RNWidget } from "../config";
@@ -31,16 +31,16 @@ export class RNColorDialog extends QColorDialog implements RNWidget {
   setProps(newProps: ColorDialogProps, oldProps: ColorDialogProps): void {
     setColorDialogProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "color-dialog";
diff --git a/src/components/ComboBox/RNComboBox.ts b/src/components/ComboBox/RNComboBox.ts
index ebb21ab5..da2deea5 100644
--- a/src/components/ComboBox/RNComboBox.ts
+++ b/src/components/ComboBox/RNComboBox.ts
@@ -1,6 +1,6 @@
 import {
   QComboBox,
-  NodeWidget,
+  QWidget,
   QSize,
   QVariant,
   SizeAdjustPolicy,
@@ -52,7 +52,7 @@ const setComboBoxProps = (
       widget.setProperty("count", count);
     },
     set iconSize(iconSize: QSize) {
-      widget.setProperty("iconSize", iconSize.native);
+      widget.setProperty("iconSize", iconSize.native!);
     },
     set frame(frame: boolean) {
       widget.setProperty("frame", frame);
@@ -61,7 +61,7 @@ const setComboBoxProps = (
       widget.setProperty("currentIndex", currentIndex);
     },
     set currentData(value: QVariant) {
-      widget.setProperty("currentData", value.native);
+      widget.setProperty("currentData", value.native!);
     },
     set currentText(text: string) {
       widget.setProperty("currentText", text);
@@ -102,16 +102,16 @@ export class RNComboBox extends QComboBox implements RNWidget {
   setProps(newProps: ComboBoxProps, oldProps: ComboBoxProps): void {
     setComboBoxProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "combobox";
diff --git a/src/components/Dial/RNDial.ts b/src/components/Dial/RNDial.ts
index b2cb70e4..959f74e0 100644
--- a/src/components/Dial/RNDial.ts
+++ b/src/components/Dial/RNDial.ts
@@ -1,4 +1,4 @@
-import { QDial, NodeWidget, QDialSignals } from "@nodegui/nodegui";
+import { QDial, QWidget, QDialSignals } from "@nodegui/nodegui";
 import { ViewProps, setViewProps } from "../View/RNView";
 import { RNWidget } from "../config";
 import { throwUnsupported } from "../../utils/helpers";
@@ -53,16 +53,16 @@ export class RNDial extends QDial implements RNWidget {
   setProps(newProps: DialProps, oldProps: DialProps): void {
     setDialProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "dial";
diff --git a/src/components/Dialog/RNDialog.ts b/src/components/Dialog/RNDialog.ts
index 70f5a161..eb875fcb 100644
--- a/src/components/Dialog/RNDialog.ts
+++ b/src/components/Dialog/RNDialog.ts
@@ -1,9 +1,8 @@
-import { FlexLayout, FocusReason, NodeWidget, QDialog, QDialogSignals, QFont } from "@nodegui/nodegui";
-import { NodeDialog } from "@nodegui/nodegui/dist/lib/QtWidgets/QDialog";
+import { FlexLayout, FocusReason, QWidget, QDialog, QDialogSignals, QFont } from "@nodegui/nodegui";
 import { RNWidget } from "../config";
 import { setViewProps, ViewProps } from "../View/RNView";
 
-export interface DialogProps<T = QDialogSignals> extends ViewProps<T> {
+export interface DialogProps<T extends {} = QDialogSignals> extends ViewProps<T> {
   open?: boolean;
   font?: QFont;
   focus?: FocusReason;
@@ -45,32 +44,31 @@ export class RNDialog extends QDialog implements RNWidget {
   setProps(newProps: DialogProps, oldProps: DialogProps): void {
     setDialogProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     this.appendChild(child);
   }
-  appendChild(child: NodeWidget<any>): void {
-    if (!child || child instanceof NodeDialog) {
+  appendChild(child: QWidget<any>): void {
+    if (!child || child instanceof QDialog) {
       return;
     }
-    if (!this.layout) {
+    if (!this.layout()) {
       const flexLayout = new FlexLayout();
       flexLayout.setFlexNode(this.getFlexNode());
       this.setLayout(flexLayout);
-      this.layout = flexLayout;
     }
-    this.layout.addWidget(child);
+    this.layout()!.addWidget(child);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
-    if (child! instanceof NodeDialog) {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
+    if (child! instanceof QDialog) {
       this.appendChild(child);
     }
   }
-  removeChild(child: NodeWidget<any>): void {
-    if (!this.layout) {
+  removeChild(child: QWidget<any>): void {
+    if (!this.layout()) {
       console.warn("parent has no layout to remove child from");
       return;
     }
-    this.layout.removeWidget(child);
+    this.layout()!.removeWidget(child);
     child.close();
   }
   static tagName = "dialog";
diff --git a/src/components/ErrorPrompt/RNErrorPrompt.ts b/src/components/ErrorPrompt/RNErrorPrompt.ts
index c1b6ae11..595bb3d0 100644
--- a/src/components/ErrorPrompt/RNErrorPrompt.ts
+++ b/src/components/ErrorPrompt/RNErrorPrompt.ts
@@ -1,4 +1,4 @@
-import { NodeWidget, QErrorMessage, QErrorMessageSignals } from "@nodegui/nodegui";
+import { QWidget, QErrorMessage, QErrorMessageSignals } from "@nodegui/nodegui";
 import { throwUnsupported } from "../../utils/helpers";
 import { RNWidget } from "../config";
 import { DialogProps, setDialogProps } from "../Dialog/RNDialog";
@@ -22,16 +22,16 @@ export class RNErrorPrompt extends QErrorMessage implements RNWidget {
   setProps(newProps: ErrorPromptProps, oldProps: ErrorPromptProps): void {
     setErrorPromptProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "error-prompt";
diff --git a/src/components/FileDialog/RNFileDialog.ts b/src/components/FileDialog/RNFileDialog.ts
index a4c7ce1c..2bfae6b2 100644
--- a/src/components/FileDialog/RNFileDialog.ts
+++ b/src/components/FileDialog/RNFileDialog.ts
@@ -1,4 +1,4 @@
-import { NodeWidget, QFileDialog, DialogLabel, QFileDialogSignals, Option } from "@nodegui/nodegui";
+import { QWidget, QFileDialog, DialogLabel, QFileDialogSignals, Option } from "@nodegui/nodegui";
 import { throwUnsupported } from "../../utils/helpers";
 import { RNWidget } from "../config";
 import { DialogProps, setDialogProps } from "../Dialog/RNDialog";
@@ -47,16 +47,16 @@ export class RNFileDialog extends QFileDialog implements RNWidget {
   setProps(newProps: FileDialogProps, oldProps: FileDialogProps): void {
     setFileDialogProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "file-dialog";
diff --git a/src/components/FontDialog/RNFontDialog.ts b/src/components/FontDialog/RNFontDialog.ts
index 19771a6e..3bf7f432 100644
--- a/src/components/FontDialog/RNFontDialog.ts
+++ b/src/components/FontDialog/RNFontDialog.ts
@@ -1,4 +1,4 @@
-import { FontDialogOption, NodeWidget, QFont, QFontDialog, QFontDialogSignals } from "@nodegui/nodegui";
+import { FontDialogOption, QWidget, QFont, QFontDialog, QFontDialogSignals } from "@nodegui/nodegui";
 import { throwUnsupported } from "../../utils/helpers";
 import { RNWidget } from "../config";
 import { DialogProps, setDialogProps } from "../Dialog/RNDialog";
@@ -30,16 +30,16 @@ export class RNFontDialog extends QFontDialog implements RNWidget {
   setProps(newProps: FontDialogProps, oldProps: FontDialogProps): void {
     setFontDialogProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "font-dialog";
diff --git a/src/components/GridView/GridColumn/RNGridColumn.ts b/src/components/GridView/GridColumn/RNGridColumn.ts
index 234df6a7..0f5318fb 100644
--- a/src/components/GridView/GridColumn/RNGridColumn.ts
+++ b/src/components/GridView/GridColumn/RNGridColumn.ts
@@ -1,5 +1,5 @@
 import { FunctionComponentElement } from "react";
-import { Component, NodeWidget } from "@nodegui/nodegui";
+import { Component, QWidget } from "@nodegui/nodegui";
 import { RNComponent } from "../../config";
 import { RNGridRow } from "../GridRow/RNGridRow";
 
@@ -18,8 +18,8 @@ const setGridColumnProps = (
 ) => {
   if (widget.actualWidget) {
     // TODO: Optimize this
-    parentRow.parentGrid?.layout?.removeWidget(widget.actualWidget);
-    parentRow.parentGrid?.layout?.addWidget(
+    parentRow.parentGrid?.layout()?.removeWidget(widget.actualWidget);
+    parentRow.parentGrid?.layout()?.addWidget(
       widget.actualWidget,
       parentRow.rowIndex ?? 0,
       widget.columnIndex ?? 0,
@@ -38,7 +38,7 @@ const setGridColumnProps = (
 
 export class RNGridColumn extends Component implements RNComponent {
   native: any;
-  actualWidget?: NodeWidget<any>;
+  actualWidget?: QWidget<any>;
   parentRow?: RNGridRow;
   latestProps?: GridColumnProps;
   prevProps?: GridColumnProps;
@@ -61,7 +61,7 @@ export class RNGridColumn extends Component implements RNComponent {
       return;
     }
 
-    this.parentRow?.parentGrid?.layout?.removeWidget(this.actualWidget);
+    this.parentRow?.parentGrid?.layout()?.removeWidget(this.actualWidget);
     this.actualWidget.close();
     this.actualWidget = undefined;
   }
@@ -76,19 +76,19 @@ export class RNGridColumn extends Component implements RNComponent {
     this.latestProps = newProps;
     this.prevProps = oldProps;
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     if (this.actualWidget) {
       throw new Error("Grid column can have only one child");
     }
     this.actualWidget = child;
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     this.appendInitialChild(child);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     this.appendInitialChild(child);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     this.remove();
   }
   static tagName: string = "gridcolumn";
diff --git a/src/components/GridView/GridColumn/index.ts b/src/components/GridView/GridColumn/index.ts
index 132e9250..74b1a613 100644
--- a/src/components/GridView/GridColumn/index.ts
+++ b/src/components/GridView/GridColumn/index.ts
@@ -14,7 +14,7 @@ class GridColumnConfig extends ComponentConfig {
     context: any,
     workInProgress: Fiber
   ): RNGridColumn {
-    const widget = new RNGridColumn();
+    const widget = new RNGridColumn(null!);
     widget.setProps(newProps, newProps);
     return widget;
   }
diff --git a/src/components/GridView/GridRow/index.ts b/src/components/GridView/GridRow/index.ts
index bcd12a05..94b69dec 100644
--- a/src/components/GridView/GridRow/index.ts
+++ b/src/components/GridView/GridRow/index.ts
@@ -14,7 +14,7 @@ class GridRowConfig extends ComponentConfig {
     context: any,
     workInProgress: Fiber
   ): RNGridRow {
-    const widget = new RNGridRow();
+    const widget = new RNGridRow(null!);
     widget.setProps(newProps, newProps);
     return widget;
   }
diff --git a/src/components/GridView/RNGridView.ts b/src/components/GridView/RNGridView.ts
index 0483fa92..edb707ee 100644
--- a/src/components/GridView/RNGridView.ts
+++ b/src/components/GridView/RNGridView.ts
@@ -1,5 +1,5 @@
 import { FunctionComponentElement } from "react";
-import { QGridLayoutSignals, QGridLayout, QWidget } from "@nodegui/nodegui";
+import { QGridLayoutSignals, QGridLayout, QWidget, QLayout, QObjectSignals } from "@nodegui/nodegui";
 import { ViewProps, setViewProps } from "../View/RNView";
 import { RNComponent } from "../config";
 import { RNGridRow, GridRowProps } from "./GridRow/RNGridRow";
@@ -42,18 +42,18 @@ const setGridViewProps = (
 ) => {
   const setter: Omit<GridViewProps, "children"> = {
     set horizontalSpacing(spacing: number) {
-      widget.layout?.setHorizontalSpacing(spacing);
+      widget.layout()?.setHorizontalSpacing(spacing);
     },
     set verticalSpacing(spacing: number) {
-      widget.layout?.setVerticalSpacing(spacing);
+      widget.layout()?.setVerticalSpacing(spacing);
     },
     set columnProps(props: GridViewColumnProps) {
       for (const indexString of Object.keys(props)) {
         const index = parseInt(indexString, 10);
         const { stretch, minWidth } = props[index];
 
-        widget.layout?.setColumnStretch(index, stretch ?? 0);
-        widget.layout?.setColumnMinimumWidth(index, minWidth ?? 0);
+        widget.layout()?.setColumnStretch(index, stretch ?? 0);
+        widget.layout()?.setColumnMinimumWidth(index, minWidth ?? 0);
       }
     },
     set rowProps(props: GridViewRowProps) {
@@ -61,8 +61,8 @@ const setGridViewProps = (
         const index = parseInt(indexString, 10);
         const { stretch, minHeight } = props[index];
 
-        widget.layout?.setRowStretch(index, stretch ?? 0);
-        widget.layout?.setRowMinimumHeight(index, minHeight ?? 0);
+        widget.layout()?.setRowStretch(index, stretch ?? 0);
+        widget.layout()?.setRowMinimumHeight(index, minHeight ?? 0);
       }
     },
   };
@@ -75,16 +75,15 @@ const setGridViewProps = (
  */
 export class RNGridView extends QWidget implements RNComponent {
   native: any;
-  _layout?: QGridLayout;
   initialProps?: GridViewProps;
   childRows: Array<DataWithOffset<RNGridRow>> = [];
 
-  get layout() {
-    return this._layout;
+  layout(): QGridLayout | null {
+    return super.layout() as any;
   }
 
-  set layout(l: QGridLayout | undefined) {
-    this._layout = l;
+  setLayout(layout: QGridLayout): void {
+    super.setLayout(layout);
   }
 
   updateChildren(startIndex = 0): void {
@@ -100,7 +99,7 @@ export class RNGridView extends QWidget implements RNComponent {
   /* RNComponent */
 
   setProps(newProps: GridViewProps, oldProps: GridViewProps): void {
-    if (this.layout) {
+    if (this.layout()) {
       setGridViewProps(this, newProps, oldProps);
     } else {
       this.initialProps = newProps;
@@ -129,7 +128,7 @@ export class RNGridView extends QWidget implements RNComponent {
       });
     };
 
-    if (this.layout) {
+    if (this.layout()) {
       updateChild();
 
       return;
@@ -137,7 +136,6 @@ export class RNGridView extends QWidget implements RNComponent {
 
     const layout = new QGridLayout();
     this.setLayout(layout);
-    this.layout = layout;
 
     // Newly created layout, so set initial props
     if (this.initialProps) {
diff --git a/src/components/Image/RNImage.ts b/src/components/Image/RNImage.ts
index af000d94..1c66b6b9 100644
--- a/src/components/Image/RNImage.ts
+++ b/src/components/Image/RNImage.ts
@@ -2,7 +2,7 @@ import {
   QLabel,
   QPixmap,
   AspectRatioMode,
-  NodeWidget,
+  QWidget,
   QSize,
   TransformationMode,
 } from "@nodegui/nodegui";
@@ -77,16 +77,16 @@ export class RNImage extends QLabel implements RNWidget {
   setProps(newProps: ImageProps, oldProps: ImageProps): void {
     setImageProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "image";
diff --git a/src/components/InputDialog/RNInputDialog.ts b/src/components/InputDialog/RNInputDialog.ts
index 3c0be4a1..113eda90 100644
--- a/src/components/InputDialog/RNInputDialog.ts
+++ b/src/components/InputDialog/RNInputDialog.ts
@@ -1,4 +1,4 @@
-import { EchoMode, InputDialogOptions, InputMode, NodeWidget, QInputDialog, QInputDialogSignals } from "@nodegui/nodegui";
+import { EchoMode, InputDialogOptions, InputMode, QWidget, QInputDialog, QInputDialogSignals } from "@nodegui/nodegui";
 import { throwUnsupported } from "../../utils/helpers";
 import { RNWidget } from "../config";
 import { DialogProps, setDialogProps } from "../Dialog/RNDialog";
@@ -85,16 +85,16 @@ export class RNInputDialog extends QInputDialog implements RNWidget {
   setProps(newProps: InputDialogProps, oldProps: InputDialogProps): void {
     setInputDialogProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "input-dialog";
diff --git a/src/components/LineEdit/RNLineEdit.ts b/src/components/LineEdit/RNLineEdit.ts
index 5f165a6e..2a6eca10 100644
--- a/src/components/LineEdit/RNLineEdit.ts
+++ b/src/components/LineEdit/RNLineEdit.ts
@@ -1,7 +1,7 @@
 import {
   QLineEdit,
   EchoMode,
-  NodeWidget,
+  QWidget,
   QLineEditSignals
 } from "@nodegui/nodegui";
 import { ViewProps, setViewProps } from "../View/RNView";
@@ -66,16 +66,16 @@ export class RNLineEdit extends QLineEdit implements RNWidget {
   setProps(newProps: LineEditProps, oldProps: LineEditProps): void {
     setLineEditProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "linedit";
diff --git a/src/components/List/RNList.ts b/src/components/List/RNList.ts
index 86c4bd6a..f5a5a11a 100644
--- a/src/components/List/RNList.ts
+++ b/src/components/List/RNList.ts
@@ -36,7 +36,7 @@ export class RNList extends QListWidget implements RNComponent {
     this.appendChild(child);
   }
   appendChild(child: RNListItem): void {
-    if (!this.layout) {
+    if (!this.layout()) {
       this.setLayout(new FlexLayout());
     }
 
diff --git a/src/components/ListItem/RNListItem.ts b/src/components/ListItem/RNListItem.ts
index 148385f0..b8444c47 100644
--- a/src/components/ListItem/RNListItem.ts
+++ b/src/components/ListItem/RNListItem.ts
@@ -1,4 +1,4 @@
-import { NodeWidget, QListWidgetItem, QIcon } from "@nodegui/nodegui";
+import { QWidget, QListWidgetItem, QIcon } from "@nodegui/nodegui";
 import { RNComponent } from "../config";
 
 export interface ListItemProps {
@@ -30,24 +30,24 @@ export const setListItemProps = (
   */
 export class RNListItem extends QListWidgetItem implements RNComponent {
   native: any;
-  actualListItemWidget?: NodeWidget<any>;
+  actualListItemWidget?: QWidget<any>;
 
   setProps(newProps: ListItemProps, oldProps: ListItemProps): void {
     setListItemProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     if (this.actualListItemWidget) {
       throw new Error("ListItem can have only one child");
     }
     this.actualListItemWidget = child;
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     this.appendInitialChild(child);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     this.appendInitialChild(child);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     if (child) {
       child.close();
     }
diff --git a/src/components/Menu/RNMenu.ts b/src/components/Menu/RNMenu.ts
index 68656942..704bedd7 100644
--- a/src/components/Menu/RNMenu.ts
+++ b/src/components/Menu/RNMenu.ts
@@ -1,4 +1,4 @@
-import { QMenu, QMenuSignals, Component, NodeWidget } from "@nodegui/nodegui";
+import { QMenu, QMenuSignals, Component, QWidget } from "@nodegui/nodegui";
 import { RNWidget } from "../config";
 import { throwUnsupported } from "../../utils/helpers";
 import { RNAction } from "../Action/RNAction";
diff --git a/src/components/MenuBar/RNMenuBar.ts b/src/components/MenuBar/RNMenuBar.ts
index ca5acae3..1118a163 100644
--- a/src/components/MenuBar/RNMenuBar.ts
+++ b/src/components/MenuBar/RNMenuBar.ts
@@ -1,4 +1,4 @@
-import { NodeWidget, QMenu, QMenuBar, QMenuBarSignals } from "@nodegui/nodegui";
+import { QWidget, QMenu, QMenuBar, QMenuBarSignals } from "@nodegui/nodegui";
 import { ViewProps, setViewProps } from "../View/RNView";
 import { RNWidget } from "../config";
 import { throwUnsupported } from "../../utils/helpers";
@@ -35,13 +35,13 @@ export class RNMenuBar extends QMenuBar implements RNWidget {
   appendChild(child: QMenu): void {
     this.appendInitialChild(child);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     console.warn(
       "Updating menubar is not yet supported. Please help by raising a PR"
     );
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     console.warn(
       "Updating menubar is not yet supported. Please help by raising a PR"
     );
diff --git a/src/components/PlainTextEdit/RNPlainTextEdit.ts b/src/components/PlainTextEdit/RNPlainTextEdit.ts
index 72d26db2..1bb4af09 100644
--- a/src/components/PlainTextEdit/RNPlainTextEdit.ts
+++ b/src/components/PlainTextEdit/RNPlainTextEdit.ts
@@ -1,6 +1,6 @@
 import {
   QPlainTextEdit,
-  NodeWidget,
+  QWidget,
   QPlainTextEditSignals
 } from "@nodegui/nodegui";
 import { ViewProps, setViewProps } from "../View/RNView";
@@ -66,16 +66,16 @@ export class RNPlainTextEdit extends QPlainTextEdit implements RNWidget {
   setProps(newProps: PlainTextEditProps, oldProps: PlainTextEditProps): void {
     setPlainTextEditProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "plaintextedit";
diff --git a/src/components/ProgressBar/RNProgressBar.ts b/src/components/ProgressBar/RNProgressBar.ts
index 91e0c378..0096d5f7 100644
--- a/src/components/ProgressBar/RNProgressBar.ts
+++ b/src/components/ProgressBar/RNProgressBar.ts
@@ -1,7 +1,7 @@
 import {
   QProgressBar,
   Orientation,
-  NodeWidget,
+  QWidget,
   QProgressBarSignals
 } from "@nodegui/nodegui";
 import { ViewProps, setViewProps } from "../View/RNView";
@@ -62,16 +62,16 @@ export class RNProgressBar extends QProgressBar implements RNWidget {
   setProps(newProps: ProgressBarProps, oldProps: ProgressBarProps): void {
     setProgressBarProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "progressbar";
diff --git a/src/components/ProgressDialog/RNProgressDialog.ts b/src/components/ProgressDialog/RNProgressDialog.ts
index 94c000c7..448eaedb 100644
--- a/src/components/ProgressDialog/RNProgressDialog.ts
+++ b/src/components/ProgressDialog/RNProgressDialog.ts
@@ -1,4 +1,4 @@
-import { NodeWidget, QProgressDialog, QProgressDialogSignals } from "@nodegui/nodegui";
+import { QWidget, QProgressDialog, QProgressDialogSignals } from "@nodegui/nodegui";
 import { throwUnsupported } from "../../utils/helpers";
 import { RNWidget } from "../config";
 import { DialogProps, setDialogProps } from "../Dialog/RNDialog";
@@ -72,16 +72,16 @@ export class RNProgressDialog extends QProgressDialog implements RNWidget {
   setProps(newProps: ProgressDialogProps, oldProps: ProgressDialogProps): void {
     setProgressDialogProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "progress-dialog";
diff --git a/src/components/RadioButton/RNRadioButton.ts b/src/components/RadioButton/RNRadioButton.ts
index ee137dbc..415b3ec0 100644
--- a/src/components/RadioButton/RNRadioButton.ts
+++ b/src/components/RadioButton/RNRadioButton.ts
@@ -1,6 +1,6 @@
 import {
   QRadioButton,
-  NodeWidget,
+  QWidget,
   QRadioButtonSignals
 } from "@nodegui/nodegui";
 import { RNWidget } from "../config";
@@ -34,16 +34,16 @@ export class RNRadioButton extends QRadioButton implements RNWidget {
   setProps(newProps: RadioButtonProps, oldProps: RadioButtonProps): void {
     setRadioButtonProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "radiobutton";
diff --git a/src/components/ScrollArea/RNScrollArea.ts b/src/components/ScrollArea/RNScrollArea.ts
index 0f9a8b78..2cd82f29 100644
--- a/src/components/ScrollArea/RNScrollArea.ts
+++ b/src/components/ScrollArea/RNScrollArea.ts
@@ -1,4 +1,4 @@
-import { QScrollArea, NodeWidget, QScrollAreaSignals } from "@nodegui/nodegui";
+import { QScrollArea, QWidget, QScrollAreaSignals } from "@nodegui/nodegui";
 import { ViewProps, setViewProps } from "../View/RNView";
 import { RNWidget } from "../config";
 
@@ -27,24 +27,24 @@ export class RNScrollArea extends QScrollArea implements RNWidget {
   setProps(newProps: ScrollAreaProps, oldProps: ScrollAreaProps): void {
     setScrollAreaProps(this, newProps, oldProps);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     const removedChild = this.takeWidget();
     if (removedChild) {
       removedChild.close();
     }
     child.close();
   }
-  appendInitialChild(child: NodeWidget<any>): void {
-    if (this.contentWidget) {
+  appendInitialChild(child: QWidget<any>): void {
+    if (this.widget()) {
       console.warn("ScrollView can't have more than one child node");
       return;
     }
     this.setWidget(child);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     this.appendInitialChild(child);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     this.appendInitialChild(child);
   }
   static tagName = "scrollarea";
diff --git a/src/components/Slider/RNSlider.ts b/src/components/Slider/RNSlider.ts
index 7b1b5ca4..500a165d 100644
--- a/src/components/Slider/RNSlider.ts
+++ b/src/components/Slider/RNSlider.ts
@@ -1,4 +1,4 @@
-import { QSlider, NodeWidget, QSliderSignals, TickPosition, Orientation } from '@nodegui/nodegui';
+import { QSlider, QWidget, QSliderSignals, TickPosition, Orientation } from '@nodegui/nodegui';
 import { setViewProps, ViewProps } from '../View/RNView';
 import { RNWidget } from '../config';
 import { throwUnsupported } from '../../utils/helpers';
@@ -77,19 +77,19 @@ export class RNSlider extends QSlider implements RNWidget {
     setSliderProps(this, newProps, oldProps);
   }
 
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
 
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
 
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
 
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
 
diff --git a/src/components/SpinBox/RNSpinBox.ts b/src/components/SpinBox/RNSpinBox.ts
index e546bfb7..68fcf2b4 100644
--- a/src/components/SpinBox/RNSpinBox.ts
+++ b/src/components/SpinBox/RNSpinBox.ts
@@ -1,4 +1,4 @@
-import { QSpinBox, NodeWidget, QSpinBoxSignals } from "@nodegui/nodegui";
+import { QSpinBox, QWidget, QSpinBoxSignals } from "@nodegui/nodegui";
 import { ViewProps, setViewProps } from "../View/RNView";
 import { RNWidget } from "../config";
 import { throwUnsupported } from "../../utils/helpers";
@@ -67,16 +67,16 @@ export class RNSpinBox extends QSpinBox implements RNWidget {
   setProps(newProps: SpinBoxProps, oldProps: SpinBoxProps): void {
     setSpinBoxProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "spinbox";
diff --git a/src/components/SystemTrayIcon/RNSystemTrayIcon.ts b/src/components/SystemTrayIcon/RNSystemTrayIcon.ts
index 4f8a355b..caf25e99 100644
--- a/src/components/SystemTrayIcon/RNSystemTrayIcon.ts
+++ b/src/components/SystemTrayIcon/RNSystemTrayIcon.ts
@@ -2,7 +2,7 @@ import { WidgetEventListeners } from "../View/RNView";
 import {
   QSystemTrayIconSignals,
   QSystemTrayIcon,
-  NodeWidget,
+  QWidget,
   QIcon,
   QMenu,
 } from "@nodegui/nodegui";
@@ -47,7 +47,7 @@ export interface SystemTrayIconProps extends RNProps {
   icon?: QIcon;
 
   /**
-   * Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+   * Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
    */
   id?: string;
 
@@ -62,7 +62,7 @@ export interface SystemTrayIconProps extends RNProps {
   tooltip?: string;
 
   /**
-   * Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+   * Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
    */
   visible?: boolean;
 }
@@ -114,13 +114,15 @@ const setSystemTrayIconProps = (
  */
 export class RNSystemTrayIcon extends QSystemTrayIcon implements RNComponent {
   static tagName = "systemtrayicon";
+  contextMenu: QMenu | null = null;
 
   setProps(newProps: SystemTrayIconProps, oldProps: SystemTrayIconProps): void {
     setSystemTrayIconProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     if (child instanceof QMenu) {
       if (!this.contextMenu) {
+        this.contextMenu = child;
         this.setContextMenu(child);
       } else {
         console.warn("SystemTrayIcon can't have more than one Menu.");
@@ -129,13 +131,13 @@ export class RNSystemTrayIcon extends QSystemTrayIcon implements RNComponent {
       console.warn("SystemTrayIcon only supports Menu as its children");
     }
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     this.appendInitialChild(child);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
 }
diff --git a/src/components/Tab/RNTab.ts b/src/components/Tab/RNTab.ts
index 9333cce7..27219f68 100644
--- a/src/components/Tab/RNTab.ts
+++ b/src/components/Tab/RNTab.ts
@@ -3,7 +3,7 @@ import {
   QTabWidgetSignals,
   TabPosition,
   QIcon,
-  NodeWidget
+  QWidget
 } from "@nodegui/nodegui";
 import { ViewProps, setViewProps } from "../View/RNView";
 import { RNComponent } from "../config";
@@ -56,13 +56,13 @@ export class RNTab extends QTabWidget implements RNComponent {
     if (!(child instanceof RNTabItem)) {
       throw new Error("Children of tab should be of type TabItem");
     }
-    const index = this.indexOf(beforeChild.actualTabWidget as NodeWidget<any>);
-    this.insertTab(index, child.actualTabWidget as NodeWidget<any>, new QIcon(), "");
+    const index = this.indexOf(beforeChild.actualTabWidget as QWidget<any>);
+    this.insertTab(index, child.actualTabWidget as QWidget<any>, new QIcon(), "");
     child.parentTab = this;
     setTabItemProps(child, this, child.initialProps, {});
   }
   removeChild(child: RNTabItem): void {
-    const childIndex = this.indexOf(child.actualTabWidget as NodeWidget<any>);
+    const childIndex = this.indexOf(child.actualTabWidget as QWidget<any>);
     this.removeTab(childIndex);
   }
   static tagName = "tabwidget";
diff --git a/src/components/TabItem/RNTabItem.ts b/src/components/TabItem/RNTabItem.ts
index e35af767..4093a2fe 100644
--- a/src/components/TabItem/RNTabItem.ts
+++ b/src/components/TabItem/RNTabItem.ts
@@ -1,4 +1,4 @@
-import { NodeWidget, QIcon, Component } from "@nodegui/nodegui";
+import { QWidget, QIcon, Component } from "@nodegui/nodegui";
 import { RNComponent, RNProps } from "../config";
 import { RNTab } from "../Tab/RNTab";
 
@@ -41,7 +41,7 @@ export const setTabItemProps = (
  */
 export class RNTabItem extends Component implements RNComponent {
   native: any;
-  actualTabWidget?: NodeWidget<any>;
+  actualTabWidget?: QWidget<any>;
   initialProps: TabItemProps = {};
   parentTab?: RNTab;
 
@@ -52,19 +52,19 @@ export class RNTabItem extends Component implements RNComponent {
       this.initialProps = newProps;
     }
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     if (this.actualTabWidget) {
       throw new Error("Tab Item can have only one child");
     }
     this.actualTabWidget = child;
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     this.appendInitialChild(child);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     this.appendInitialChild(child);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     child.close();
     delete this.actualTabWidget;
   }
diff --git a/src/components/TabItem/index.ts b/src/components/TabItem/index.ts
index 987ae57e..f08d938f 100644
--- a/src/components/TabItem/index.ts
+++ b/src/components/TabItem/index.ts
@@ -14,7 +14,7 @@ class TabItemConfig extends ComponentConfig {
     context: any,
     workInProgress: Fiber
   ): RNTabItem {
-    const item = new RNTabItem();
+    const item = new RNTabItem(null!);
     item.setProps(newProps, {});
     return item;
   }
diff --git a/src/components/Table/RNTable.ts b/src/components/Table/RNTable.ts
index 56bcbf62..d44da2ac 100644
--- a/src/components/Table/RNTable.ts
+++ b/src/components/Table/RNTable.ts
@@ -1,4 +1,4 @@
-import { FlexLayout, NodeWidget, QTableWidget, QTableWidgetItem, QTableWidgetSignals, SortOrder } from "@nodegui/nodegui";
+import { FlexLayout, QWidget, QTableWidget, QTableWidgetItem, QTableWidgetSignals, SortOrder } from "@nodegui/nodegui";
 import { ViewProps, setViewProps } from "../View/RNView";
 import { RNComponent } from "../config";
 import { RNTableItem } from "../TableItem/RNTableItem";
@@ -15,7 +15,7 @@ interface VerticalHeader extends Omit<CellRange, "column"> {
 }
 
 interface CellWidget extends CellRange {
-  widget: NodeWidget<any>;
+  widget: QWidget<any>;
 }
 
 interface Sort extends Omit<CellRange, "row"> {
@@ -150,12 +150,12 @@ export class RNTable extends QTableWidget implements RNComponent {
   setProps(newProps: CustomTableProps, oldProps: CustomTableProps): void {
     setTableProps(this, newProps, oldProps);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     child.close();
   }
   appendInitialChild(child: RNTableItem): void {
     const { cellPosition } = child;
-    if (!this.layout) {
+    if (!this.layout()) {
       this.setLayout(new FlexLayout());
     }
     const row = this.rowCount();
diff --git a/src/components/TableItem/RNTableItem.ts b/src/components/TableItem/RNTableItem.ts
index fa49d917..c184fd86 100644
--- a/src/components/TableItem/RNTableItem.ts
+++ b/src/components/TableItem/RNTableItem.ts
@@ -1,4 +1,4 @@
-import { QTableWidgetItem, NodeWidget, ItemFlag, CheckState, QVariant, QBrush, QIcon, QFont, QSize, AlignmentFlag } from "@nodegui/nodegui";
+import { QTableWidgetItem, QWidget, ItemFlag, CheckState, QVariant, QBrush, QIcon, QFont, QSize, AlignmentFlag } from "@nodegui/nodegui";
 import { RNComponent } from "../config";
 import { throwUnsupported } from "../../utils/helpers";
 
@@ -100,16 +100,16 @@ export class RNTableItem extends QTableWidgetItem implements RNComponent {
     this.cellPosition = newProps.cellPosition;
     setTableItemProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = "table-item";
diff --git a/src/components/Text/RNText.ts b/src/components/Text/RNText.ts
index 717c7a7f..37f75aa0 100644
--- a/src/components/Text/RNText.ts
+++ b/src/components/Text/RNText.ts
@@ -1,4 +1,4 @@
-import { QLabel, NodeWidget, QLabelSignals, TextInteractionFlag } from '@nodegui/nodegui';
+import { QLabel, QWidget, QLabelSignals, TextInteractionFlag } from '@nodegui/nodegui';
 import { ViewProps, setViewProps } from '../View/RNView';
 import { RNWidget } from '../config';
 import { throwUnsupported } from '../../utils/helpers';
@@ -49,16 +49,16 @@ export class RNText extends QLabel implements RNWidget {
   setProps(newProps: TextProps, oldProps: TextProps): void {
     setTextProps(this, newProps, oldProps);
   }
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     throwUnsupported(this);
   }
-  removeChild(child: NodeWidget<any>): void {
+  removeChild(child: QWidget<any>): void {
     throwUnsupported(this);
   }
   static tagName = 'text';
diff --git a/src/components/View/RNView.ts b/src/components/View/RNView.ts
index 93aea513..93b6408a 100644
--- a/src/components/View/RNView.ts
+++ b/src/components/View/RNView.ts
@@ -1,12 +1,12 @@
-import { QWidget, WindowState, QCursor, CursorShape, NodeWidget, QIcon, FlexLayout, WidgetEventTypes, QWidgetSignals } from "@nodegui/nodegui";
+import { QWidget, WindowState, QCursor, CursorShape, QIcon, FlexLayout, WidgetEventTypes, QWidgetSignals, QLayout, QObjectSignals } from "@nodegui/nodegui";
 import { NativeRawPointer } from "@nodegui/nodegui/dist/lib/core/Component";
-import { NodeDialog } from "@nodegui/nodegui/dist/lib/QtWidgets/QDialog";
+import { QDialog } from "@nodegui/nodegui/dist/lib/QtWidgets/QDialog";
 import { RNWidget, RNProps } from "../config";
 
 /**
  * The View component can be used to encapsulate other components and provide structure.
  * It functions similar to a div in the web world. It is based on
- * [NodeGui's QWidget](https://docs.nodegui.org/docs/api/QWidget).
+ * [NodeGui's QWidget](https://docs.nodegui.org/docs/api/generated/classes/QWidget).
  * ## Example
  * ```javascript
  *import React from "react";
@@ -30,67 +30,67 @@ import { RNWidget, RNProps } from "../config";
 
 export interface ViewProps<Signals extends {}> extends RNProps {
   /**
-   * Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+   * Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
    */
   visible?: boolean;
   /**
-   * Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+   * Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
    */
   styleSheet?: string;
   /**
-   * Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+   * Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
    */
   style?: string;
   /**
-   * Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+   * Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
    */
   geometry?: Geometry;
   /**
-   * Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+   * Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
    */
   id?: string;
   /**
-   * Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+   * Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
    */
   mouseTracking?: boolean;
   /**
-   * Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+   * Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
    */
   enabled?: boolean;
   /**
-   * This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+   * This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
    */
   windowOpacity?: number;
   /**
-   * Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+   * Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
    */
   windowTitle?: string;
   /**
-   * Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+   * Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
    */
   windowState?: WindowState;
   /**
-   * Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+   * Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
    */
   cursor?: CursorShape | QCursor;
   /**
-   * Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+   * Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
    */
   windowIcon?: QIcon;
   /**
-   * Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+   * Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
    */
   minSize?: Size;
   /**
-   * Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+   * Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
    */
   maxSize?: Size;
   /**
-   * Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+   * Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
    */
   size?: ViewSize;
   /**
-   * Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+   * Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
    */
   pos?: Position;
   /**
@@ -117,7 +117,7 @@ export interface ViewProps<Signals extends {}> extends RNProps {
 /**
  * @ignore
  */
-export function setViewProps<Signals extends {}>(widget: NodeWidget<any>, newProps: ViewProps<Signals>, oldProps: ViewProps<Signals>) {
+export function setViewProps<Signals extends {}>(widget: QWidget<any>, newProps: ViewProps<Signals>, oldProps: ViewProps<Signals>) {
   const setter: ViewProps<Signals> = {
     set visible(shouldShow: boolean) {
       shouldShow ? widget.show() : widget.hide();
@@ -215,38 +215,46 @@ export function setViewProps<Signals extends {}>(widget: NodeWidget<any>, newPro
  * @ignore
  */
 export class RNView extends QWidget implements RNWidget {
+  private _layout: QLayout<QObjectSignals> | null = null;
+
+  layout() {
+    return this._layout;
+  }
+  setLayout(layout: QLayout<QObjectSignals>) {
+    this._layout = layout;
+    super.setLayout(layout);
+  }
   setProps(newProps: ViewProps<QWidgetSignals>, oldProps: ViewProps<QWidgetSignals>): void {
     setViewProps(this, newProps, oldProps);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
-    if (!this.layout || child instanceof NodeDialog) {
-      !this.layout && console.warn("parent has no layout to insert child before another child");
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
+    if (!this.layout() || child instanceof QDialog) {
+      !this.layout() && console.warn("parent has no layout to insert child before another child");
       return;
     }
-    (this.layout as FlexLayout).insertChildBefore(child, beforeChild);
+    (this.layout() as FlexLayout).insertChildBefore(child, beforeChild);
   }
   static tagName = "view";
-  appendInitialChild(child: NodeWidget<any>): void {
+  appendInitialChild(child: QWidget<any>): void {
     this.appendChild(child);
   }
-  appendChild(child: NodeWidget<any>): void {
-    if (!child || child instanceof NodeDialog) {
+  appendChild(child: QWidget<any>): void {
+    if (!child || child instanceof QDialog) {
       return;
     }
-    if (!this.layout) {
+    if (!this.layout()) {
       const flexLayout = new FlexLayout();
       flexLayout.setFlexNode(this.getFlexNode());
       this.setLayout(flexLayout);
-      this.layout = flexLayout;
     }
-    this.layout.addWidget(child);
+    this.layout()!.addWidget(child);
   }
-  removeChild(child: NodeWidget<any>) {
-    if (!this.layout) {
+  removeChild(child: QWidget<any>) {
+    if (!this.layout()) {
       console.warn("parent has no layout to remove child from");
       return;
     }
-    this.layout.removeWidget(child);
+    this.layout()!.removeWidget(child);
     child.close();
   }
 }
diff --git a/src/components/Window/RNWindow.ts b/src/components/Window/RNWindow.ts
index 1b3cbf9e..c251b65b 100644
--- a/src/components/Window/RNWindow.ts
+++ b/src/components/Window/RNWindow.ts
@@ -1,6 +1,6 @@
 import {
   QMainWindow,
-  NodeWidget,
+  QWidget,
   QMainWindowSignals,
   QMenuBar,
 } from "@nodegui/nodegui";
@@ -33,14 +33,14 @@ export class RNWindow extends QMainWindow implements RNWidget {
   setProps(newProps: WindowProps, oldProps: WindowProps): void {
     setWindowProps(this, newProps, oldProps);
   }
-  removeChild(child: NodeWidget<any>) {
+  removeChild(child: QWidget<any>) {
     const removedChild = this.takeCentralWidget();
     if (removedChild) {
       removedChild.close();
     }
     child.close();
   }
-  appendInitialChild(child: NodeWidget<any> | QMenuBar): void {
+  appendInitialChild(child: QWidget<any> | QMenuBar): void {
     if (child instanceof QMenuBar) {
       if (!this.menuBar()) {
         this.setMenuBar(child);
@@ -50,16 +50,16 @@ export class RNWindow extends QMainWindow implements RNWidget {
       return;
     }
 
-    if (!this.centralWidget) {
+    if (!this.centralWidget()) {
       this.setCentralWidget(child);
     } else {
       console.warn("MainWindow can't have more than one child node");
     }
   }
-  appendChild(child: NodeWidget<any>): void {
+  appendChild(child: QWidget<any>): void {
     this.appendInitialChild(child);
   }
-  insertBefore(child: NodeWidget<any>, beforeChild: NodeWidget<any>): void {
+  insertBefore(child: QWidget<any>, beforeChild: QWidget<any>): void {
     this.appendInitialChild(child);
   }
   static tagName = "mainwindow";
diff --git a/src/components/config.ts b/src/components/config.ts
index 4b7f9d4a..c12b9886 100644
--- a/src/components/config.ts
+++ b/src/components/config.ts
@@ -1,4 +1,4 @@
-import { NodeWidget, Component } from "@nodegui/nodegui";
+import { QWidget, Component } from "@nodegui/nodegui";
 import { Fiber } from "react-reconciler";
 import { AppContainer } from "../reconciler";
 
@@ -14,16 +14,16 @@ export abstract class RNComponent {
   abstract insertBefore(child: Component, beforeChild: Component): void;
   abstract removeChild(child: Component): void;
 }
-export abstract class RNWidget extends NodeWidget<any> implements RNComponent {
+export abstract class RNWidget extends QWidget<any> implements RNComponent {
   static tagName: string;
   abstract setProps(newProps: RNProps, oldProps: RNProps): void;
-  abstract appendInitialChild(child: NodeWidget<any>): void;
-  abstract appendChild(child: NodeWidget<any>): void;
+  abstract appendInitialChild(child: QWidget<any>): void;
+  abstract appendChild(child: QWidget<any>): void;
   abstract insertBefore(
-    child: NodeWidget<any>,
-    beforeChild: NodeWidget<any>
+    child: QWidget<any>,
+    beforeChild: QWidget<any>
   ): void;
-  abstract removeChild(child: NodeWidget<any>): void;
+  abstract removeChild(child: QWidget<any>): void;
 }
 export abstract class ComponentConfig {
   abstract tagName: string;
diff --git a/src/reconciler/index.ts b/src/reconciler/index.ts
index 5cfced5d..ec5013af 100644
--- a/src/reconciler/index.ts
+++ b/src/reconciler/index.ts
@@ -1,5 +1,5 @@
 import Reconciler from "react-reconciler";
-import { NodeWidget, QSystemTrayIcon, NodeObject } from "@nodegui/nodegui";
+import { QWidget, QSystemTrayIcon, QObject } from "@nodegui/nodegui";
 import {
   getComponentByTagName,
   RNWidget,
@@ -7,10 +7,10 @@ import {
   RNComponent
 } from "../components/config";
 
-export type AppContainer = Set<NodeWidget<any>>;
-export const appContainer: AppContainer = new Set<NodeWidget<any>>();
+export type AppContainer = Set<QWidget<any>>;
+export const appContainer: AppContainer = new Set<QWidget<any>>();
 
-const shouldIgnoreChild = (child: NodeObject<any>) =>
+const shouldIgnoreChild = (child: QObject<any>) =>
   child instanceof QSystemTrayIcon;
 
 const HostConfig: Reconciler.HostConfig<
@@ -69,7 +69,7 @@ const HostConfig: Reconciler.HostConfig<
       workInProgress
     );
   },
-  appendInitialChild: function (parent: RNWidget, child: NodeWidget<any>) {
+  appendInitialChild: function (parent: RNWidget, child: QWidget<any>) {
     if (shouldIgnoreChild(child)) {
       return;
     }
@@ -100,7 +100,7 @@ const HostConfig: Reconciler.HostConfig<
     const { commitMount } = getComponentByTagName(type);
     return commitMount(instance, newProps, internalInstanceHandle);
   },
-  appendChildToContainer: function(container, child: NodeWidget<any>) {
+  appendChildToContainer: function(container, child: QWidget<any>) {
     container.add(child);
   },
   insertInContainerBefore: (container, child, beforeChild) => {
@@ -146,7 +146,7 @@ const HostConfig: Reconciler.HostConfig<
       finishedWork
     );
   },
-  appendChild: (parent: RNWidget, child: NodeWidget<any>) => {
+  appendChild: (parent: RNWidget, child: QWidget<any>) => {
     if (shouldIgnoreChild(child)) {
       return;
     }
@@ -154,15 +154,15 @@ const HostConfig: Reconciler.HostConfig<
   },
   insertBefore: (
     parent: RNWidget,
-    child: NodeWidget<any>,
-    beforeChild: NodeWidget<any>
+    child: QWidget<any>,
+    beforeChild: QWidget<any>
   ) => {
     if (shouldIgnoreChild(child)) {
       return;
     }
     parent.insertBefore(child, beforeChild);
   },
-  removeChild: (parent: RNWidget, child: NodeWidget<any>) => {
+  removeChild: (parent: RNWidget, child: QWidget<any>) => {
     if (!shouldIgnoreChild(child)) {
       parent.removeChild(child);
     }
@@ -195,10 +195,10 @@ const HostConfig: Reconciler.HostConfig<
     return false;
   },
   //@ts-ignore
-  hideInstance: (instance: NodeWidget<any>) => {
+  hideInstance: (instance: QWidget<any>) => {
     instance.hide();
   },
-  unhideInstance: (instance: NodeWidget<any>, Props: RNProps) => {
+  unhideInstance: (instance: QWidget<any>, Props: RNProps) => {
     instance.show();
   },
   hideTextInstance: (instance: any) => {
@@ -207,7 +207,7 @@ const HostConfig: Reconciler.HostConfig<
       "hideTextInstance called when platform doesnt have host level text"
     );
   },
-  unhideTextInstance: (instance: NodeWidget<any>, Props: RNProps) => {
+  unhideTextInstance: (instance: QWidget<any>, Props: RNProps) => {
     // noop since we dont have any host text
     console.warn(
       "unhideTextInstance called when platform doesnt have host level text"
diff --git a/src/renderer/index.ts b/src/renderer/index.ts
index ee6008d8..cabc596a 100644
--- a/src/renderer/index.ts
+++ b/src/renderer/index.ts
@@ -1,7 +1,7 @@
 import reconciler, { appContainer } from "../reconciler";
 import ReactReconciler, { Reconciler } from "react-reconciler";
 import React from "react";
-import { NodeWidget } from "@nodegui/nodegui";
+import { QWidget } from "@nodegui/nodegui";
 import { RNComponent } from "../components/config";
 //@ts-ignore
 import deepForceUpdate from "react-deep-force-update";
@@ -9,7 +9,7 @@ import deepForceUpdate from "react-deep-force-update";
 type NodeGuiReconciler = Reconciler<
   RNComponent,
   any,
-  Set<NodeWidget<any>>,
+  Set<QWidget<any>>,
   any
 >;
 
diff --git a/website/docs/api/classes/rnaction.md b/website/docs/api/classes/rnaction.md
index 0611d89c..43d4b9a4 100644
--- a/website/docs/api/classes/rnaction.md
+++ b/website/docs/api/classes/rnaction.md
@@ -85,7 +85,7 @@ Name | Type |
 
 **Returns:** *[RNAction](rnaction.md)*
 
-\+ **new RNAction**(`parent`: NodeWidget‹any›): *[RNAction](rnaction.md)*
+\+ **new RNAction**(`parent`: QWidget‹any›): *[RNAction](rnaction.md)*
 
 *Inherited from [RNAction](rnaction.md).[constructor](rnaction.md#constructor)*
 
@@ -95,7 +95,7 @@ Name | Type |
 
 Name | Type |
 ------ | ------ |
-`parent` | NodeWidget‹any› |
+`parent` | QWidget‹any› |
 
 **Returns:** *[RNAction](rnaction.md)*
 
diff --git a/website/docs/api/classes/rngridcolumn.md b/website/docs/api/classes/rngridcolumn.md
index 47a8c117..fc9020fe 100644
--- a/website/docs/api/classes/rngridcolumn.md
+++ b/website/docs/api/classes/rngridcolumn.md
@@ -58,7 +58,7 @@ sidebar_label: "RNGridColumn"
 
 ### `Optional` actualWidget
 
-• **actualWidget**? : *NodeWidget‹any›*
+• **actualWidget**? : *QWidget‹any›*
 
 ___
 
@@ -124,13 +124,13 @@ ___
 
 ###  appendChild
 
-▸ **appendChild**(`child`: NodeWidget‹any›): *void*
+▸ **appendChild**(`child`: QWidget‹any›): *void*
 
 **Parameters:**
 
 Name | Type |
 ------ | ------ |
-`child` | NodeWidget‹any› |
+`child` | QWidget‹any› |
 
 **Returns:** *void*
 
@@ -138,13 +138,13 @@ ___
 
 ###  appendInitialChild
 
-▸ **appendInitialChild**(`child`: NodeWidget‹any›): *void*
+▸ **appendInitialChild**(`child`: QWidget‹any›): *void*
 
 **Parameters:**
 
 Name | Type |
 ------ | ------ |
-`child` | NodeWidget‹any› |
+`child` | QWidget‹any› |
 
 **Returns:** *void*
 
@@ -152,14 +152,14 @@ ___
 
 ###  insertBefore
 
-▸ **insertBefore**(`child`: NodeWidget‹any›, `beforeChild`: NodeWidget‹any›): *void*
+▸ **insertBefore**(`child`: QWidget‹any›, `beforeChild`: QWidget‹any›): *void*
 
 **Parameters:**
 
 Name | Type |
 ------ | ------ |
-`child` | NodeWidget‹any› |
-`beforeChild` | NodeWidget‹any› |
+`child` | QWidget‹any› |
+`beforeChild` | QWidget‹any› |
 
 **Returns:** *void*
 
@@ -175,13 +175,13 @@ ___
 
 ###  removeChild
 
-▸ **removeChild**(`child`: NodeWidget‹any›): *void*
+▸ **removeChild**(`child`: QWidget‹any›): *void*
 
 **Parameters:**
 
 Name | Type |
 ------ | ------ |
-`child` | NodeWidget‹any› |
+`child` | QWidget‹any› |
 
 **Returns:** *void*
 
diff --git a/website/docs/api/classes/rnmenu.md b/website/docs/api/classes/rnmenu.md
index 71259f60..b15076ee 100644
--- a/website/docs/api/classes/rnmenu.md
+++ b/website/docs/api/classes/rnmenu.md
@@ -124,7 +124,7 @@ sidebar_label: "RNMenu"
 
 **Returns:** *[RNMenu](rnmenu.md)*
 
-\+ **new RNMenu**(`parent`: NodeWidget‹any›): *[RNMenu](rnmenu.md)*
+\+ **new RNMenu**(`parent`: QWidget‹any›): *[RNMenu](rnmenu.md)*
 
 *Inherited from [RNMenu](rnmenu.md).[constructor](rnmenu.md#constructor)*
 
@@ -134,7 +134,7 @@ sidebar_label: "RNMenu"
 
 Name | Type |
 ------ | ------ |
-`parent` | NodeWidget‹any› |
+`parent` | QWidget‹any› |
 
 **Returns:** *[RNMenu](rnmenu.md)*
 
@@ -158,7 +158,7 @@ ___
 
 ### `Optional` layout
 
-• **layout**? : *NodeLayout‹QMenuSignals›*
+• **layout**? : *QLayout‹QMenuSignals›*
 
 *Inherited from void*
 
@@ -959,7 +959,7 @@ ___
 
 ###  setLayout
 
-▸ **setLayout**(`parentLayout`: NodeLayout‹QMenuSignals›): *void*
+▸ **setLayout**(`parentLayout`: QLayout‹QMenuSignals›): *void*
 
 *Inherited from void*
 
@@ -967,7 +967,7 @@ ___
 
 Name | Type |
 ------ | ------ |
-`parentLayout` | NodeLayout‹QMenuSignals› |
+`parentLayout` | QLayout‹QMenuSignals› |
 
 **Returns:** *void*
 
diff --git a/website/docs/api/classes/rnmenubar.md b/website/docs/api/classes/rnmenubar.md
index 952a0a78..a802a770 100644
--- a/website/docs/api/classes/rnmenubar.md
+++ b/website/docs/api/classes/rnmenubar.md
@@ -124,7 +124,7 @@ sidebar_label: "RNMenuBar"
 
 **Returns:** *[RNMenuBar](rnmenubar.md)*
 
-\+ **new RNMenuBar**(`parent`: NodeWidget‹any›): *[RNMenuBar](rnmenubar.md)*
+\+ **new RNMenuBar**(`parent`: QWidget‹any›): *[RNMenuBar](rnmenubar.md)*
 
 *Inherited from [RNMenuBar](rnmenubar.md).[constructor](rnmenubar.md#constructor)*
 
@@ -134,7 +134,7 @@ sidebar_label: "RNMenuBar"
 
 Name | Type |
 ------ | ------ |
-`parent` | NodeWidget‹any› |
+`parent` | QWidget‹any› |
 
 **Returns:** *[RNMenuBar](rnmenubar.md)*
 
@@ -180,7 +180,7 @@ ___
 
 ### `Optional` layout
 
-• **layout**? : *NodeLayout‹QMenuBarSignals›*
+• **layout**? : *QLayout‹QMenuBarSignals›*
 
 *Inherited from void*
 
@@ -460,14 +460,14 @@ ___
 
 ###  insertBefore
 
-▸ **insertBefore**(`child`: NodeWidget‹any›, `beforeChild`: NodeWidget‹any›): *void*
+▸ **insertBefore**(`child`: QWidget‹any›, `beforeChild`: QWidget‹any›): *void*
 
 **Parameters:**
 
 Name | Type |
 ------ | ------ |
-`child` | NodeWidget‹any› |
-`beforeChild` | NodeWidget‹any› |
+`child` | QWidget‹any› |
+`beforeChild` | QWidget‹any› |
 
 **Returns:** *void*
 
@@ -672,13 +672,13 @@ ___
 
 ###  removeChild
 
-▸ **removeChild**(`child`: NodeWidget‹any›): *void*
+▸ **removeChild**(`child`: QWidget‹any›): *void*
 
 **Parameters:**
 
 Name | Type |
 ------ | ------ |
-`child` | NodeWidget‹any› |
+`child` | QWidget‹any› |
 
 **Returns:** *void*
 
@@ -963,7 +963,7 @@ ___
 
 ###  setLayout
 
-▸ **setLayout**(`parentLayout`: NodeLayout‹QMenuBarSignals›): *void*
+▸ **setLayout**(`parentLayout`: QLayout‹QMenuBarSignals›): *void*
 
 *Inherited from void*
 
@@ -971,7 +971,7 @@ ___
 
 Name | Type |
 ------ | ------ |
-`parentLayout` | NodeLayout‹QMenuBarSignals› |
+`parentLayout` | QLayout‹QMenuBarSignals› |
 
 **Returns:** *void*
 
diff --git a/website/docs/api/globals.md b/website/docs/api/globals.md
index 9cb40a9b..57511eb0 100644
--- a/website/docs/api/globals.md
+++ b/website/docs/api/globals.md
@@ -209,7 +209,7 @@ ___
 
 ###  NodeGuiReconciler
 
-Ƭ **NodeGuiReconciler**: *Reconciler‹RNComponent, any, Set‹NodeWidget‹any››, any›*
+Ƭ **NodeGuiReconciler**: *Reconciler‹RNComponent, any, Set‹QWidget‹any››, any›*
 
 ___
 
diff --git a/website/docs/api/interfaces/abstractbuttonprops.md b/website/docs/api/interfaces/abstractbuttonprops.md
index d43e45f4..ecf81bb6 100644
--- a/website/docs/api/interfaces/abstractbuttonprops.md
+++ b/website/docs/api/interfaces/abstractbuttonprops.md
@@ -5,7 +5,7 @@ sidebar_label: "AbstractButtonProps"
 ---
 
 The Button component provides ability to add and manipulate native button widgets. It is based on
-[NodeGui's QPushButton](https://docs.nodegui.org/docs/api/QPushButton).
+[NodeGui's QPushButton](https://docs.nodegui.org/docs/api/generated/classes/QPushButton).
 ## Example
 ```javascript
 import React from "react";
@@ -96,7 +96,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -106,7 +106,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -116,7 +116,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -124,7 +124,7 @@ ___
 
 • **icon**? : *QIcon*
 
-Sets an icon in the button. [QPushButton: setIcon](https://docs.nodegui.org/docs/api/QPushButton#buttonseticonicon)
+Sets an icon in the button. [QPushButton: setIcon](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonseticonicon)
 
 ___
 
@@ -132,7 +132,7 @@ ___
 
 • **iconSize**? : *QSize*
 
-Sets an icon size in the button. [QPushButton: setIconSize](https://docs.nodegui.org/docs/api/QPushButton#buttonseticonsize)
+Sets an icon size in the button. [QPushButton: setIconSize](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonseticonsize)
 
 ___
 
@@ -142,7 +142,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -152,7 +152,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -162,7 +162,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -172,7 +172,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -192,7 +192,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -212,7 +212,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -222,7 +222,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -232,7 +232,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -240,7 +240,7 @@ ___
 
 • **text**? : *undefined | string*
 
-Sets the given text to the button. [QPushButton: setText](https://docs.nodegui.org/docs/api/QPushButton#buttonsettexttext)
+Sets the given text to the button. [QPushButton: setText](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonsettexttext)
 
 ___
 
@@ -250,7 +250,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -271,7 +271,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -281,7 +281,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -291,7 +291,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -301,4 +301,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/actionprops.md b/website/docs/api/interfaces/actionprops.md
index 703ddc73..7f3ce694 100644
--- a/website/docs/api/interfaces/actionprops.md
+++ b/website/docs/api/interfaces/actionprops.md
@@ -72,7 +72,7 @@ ___
 
 • **id**? : *undefined | string*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
diff --git a/website/docs/api/interfaces/animatedimageprops.md b/website/docs/api/interfaces/animatedimageprops.md
index 8a3493bf..acb8195d 100644
--- a/website/docs/api/interfaces/animatedimageprops.md
+++ b/website/docs/api/interfaces/animatedimageprops.md
@@ -75,7 +75,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -85,7 +85,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -95,7 +95,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -105,7 +105,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -115,7 +115,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -125,7 +125,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -135,7 +135,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -163,7 +163,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -191,7 +191,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -207,7 +207,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -217,7 +217,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -235,7 +235,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -256,7 +256,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -266,7 +266,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -276,7 +276,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -286,7 +286,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
 
 ___
 
diff --git a/website/docs/api/interfaces/boxviewprops.md b/website/docs/api/interfaces/boxviewprops.md
index c03ca0ea..379441bb 100644
--- a/website/docs/api/interfaces/boxviewprops.md
+++ b/website/docs/api/interfaces/boxviewprops.md
@@ -55,7 +55,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -71,7 +71,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -81,7 +81,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -91,7 +91,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -101,7 +101,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -111,7 +111,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -121,7 +121,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -141,7 +141,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -161,7 +161,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -171,7 +171,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -181,7 +181,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -191,7 +191,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -212,7 +212,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -222,7 +222,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -232,7 +232,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -242,4 +242,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/buttonprops.md b/website/docs/api/interfaces/buttonprops.md
index a4eb03c8..7b3cd83d 100644
--- a/website/docs/api/interfaces/buttonprops.md
+++ b/website/docs/api/interfaces/buttonprops.md
@@ -5,7 +5,7 @@ sidebar_label: "ButtonProps"
 ---
 
 The Button component provides ability to add and manipulate native button widgets. It is based on
-[NodeGui's QPushButton](https://docs.nodegui.org/docs/api/QPushButton).
+[NodeGui's QPushButton](https://docs.nodegui.org/docs/api/generated/classes/QPushButton).
 ## Example
 ```javascript
 import React from "react";
@@ -89,7 +89,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -99,7 +99,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -107,7 +107,7 @@ ___
 
 • **flat**? : *undefined | false | true*
 
-Sets whether the button border is raised. [QPushButton: setFlat](https://docs.nodegui.org/docs/api/QPushButton#buttonsetflatisflat)
+Sets whether the button border is raised. [QPushButton: setFlat](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonsetflatisflat)
 
 ___
 
@@ -117,7 +117,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -127,7 +127,7 @@ ___
 
 *Inherited from [AbstractButtonProps](abstractbuttonprops.md).[icon](abstractbuttonprops.md#optional-icon)*
 
-Sets an icon in the button. [QPushButton: setIcon](https://docs.nodegui.org/docs/api/QPushButton#buttonseticonicon)
+Sets an icon in the button. [QPushButton: setIcon](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonseticonicon)
 
 ___
 
@@ -137,7 +137,7 @@ ___
 
 *Inherited from [AbstractButtonProps](abstractbuttonprops.md).[iconSize](abstractbuttonprops.md#optional-iconsize)*
 
-Sets an icon size in the button. [QPushButton: setIconSize](https://docs.nodegui.org/docs/api/QPushButton#buttonseticonsize)
+Sets an icon size in the button. [QPushButton: setIconSize](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonseticonsize)
 
 ___
 
@@ -147,7 +147,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -157,7 +157,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -167,7 +167,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -177,7 +177,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -197,7 +197,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -217,7 +217,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -227,7 +227,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -237,7 +237,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -247,7 +247,7 @@ ___
 
 *Inherited from [AbstractButtonProps](abstractbuttonprops.md).[text](abstractbuttonprops.md#optional-text)*
 
-Sets the given text to the button. [QPushButton: setText](https://docs.nodegui.org/docs/api/QPushButton#buttonsettexttext)
+Sets the given text to the button. [QPushButton: setText](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonsettexttext)
 
 ___
 
@@ -257,7 +257,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -278,7 +278,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -288,7 +288,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -298,7 +298,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -308,4 +308,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/checkboxprops.md b/website/docs/api/interfaces/checkboxprops.md
index 61bbbeb1..d547c4dc 100644
--- a/website/docs/api/interfaces/checkboxprops.md
+++ b/website/docs/api/interfaces/checkboxprops.md
@@ -5,7 +5,7 @@ sidebar_label: "CheckBoxProps"
 ---
 
 The CheckBox component provides ability to add and manipulate native button widgets. It is based on
-[NodeGui's QCheckBox](https://docs.nodegui.org/docs/api/QCheckBox).
+[NodeGui's QCheckBox](https://docs.nodegui.org/docs/api/generated/classes/QCheckBox).
 ## Example
 ```javascript
 import React from "react";
@@ -77,7 +77,7 @@ ___
 
 • **checked**? : *undefined | false | true*
 
-This property holds whether the button is checked. [QCheckBox: setChecked](https://docs.nodegui.org/docs/api/QCheckBox/#checkboxsetcheckedcheck)
+This property holds whether the button is checked. [QCheckBox: setChecked](https://docs.nodegui.org/docs/api/generated/classes/QCheckBox/#checkboxsetcheckedcheck)
 
 ___
 
@@ -97,7 +97,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -107,7 +107,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -117,7 +117,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -127,7 +127,7 @@ ___
 
 *Inherited from [AbstractButtonProps](abstractbuttonprops.md).[icon](abstractbuttonprops.md#optional-icon)*
 
-Sets an icon in the button. [QPushButton: setIcon](https://docs.nodegui.org/docs/api/QPushButton#buttonseticonicon)
+Sets an icon in the button. [QPushButton: setIcon](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonseticonicon)
 
 ___
 
@@ -137,7 +137,7 @@ ___
 
 *Inherited from [AbstractButtonProps](abstractbuttonprops.md).[iconSize](abstractbuttonprops.md#optional-iconsize)*
 
-Sets an icon size in the button. [QPushButton: setIconSize](https://docs.nodegui.org/docs/api/QPushButton#buttonseticonsize)
+Sets an icon size in the button. [QPushButton: setIconSize](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonseticonsize)
 
 ___
 
@@ -147,7 +147,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -157,7 +157,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -167,7 +167,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -177,7 +177,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -197,7 +197,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -217,7 +217,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -227,7 +227,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -237,7 +237,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -247,7 +247,7 @@ ___
 
 *Inherited from [AbstractButtonProps](abstractbuttonprops.md).[text](abstractbuttonprops.md#optional-text)*
 
-Sets the given text to the button. [QPushButton: setText](https://docs.nodegui.org/docs/api/QPushButton#buttonsettexttext)
+Sets the given text to the button. [QPushButton: setText](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonsettexttext)
 
 ___
 
@@ -257,7 +257,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -278,7 +278,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -288,7 +288,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -298,7 +298,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -308,4 +308,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/comboboxprops.md b/website/docs/api/interfaces/comboboxprops.md
index 0035ee6f..50e42b87 100644
--- a/website/docs/api/interfaces/comboboxprops.md
+++ b/website/docs/api/interfaces/comboboxprops.md
@@ -93,7 +93,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -115,7 +115,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -131,7 +131,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -147,7 +147,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -175,7 +175,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -191,7 +191,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -213,7 +213,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -233,7 +233,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -253,7 +253,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -269,7 +269,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -279,7 +279,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -289,7 +289,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -310,7 +310,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -320,7 +320,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -330,7 +330,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -340,4 +340,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/dialprops.md b/website/docs/api/interfaces/dialprops.md
index e24b7f57..f7f4ab3c 100644
--- a/website/docs/api/interfaces/dialprops.md
+++ b/website/docs/api/interfaces/dialprops.md
@@ -57,7 +57,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -67,7 +67,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -77,7 +77,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -87,7 +87,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -97,7 +97,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -107,7 +107,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -117,7 +117,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -149,7 +149,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -169,7 +169,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -179,7 +179,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -189,7 +189,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -199,7 +199,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -220,7 +220,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -230,7 +230,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -240,7 +240,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -250,7 +250,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
 
 ___
 
diff --git a/website/docs/api/interfaces/gridviewprops.md b/website/docs/api/interfaces/gridviewprops.md
index acdcfc06..5e649b70 100644
--- a/website/docs/api/interfaces/gridviewprops.md
+++ b/website/docs/api/interfaces/gridviewprops.md
@@ -71,7 +71,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -81,7 +81,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -91,7 +91,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -107,7 +107,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -117,7 +117,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -127,7 +127,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -137,7 +137,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -157,7 +157,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -183,7 +183,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -193,7 +193,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -203,7 +203,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -219,7 +219,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -240,7 +240,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -250,7 +250,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -260,7 +260,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -270,4 +270,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/imageprops.md b/website/docs/api/interfaces/imageprops.md
index 4cad7387..4df1d819 100644
--- a/website/docs/api/interfaces/imageprops.md
+++ b/website/docs/api/interfaces/imageprops.md
@@ -83,7 +83,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -93,7 +93,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -103,7 +103,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -113,7 +113,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -123,7 +123,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -133,7 +133,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -143,7 +143,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -171,7 +171,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -199,7 +199,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -215,7 +215,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -225,7 +225,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -249,7 +249,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -270,7 +270,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -280,7 +280,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -290,7 +290,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -300,7 +300,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
 
 ___
 
diff --git a/website/docs/api/interfaces/lineeditprops.md b/website/docs/api/interfaces/lineeditprops.md
index 8653010f..ec47f4f7 100644
--- a/website/docs/api/interfaces/lineeditprops.md
+++ b/website/docs/api/interfaces/lineeditprops.md
@@ -58,7 +58,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -74,7 +74,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -84,7 +84,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -94,7 +94,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -104,7 +104,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -114,7 +114,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -124,7 +124,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -150,7 +150,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -176,7 +176,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -186,7 +186,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -196,7 +196,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -212,7 +212,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -233,7 +233,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -243,7 +243,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -253,7 +253,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -263,4 +263,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/menubarprops.md b/website/docs/api/interfaces/menubarprops.md
index 9b445540..f4b2d83f 100644
--- a/website/docs/api/interfaces/menubarprops.md
+++ b/website/docs/api/interfaces/menubarprops.md
@@ -55,7 +55,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -65,7 +65,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -75,7 +75,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -85,7 +85,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -95,7 +95,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -105,7 +105,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -115,7 +115,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -141,7 +141,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -161,7 +161,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -171,7 +171,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -181,7 +181,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -191,7 +191,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -212,7 +212,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -222,7 +222,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -232,7 +232,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -242,4 +242,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/menuprops.md b/website/docs/api/interfaces/menuprops.md
index 49356ae1..432be37f 100644
--- a/website/docs/api/interfaces/menuprops.md
+++ b/website/docs/api/interfaces/menuprops.md
@@ -55,7 +55,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -65,7 +65,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -75,7 +75,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -85,7 +85,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -95,7 +95,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -105,7 +105,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -115,7 +115,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -135,7 +135,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -155,7 +155,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -165,7 +165,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -175,7 +175,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -191,7 +191,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -212,7 +212,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -222,7 +222,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -232,7 +232,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -242,4 +242,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/plaintexteditprops.md b/website/docs/api/interfaces/plaintexteditprops.md
index 7b0c05d9..c66059ed 100644
--- a/website/docs/api/interfaces/plaintexteditprops.md
+++ b/website/docs/api/interfaces/plaintexteditprops.md
@@ -57,7 +57,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -67,7 +67,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -77,7 +77,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -87,7 +87,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -97,7 +97,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -107,7 +107,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -117,7 +117,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -143,7 +143,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -169,7 +169,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -179,7 +179,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -189,7 +189,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -205,7 +205,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -226,7 +226,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -236,7 +236,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -246,7 +246,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -256,4 +256,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/progressbarprops.md b/website/docs/api/interfaces/progressbarprops.md
index 0947a969..74eca8fd 100644
--- a/website/docs/api/interfaces/progressbarprops.md
+++ b/website/docs/api/interfaces/progressbarprops.md
@@ -58,7 +58,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -68,7 +68,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -78,7 +78,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -88,7 +88,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -98,7 +98,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -114,7 +114,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -130,7 +130,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -156,7 +156,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -176,7 +176,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -186,7 +186,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -196,7 +196,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -212,7 +212,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -233,7 +233,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -243,7 +243,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -253,7 +253,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -263,4 +263,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/radiobuttonprops.md b/website/docs/api/interfaces/radiobuttonprops.md
index f7fd1959..41d91d5a 100644
--- a/website/docs/api/interfaces/radiobuttonprops.md
+++ b/website/docs/api/interfaces/radiobuttonprops.md
@@ -68,7 +68,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -78,7 +78,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -88,7 +88,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -98,7 +98,7 @@ ___
 
 *Inherited from [AbstractButtonProps](abstractbuttonprops.md).[icon](abstractbuttonprops.md#optional-icon)*
 
-Sets an icon in the button. [QPushButton: setIcon](https://docs.nodegui.org/docs/api/QPushButton#buttonseticonicon)
+Sets an icon in the button. [QPushButton: setIcon](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonseticonicon)
 
 ___
 
@@ -108,7 +108,7 @@ ___
 
 *Inherited from [AbstractButtonProps](abstractbuttonprops.md).[iconSize](abstractbuttonprops.md#optional-iconsize)*
 
-Sets an icon size in the button. [QPushButton: setIconSize](https://docs.nodegui.org/docs/api/QPushButton#buttonseticonsize)
+Sets an icon size in the button. [QPushButton: setIconSize](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonseticonsize)
 
 ___
 
@@ -118,7 +118,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -128,7 +128,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -138,7 +138,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -148,7 +148,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -168,7 +168,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -188,7 +188,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -198,7 +198,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -208,7 +208,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -218,7 +218,7 @@ ___
 
 *Inherited from [AbstractButtonProps](abstractbuttonprops.md).[text](abstractbuttonprops.md#optional-text)*
 
-Sets the given text to the button. [QPushButton: setText](https://docs.nodegui.org/docs/api/QPushButton#buttonsettexttext)
+Sets the given text to the button. [QPushButton: setText](https://docs.nodegui.org/docs/api/generated/classes/QPushButton#buttonsettexttext)
 
 ___
 
@@ -228,7 +228,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -249,7 +249,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -259,7 +259,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -269,7 +269,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -279,4 +279,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/scrollareaprops.md b/website/docs/api/interfaces/scrollareaprops.md
index efed90e8..252e88da 100644
--- a/website/docs/api/interfaces/scrollareaprops.md
+++ b/website/docs/api/interfaces/scrollareaprops.md
@@ -55,7 +55,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -65,7 +65,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -75,7 +75,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -85,7 +85,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -95,7 +95,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -105,7 +105,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -115,7 +115,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -135,7 +135,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -155,7 +155,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -165,7 +165,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -175,7 +175,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -185,7 +185,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -212,7 +212,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -222,7 +222,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -232,7 +232,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -242,4 +242,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/sliderprops.md b/website/docs/api/interfaces/sliderprops.md
index 83376d60..d536ad21 100644
--- a/website/docs/api/interfaces/sliderprops.md
+++ b/website/docs/api/interfaces/sliderprops.md
@@ -67,7 +67,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -77,7 +77,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -87,7 +87,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -103,7 +103,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -131,7 +131,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -147,7 +147,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -163,7 +163,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -195,7 +195,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -221,7 +221,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -237,7 +237,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -247,7 +247,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -275,7 +275,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -296,7 +296,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -306,7 +306,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -316,7 +316,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -326,4 +326,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/spinboxprops.md b/website/docs/api/interfaces/spinboxprops.md
index 46294317..2df8618f 100644
--- a/website/docs/api/interfaces/spinboxprops.md
+++ b/website/docs/api/interfaces/spinboxprops.md
@@ -59,7 +59,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -69,7 +69,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -79,7 +79,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -89,7 +89,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -99,7 +99,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -109,7 +109,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -119,7 +119,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -139,7 +139,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -177,7 +177,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -187,7 +187,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -197,7 +197,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -219,7 +219,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -240,7 +240,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -250,7 +250,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -260,7 +260,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -270,4 +270,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/systemtrayiconprops.md b/website/docs/api/interfaces/systemtrayiconprops.md
index 1d4c0817..691e642f 100644
--- a/website/docs/api/interfaces/systemtrayiconprops.md
+++ b/website/docs/api/interfaces/systemtrayiconprops.md
@@ -64,7 +64,7 @@ ___
 
 • **id**? : *undefined | string*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -88,4 +88,4 @@ ___
 
 • **visible**? : *undefined | false | true*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
diff --git a/website/docs/api/interfaces/tabprops.md b/website/docs/api/interfaces/tabprops.md
index c28f1318..2db01033 100644
--- a/website/docs/api/interfaces/tabprops.md
+++ b/website/docs/api/interfaces/tabprops.md
@@ -55,7 +55,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -65,7 +65,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -75,7 +75,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -85,7 +85,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -95,7 +95,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -105,7 +105,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -115,7 +115,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -135,7 +135,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -155,7 +155,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -165,7 +165,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -175,7 +175,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -191,7 +191,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -212,7 +212,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -222,7 +222,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -232,7 +232,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -242,4 +242,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/textprops.md b/website/docs/api/interfaces/textprops.md
index 27aab5b9..2250c62f 100644
--- a/website/docs/api/interfaces/textprops.md
+++ b/website/docs/api/interfaces/textprops.md
@@ -69,7 +69,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -79,7 +79,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -89,7 +89,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -99,7 +99,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -109,7 +109,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -119,7 +119,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -129,7 +129,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -155,7 +155,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -181,7 +181,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -191,7 +191,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -201,7 +201,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -217,7 +217,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -238,7 +238,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -248,7 +248,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -258,7 +258,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -268,7 +268,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
 
 ___
 
diff --git a/website/docs/api/interfaces/viewprops.md b/website/docs/api/interfaces/viewprops.md
index 1da76471..115dfb01 100644
--- a/website/docs/api/interfaces/viewprops.md
+++ b/website/docs/api/interfaces/viewprops.md
@@ -6,7 +6,7 @@ sidebar_label: "ViewProps"
 
 The View component can be used to encapsulate other components and provide structure.
 It functions similar to a div in the web world. It is based on
-[NodeGui's QWidget](https://docs.nodegui.org/docs/api/QWidget).
+[NodeGui's QWidget](https://docs.nodegui.org/docs/api/generated/classes/QWidget).
 ## Example
 ```javascript
 import React from "react";
@@ -109,7 +109,7 @@ ___
 
 • **cursor**? : *CursorShape | QCursor*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -117,7 +117,7 @@ ___
 
 • **enabled**? : *undefined | false | true*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -125,7 +125,7 @@ ___
 
 • **geometry**? : *[Geometry](../globals.md#geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -133,7 +133,7 @@ ___
 
 • **id**? : *undefined | string*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -141,7 +141,7 @@ ___
 
 • **maxSize**? : *[Size](../globals.md#size)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -149,7 +149,7 @@ ___
 
 • **minSize**? : *[Size](../globals.md#size)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -157,7 +157,7 @@ ___
 
 • **mouseTracking**? : *undefined | false | true*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -173,7 +173,7 @@ ___
 
 • **pos**? : *[Position](../globals.md#position)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -189,7 +189,7 @@ ___
 
 • **size**? : *[ViewSize](../globals.md#viewsize)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -197,7 +197,7 @@ ___
 
 • **style**? : *undefined | string*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -205,7 +205,7 @@ ___
 
 • **styleSheet**? : *undefined | string*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -213,7 +213,7 @@ ___
 
 • **visible**? : *undefined | false | true*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -230,7 +230,7 @@ ___
 
 • **windowIcon**? : *QIcon*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -238,7 +238,7 @@ ___
 
 • **windowOpacity**? : *undefined | number*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -246,7 +246,7 @@ ___
 
 • **windowState**? : *WindowState*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -254,4 +254,4 @@ ___
 
 • **windowTitle**? : *undefined | string*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/website/docs/api/interfaces/windowprops.md b/website/docs/api/interfaces/windowprops.md
index 4dab1816..0f4b549b 100644
--- a/website/docs/api/interfaces/windowprops.md
+++ b/website/docs/api/interfaces/windowprops.md
@@ -55,7 +55,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[cursor](viewprops.md#optional-cursor)*
 
-Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetcursorcursor)
+Sets the window mouse cursor. [QWidget: setCursor](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetcursorcursor)
 
 ___
 
@@ -65,7 +65,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[enabled](viewprops.md#optional-enabled)*
 
-Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetenabledenabled)
+Sets the property that tells whether the widget is enabled. In general an enabled widget handles keyboard and mouse events; a disabled widget does not. [QWidget: setEnabled](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetenabledenabled)
 
 ___
 
@@ -75,7 +75,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[geometry](viewprops.md#optional-geometry)*
 
-Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetgeometryx-y-width-height)
+Sets the screen position as well as size of the widget. [QWidget: setGeometry](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetgeometryx-y-width-height)
 
 ___
 
@@ -85,7 +85,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[id](viewprops.md#optional-id)*
 
-Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetobjectnameobjectname)
+Sets the object name (id) of the widget in Qt. Object name can be analogous to id of an element in the web world. Using the objectName of the widget one can reference it in the Qt's stylesheet much like what we do with id in the web world. [QWidget: setObjectName](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetobjectnameobjectname)
 
 ___
 
@@ -95,7 +95,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[maxSize](viewprops.md#optional-maxsize)*
 
-Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmaximumsizewidth-height)
+Sets the maximum size of the widget. [QWidget: setMaximumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmaximumsizewidth-height)
 
 ___
 
@@ -111,7 +111,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[minSize](viewprops.md#optional-minsize)*
 
-Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetminimumsizewidth-height)
+Sets the minimum size of the widget. [QWidget: setMinimumSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetminimumsizewidth-height)
 
 ___
 
@@ -121,7 +121,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[mouseTracking](viewprops.md#optional-mousetracking)*
 
-Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetmousetrackingismousetracked)
+Sets the property that tells whether mouseTracking is enabled for the widget. [QWidget: setMouseTracking](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetmousetrackingismousetracked)
 
 ___
 
@@ -141,7 +141,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[pos](viewprops.md#optional-pos)*
 
-Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/NodeWidget#widgetmovex-y)
+Sets the screen position of the widget. [QWidget: move](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetmovex-y)
 
 ___
 
@@ -161,7 +161,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[size](viewprops.md#optional-size)*
 
-Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetfixedsizewidth-height)
+Sets both the minimum and maximum sizes of the widget. [QWidget: setFixedSize](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetfixedsizewidth-height)
 
 ___
 
@@ -171,7 +171,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[style](viewprops.md#optional-style)*
 
-Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetinlinestylestyle)
+Sets the inline stylesheet property. [QWidget: setInlineStyle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetinlinestylestyle)
 
 ___
 
@@ -181,7 +181,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[styleSheet](viewprops.md#optional-stylesheet)*
 
-Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetstylesheetstylesheet)
+Sets the property that holds the widget's style sheet. [QWidget: setStyleSheet](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetstylesheetstylesheet)
 
 ___
 
@@ -191,7 +191,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[visible](viewprops.md#optional-visible)*
 
-Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/NodeWidget#widgetshow)
+Shows or hides the widget and its children. [QWidget: show](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetshow)
 
 ___
 
@@ -212,7 +212,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowIcon](viewprops.md#optional-windowicon)*
 
-Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowiconicon)
+Sets the window icon. [QWidget: setWindowIcon](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowiconicon)
 
 ___
 
@@ -222,7 +222,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowOpacity](viewprops.md#optional-windowopacity)*
 
-This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
+This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowopacityopacity)
 
 ___
 
@@ -232,7 +232,7 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowState](viewprops.md#optional-windowstate)*
 
-Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowstatestate)
+Sets the window state. [QWidget: setWindowState](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowstatestate)
 
 ___
 
@@ -242,4 +242,4 @@ ___
 
 *Inherited from [ViewProps](viewprops.md).[windowTitle](viewprops.md#optional-windowtitle)*
 
-Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
+Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/generated/classes/QWidget#widgetsetwindowtitletitle)
diff --git a/yarn.lock b/yarn.lock
index f175f0ea..b2e40e87 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,25 +25,27 @@
     node-fetch "^2.6.0"
     progress "^2.0.3"
 
-"@nodegui/nodegui@^0.36.0":
-  version "0.36.0"
-  resolved "https://registry.yarnpkg.com/@nodegui/nodegui/-/nodegui-0.36.0.tgz#8ae819c23c7ea89d29c75a60785d9013c4950b6b"
-  integrity sha512-8vCf31gXQdLQordqu1b5weI8zsLczY/pWeAF2j0MPo7YcGARyx6uRaSDYhNJa+WcQZeZiYIbREluqvGSiJ7zUA==
+"@nodegui/nodegui@^0.57.1":
+  version "0.57.1"
+  resolved "https://registry.yarnpkg.com/@nodegui/nodegui/-/nodegui-0.57.1.tgz#dcab2a3c9beeb744669c87f18809f03b44074dfd"
+  integrity sha512-husxEJeohB6WHoxa+ob9/BoNhPc/WJL3NQOGmfjb6DZMuPe3bwVu/E/63bvGp7SZbZ3hsIM8l4J5x99U/4WYbA==
   dependencies:
     "@nodegui/artifact-installer" "^1.1.0"
-    "@nodegui/qode" "^16.4.0"
+    "@nodegui/qode" "^16.4.3"
     cmake-js "^6.2.1"
     cross-env "^7.0.3"
     cuid "^2.1.8"
     manage-path "^2.0.0"
     memoize-one "^5.2.1"
     node-addon-api "^4.0.0"
+    postcss "^7.0.17"
     postcss-nodegui-autoprefixer "0.0.7"
+    tar "^6.0.1"
 
-"@nodegui/qode@^16.4.0":
-  version "16.4.0"
-  resolved "https://registry.yarnpkg.com/@nodegui/qode/-/qode-16.4.0.tgz#d18b9c569b51b131331729ea095402bc2e028c19"
-  integrity sha512-uNoTR9f02F/SmK+xzvlXJs/yuW0zYcuPZf99v4z7tPeugLukrPbE2MJfsq8edGNfWxu3d+pRwMN+UNYSq0dLgQ==
+"@nodegui/qode@^16.4.3":
+  version "16.4.3"
+  resolved "https://registry.yarnpkg.com/@nodegui/qode/-/qode-16.4.3.tgz#ddae8f683ef958676b0a4d69e972f471d6bfd359"
+  integrity sha512-WllfJVXffr3Rn7BSfo5cubZ5hx4OnQ7iqY/kj+2jwqUepzlRFKCvn9/vAJ/VXmiB0GZGcaCGM0U3rZGADdU5mw==
   dependencies:
     env-paths "^2.2.1"
     make-dir "^3.1.0"
@@ -51,10 +53,10 @@
     progress "^2.0.3"
     tar "^6.1.6"
 
-"@types/node@^16.6.1":
-  version "16.6.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.6.1.tgz#aee62c7b966f55fc66c7b6dfa1d58db2a616da61"
-  integrity sha512-Sr7BhXEAer9xyGuCN3Ek9eg9xPviCF2gfu9kTfuU2HkTVAMYSDeX40fvpmo72n5nansg3nsBjuQBrsS28r+NUw==
+"@types/node@^16.11.0":
+  version "16.11.62"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.62.tgz#bab2e6208531321d147eda20c38e389548cd5ffc"
+  integrity sha512-K/ggecSdwAAy2NUW4WKmF4Rc03GKbsfP+k326UWgckoS+Rzd2PaWbjk76dSmqdLQvLTJAO9axiTUJ6488mFsYQ==
 
 "@types/prop-types@*":
   version "15.7.4"
@@ -68,10 +70,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*":
-  version "17.0.18"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.18.tgz#4109cbbd901be9582e5e39e3d77acd7b66bb7fbe"
-  integrity sha512-YTLgu7oS5zvSqq49X5Iue5oAbVGhgPc5Au29SJC4VeE17V6gASoOxVkUDy9pXFMRFxCWCD9fLeweNFizo3UzOg==
+"@types/react@^16.14.0", "@types/react@*":
+  version "16.14.32"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.32.tgz#d4e4fe5ece3c27fcb4608b1f4a614f7dec881392"
+  integrity sha512-hvEy4vGVADbtj/U6+CA5SRC5QFIjdxD7JslAie8EuAYZwhYY9bgforpXNyF1VFzhnkEOesDy1278t1wdjN74cw==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
@@ -819,7 +821,7 @@ react-reconciler@^0.25.1:
     prop-types "^15.6.2"
     scheduler "^0.19.1"
 
-react@^16.13.1:
+react@^16.14.0:
   version "16.14.0"
   resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
   integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
@@ -1010,6 +1012,18 @@ tar@^4:
     safe-buffer "^5.2.1"
     yallist "^3.1.1"
 
+tar@^6.0.1:
+  version "6.1.11"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^3.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
 tar@^6.1.6:
   version "6.1.8"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.8.tgz#4fc50cfe56511c538ce15b71e05eebe66530cbd4"
@@ -1058,10 +1072,10 @@ typedoc@^0.17.8:
     shelljs "^0.8.4"
     typedoc-default-themes "^0.10.2"
 
-typescript@^4.3.5:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
-  integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
+typescript@^4.4.4:
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz#d59344522c4bc464a65a730ac695007fdb66dd88"
+  integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==
 
 uglify-js@^3.1.4:
   version "3.14.1"