diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ab23f46..d35a8cb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,18 @@
 # Changelog
 
-## [0.4.1] - 2022-06-18
+## [0.5.0] - 2022-02-24
+
+### Added
+
+* New WebSocket connection type.
+
+## [0.4.1] - 2022-02-18
 
 ### Added
 
 * New settings to switch che code execution engine.
 
-## [0.4.0] - 2022-06-17
+## [0.4.0] - 2022-02-17
 
 ### Added
 
diff --git a/README.html b/README.html
index 97516671..354cfec2 100644
--- a/README.html
+++ b/README.html
@@ -17,30 +17,34 @@
         : 'default'
     });
   </script>
-    <h1 id="1-nukeserversocket-readme">Changelog</h1>
-    <h2>v0.4.1 2022-02-18</h2>
-    <li>Switch code execution engine settings.</li>
+  <h1 id="1-nukeserversocket-readme">Changelog</h1>
+  <h2>v0.5.0 2022-02-25</h2>
+  <li>WebSocket communication protocol for browser-based text editors.</li>
 
-    <h2>v0.4.0 2022-02-17</h2>
-    <li>Intercept exceptions inside Nuke's thread to extension output.</li>
-    <li>Configurable timeout settings.</li>
-    <li>Display timeout timers in UI.</li>
+  <h2>v0.4.1 2022-02-18</h2>
+  <li>Switch code execution engine settings.</li>
 
-    <h2>v0.3.0 2022-02-06</h2>
-    <li>Various fixes and optimizations for code execution.</li>
+  <h2>v0.4.0 2022-02-17</h2>
+  <li>Intercept exceptions inside Nuke's thread to extension output.</li>
+  <li>Configurable timeout settings.</li>
+  <li>Display timeout timers in UI.</li>
 
-    <h2>v0.2.0 2021-10-29</h2>
-    <li>Connections timeouts.</li>
-    <li>Various fixes and optimizations.</li>
-  
-    <h2>v0.1.0 2021-09-23</h2>
-    <li>Execute BlinkScript code.</li>
-    <li>Send/Receive Nodes from another instance.</li>
-    <li>New About widget.</li>
-    <li>API now accepts also simple strings when sending a request.</li>
-    <li>Under the hood optimizations.</li>
+  <h2>v0.3.0 2022-02-06</h2>
+  <li>Various fixes and optimizations for code execution.</li>
+
+  <h2>v0.2.0 2021-10-29</h2>
+  <li>Connections timeouts.</li>
+  <li>Various fixes and optimizations.</li>
+
+  <h2>v0.1.0 2021-09-23</h2>
+  <li>Execute BlinkScript code.</li>
+  <li>Send/Receive Nodes from another instance.</li>
+  <li>New About widget.</li>
+  <li>API now accepts also simple strings when sending a request.</li>
+  <li>Under the hood optimizations.</li>
   
   <h1 id="1-nukeserversocket-readme">1. NukeServerSocket README</h1>
+  
   <p><a href="https://github.com/sisoe24/NukeServerSocket/releases"><img
         src="https://img.shields.io/github/v/release/sisoe24/NukeServerSocket?label=stable" alt="Main Build"></a>
     <a href="https://github.com/sisoe24/NukeServerSocket/releases"><img
@@ -68,11 +72,11 @@ <h1 id="1-nukeserversocket-readme">1. NukeServerSocket README</h1>
   <p><img src="https://img.shields.io/badge/Python-2.7.18_|_3.7.7-success" alt="x">
     <img src="https://img.shields.io/badge/Nuke-11_|_12_|13-yellow" alt="x">
   </p>
-  <p>A Nuke plugin that will allow code execution from the local network and more.</p>
+  <p>A Nuke plugin that will allow code execution from the local network via TCP/WebSocket connections and more.</p>
   <ul>
     <li><a href="#1-nukeserversocket-readme">1. NukeServerSocket README</a>
       <ul>
-        <li><a href="#11-tools">1.1. Tools</a></li>
+        <li><a href="#11-client-applications">1.1. Client applications</a></li>
         <li><a href="#12-features">1.2. Features</a></li>
         <li><a href="#13-installation">1.3. Installation</a></li>
         <li><a href="#14-usage">1.4. Usage</a>
@@ -91,21 +95,18 @@ <h1 id="1-nukeserversocket-readme">1. NukeServerSocket README</h1>
         <li><a href="#17-test-plugin-locally">1.7. Test plugin locally</a></li>
         <li><a href="#18-known-issues">1.8. Known Issues</a></li>
         <li><a href="#19-compatibility">1.9. Compatibility</a></li>
-        <li><a href="#110-overview">1.10. Overview</a>
-          <ul>
-            <li><a href="#1101-execute-code">1.10.1. Execute Code</a></li>
-            <li><a href="#1102-send-nodes">1.10.2. Send Nodes</a></li>
-          </ul>
-        </li>
+        <li><a href="#110-demo">1.10. Demo</a></li>
       </ul>
     </li>
   </ul>
-  <h2 id="11-tools">1.1. Tools</h2>
-  <p>Tools that are using NukeServerSocket:</p>
+  <h2 id="11-client-applications">1.1. Client applications</h2>
+  <p>Client applications that can use NukeServerSocket:</p>
   <ul>
     <li><a href="https://marketplace.visualstudio.com/items?itemName=virgilsisoe.nuke-tools">Nuke Tools</a> - Visual
       Studio Code extension.</li>
     <li><a href="https://packagecontrol.io/packages/NukeToolsST">Nuke Tools ST</a> - Sublime Text package.</li>
+    <li><a href="https://marketplace.visualstudio.com/items?itemName=virgilsisoe.dcc-websocket">DCC WebSocket</a> -
+      Visual Studio Code Web extension.</li>
   </ul>
   <h2 id="12-features">1.2. Features</h2>
   <ul>
@@ -113,6 +114,7 @@ <h2 id="12-features">1.2. Features</h2>
     <li>Multiple computers can connect to the same Nuke instance.</li>
     <li>Receive/Send nodes from another Nuke instance in your local network.</li>
     <li>Not bound to any application. (more on <a href="#16-extendibility">Extendibility</a>)</li>
+    <li>WebSocket compatible for browser-based text editors.</li>
   </ul>
   <h2 id="13-installation">1.3. Installation</h2>
   <p>Save the plugin in your <em>.nuke</em> directory or in a custom directory and then
@@ -158,6 +160,24 @@ <h4 id="1422-receive">1.4.2.2. Receive</h4>
   <h2 id="15-settings">1.5. Settings</h2>
   <p>The settings can be accessed from the plugin toolbar</p>
   <ul>
+    <li>
+      <p><strong>Code Execution Engine</strong>: Change the engine that is executing the code.</p>
+      <ul>
+        <li><strong>Nuke Internal</strong>: Nuke <code>executeInMainThread</code> function.</li>
+        <li><strong>Script Editor</strong>: Nuke Script Editor widget.</li>
+      </ul>
+    </li>
+    <li>
+      <p><strong>Connection Type</strong>: Change the internal connection protocol for the client-server.</p>
+      <ul>
+        <li><strong>TCP</strong>: The default type of connection. If unsure, use this.</li>
+        <li><strong>WebSocket</strong>: Similar to the TCP, allows two-way interactive communication session between the
+          user's browser and the internal server. Use this when using a browser-based text editor.</li>
+      </ul>
+      <blockquote>
+        <p>Changing connection type while connected, could cause some errors.</p>
+      </blockquote>
+    </li>
     <li>
       <p><strong>Mirror To Script Editor</strong>: Allows to mirror the input/output code to the internal script editor.
       </p>
@@ -202,6 +222,8 @@ <h2 id="17-test-plugin-locally">1.7. Test plugin locally</h2>
       page</a>.</p>
   <h2 id="18-known-issues">1.8. Known Issues</h2>
   <ul>
+    <li>Creating a modal window with the Nuke internal code execution engine, will cause Nuke to freeze. A workaround is
+      to switch to the Script Editor engine.</li>
     <li>Settings window doesn't display the tooltip text.</li>
     <li>When changing workspace with an active open connection, Nuke will load a new plugin instance with the default UI
       state. This would look as if the previous connection has been closed, where in reality is still open and
@@ -223,18 +245,18 @@ <h2 id="19-compatibility">1.9. Compatibility</h2>
     <li>MacOS:
       <ul>
         <li>Mojave 10.14.06</li>
-        <li>Catalina 10.15.06</li>
+        <li>Catalina 10.15.07</li>
       </ul>
     </li>
     <li>Windows 10</li>
   </ul>
-  <h2 id="110-overview">1.10. Overview</h2>
-  <h3 id="1101-execute-code">1.10.1. Execute Code</h3>
-  <img title="Execute Code" src="https://github.com/sisoe24/NukeServerSocket/blob/main/images/execute_code.gif?raw=true"
-    width="100%" />
-  <h3 id="1102-send-nodes">1.10.2. Send Nodes</h3>
-  <img title="Send Nodes" src="https://github.com/sisoe24/NukeServerSocket/blob/main/images/send_nodes.gif?raw=true"
-    width="100%" />
+  <h2 id="110-demo">1.10. Demo</h2>
+  <p>Execute code from Visual Studio Code</p>
+  <p><img src="https://github.com/sisoe24/NukeServerSocket/blob/main/images/execute_code.gif?raw=true"
+      alt="Execute Code"></p>
+  <p>Send nodes</p>
+  <p><img src="https://github.com/sisoe24/NukeServerSocket/blob/main/images/send_nodes.gif?raw=true" alt="Send Nodes">
+  </p>
 
 </body>
 
diff --git a/README.md b/README.md
index 93348825..d7dfb827 100644
--- a/README.md
+++ b/README.md
@@ -16,10 +16,10 @@
 ![x](https://img.shields.io/badge/Python-2.7.18_|_3.7.7-success)
 ![x](https://img.shields.io/badge/Nuke-11_|_12_|13-yellow)
 
-A Nuke plugin that will allow code execution from the local network and more.
+A Nuke plugin that will allow code execution from the local network via TCP/WebSocket connections and more.
 
 - [1. NukeServerSocket README](#1-nukeserversocket-readme)
-  - [1.1. Tools](#11-tools)
+  - [1.1. Client applications](#11-client-applications)
   - [1.2. Features](#12-features)
   - [1.3. Installation](#13-installation)
   - [1.4. Usage](#14-usage)
@@ -32,16 +32,15 @@ A Nuke plugin that will allow code execution from the local network and more.
   - [1.7. Test plugin locally](#17-test-plugin-locally)
   - [1.8. Known Issues](#18-known-issues)
   - [1.9. Compatibility](#19-compatibility)
-  - [1.10. Overview](#110-overview)
-    - [1.10.1. Execute Code](#1101-execute-code)
-    - [1.10.2. Send Nodes](#1102-send-nodes)
+  - [1.10. Demo](#110-demo)
 
-## 1.1. Tools
+## 1.1. Client applications
 
-Tools that are using NukeServerSocket:
+Client applications that can use NukeServerSocket:
 
 - [Nuke Tools](https://marketplace.visualstudio.com/items?itemName=virgilsisoe.nuke-tools) - Visual Studio Code extension.
 - [Nuke Tools ST](https://packagecontrol.io/packages/NukeToolsST) - Sublime Text package.
+- [DCC WebSocket](https://marketplace.visualstudio.com/items?itemName=virgilsisoe.dcc-websocket) - Visual Studio Code Web extension.
 
 ## 1.2. Features
 
@@ -49,6 +48,7 @@ Tools that are using NukeServerSocket:
 - Multiple computers can connect to the same Nuke instance.
 - Receive/Send nodes from another Nuke instance in your local network.
 - Not bound to any application. (more on [Extendibility](#16-extendibility))
+- WebSocket compatible for browser-based text editors.
 
 ## 1.3. Installation
 
@@ -92,6 +92,12 @@ The settings can be accessed from the plugin toolbar
   - **Nuke Internal**: Nuke `executeInMainThread` function.
   - **Script Editor**: Nuke Script Editor widget.
 
+- **Connection Type**: Change the internal connection protocol for the client-server.
+  - **TCP**: The default type of connection. If unsure, use this.
+  - **WebSocket**: Similar to the TCP, allows two-way interactive communication session between the user's browser and the internal server. Use this when using a browser-based text editor.
+
+  > Changing connection type while connected, could cause some errors.
+
 - **Mirror To Script Editor**: Allows to mirror the input/output code to the internal script editor.
   - **Override Output Editor**: Mirror output to the internal script editor.
   - **Format Text**: The script editor output window will received a formatted version of the code result.
@@ -139,15 +145,15 @@ While it should work the same on all platforms, it has been currently only teste
   - CentOS 8
 - MacOS:
   - Mojave 10.14.06
-  - Catalina 10.15.06
+  - Catalina 10.15.07
 - Windows 10
 
-## 1.10. Overview
+## 1.10. Demo
 
-### 1.10.1. Execute Code
+Execute code from Visual Studio Code
 
-<img title="Execute Code" src="https://github.com/sisoe24/NukeServerSocket/blob/main/images/execute_code.gif?raw=true" width="100%"/>
+![Execute Code](https://github.com/sisoe24/NukeServerSocket/blob/main/images/execute_code.gif?raw=true)
 
-### 1.10.2. Send Nodes
+Send nodes
 
-<img title="Send Nodes" src="https://github.com/sisoe24/NukeServerSocket/blob/main/images/send_nodes.gif?raw=true" width="100%"/>
+![Send Nodes](https://github.com/sisoe24/NukeServerSocket/blob/main/images/send_nodes.gif?raw=true)
diff --git a/poetry.lock b/poetry.lock
index 68f8674e..0a6e4b0c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -8,17 +8,17 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "attrs"
-version = "21.2.0"
+version = "21.4.0"
 description = "Classes Without Boilerplate"
 category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [package.extras]
-dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit"]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
 docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
-tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface"]
-tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins"]
+tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
+tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"]
 
 [[package]]
 name = "certifi"
@@ -30,7 +30,7 @@ python-versions = "*"
 
 [[package]]
 name = "charset-normalizer"
-version = "2.0.7"
+version = "2.0.12"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
 category = "dev"
 optional = false
@@ -49,7 +49,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [[package]]
 name = "coverage"
-version = "6.0.2"
+version = "6.2"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
@@ -71,7 +71,7 @@ python-versions = ">=3.5"
 
 [[package]]
 name = "importlib-metadata"
-version = "4.8.1"
+version = "4.8.3"
 description = "Read metadata from Python packages"
 category = "dev"
 optional = false
@@ -84,7 +84,7 @@ zipp = ">=0.5"
 [package.extras]
 docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
 perf = ["ipython"]
-testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"]
+testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"]
 
 [[package]]
 name = "iniconfig"
@@ -96,14 +96,14 @@ python-versions = "*"
 
 [[package]]
 name = "packaging"
-version = "21.0"
+version = "21.3"
 description = "Core utilities for Python packages"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
 
 [package.dependencies]
-pyparsing = ">=2.0.2"
+pyparsing = ">=2.0.2,<3.0.5 || >3.0.5"
 
 [[package]]
 name = "pluggy"
@@ -122,19 +122,22 @@ testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "py"
-version = "1.10.0"
+version = "1.11.0"
 description = "library with cross-python path, ini-parsing, io, code, log facilities"
 category = "dev"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [[package]]
 name = "pyparsing"
-version = "2.4.7"
+version = "3.0.7"
 description = "Python parsing module"
 category = "dev"
 optional = false
-python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+python-versions = ">=3.6"
+
+[package.extras]
+diagrams = ["jinja2", "railroad-diagrams"]
 
 [[package]]
 name = "pyside2"
@@ -201,7 +204,7 @@ doc = ["sphinx", "sphinx-rtd-theme"]
 
 [[package]]
 name = "pytest-randomly"
-version = "3.10.1"
+version = "3.10.3"
 description = "Pytest plugin to randomly order tests and control random.seed."
 category = "dev"
 optional = false
@@ -266,7 +269,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 
 [[package]]
 name = "tomli"
-version = "1.2.1"
+version = "1.2.3"
 description = "A lil' TOML parser"
 category = "dev"
 optional = false
@@ -274,15 +277,15 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "typing-extensions"
-version = "3.10.0.2"
-description = "Backported and Experimental Type Hints for Python 3.5+"
+version = "4.1.1"
+description = "Backported and Experimental Type Hints for Python 3.6+"
 category = "dev"
 optional = false
-python-versions = "*"
+python-versions = ">=3.6"
 
 [[package]]
 name = "urllib3"
-version = "1.26.7"
+version = "1.26.8"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 category = "dev"
 optional = false
@@ -307,8 +310,8 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes
 
 [metadata]
 lock-version = "1.1"
-python-versions = "~3.7.7"
-content-hash = "04b1f17f5266b2cc331d72a1371882cd41b9ad559aea6d27cd5c6ed0aebe6267"
+python-versions = ">=3.6, <=3.7.7"
+content-hash = "5077ff158e06203e7a5066f34841fd167e229b73fc9c9809d96df8a9678ea002"
 
 [metadata.files]
 atomicwrites = [
@@ -316,83 +319,97 @@ atomicwrites = [
     {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"},
 ]
 attrs = [
-    {file = "attrs-21.2.0-py2.py3-none-any.whl", hash = "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1"},
-    {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"},
+    {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"},
+    {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"},
 ]
 certifi = [
     {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
     {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"},
 ]
 charset-normalizer = [
-    {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"},
-    {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"},
+    {file = "charset-normalizer-2.0.12.tar.gz", hash = "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597"},
+    {file = "charset_normalizer-2.0.12-py3-none-any.whl", hash = "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df"},
 ]
 colorama = [
     {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
     {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
 ]
 coverage = [
-    {file = "coverage-6.0.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:1549e1d08ce38259de2bc3e9a0d5f3642ff4a8f500ffc1b2df73fd621a6cdfc0"},
-    {file = "coverage-6.0.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bcae10fccb27ca2a5f456bf64d84110a5a74144be3136a5e598f9d9fb48c0caa"},
-    {file = "coverage-6.0.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:53a294dc53cfb39c74758edaa6305193fb4258a30b1f6af24b360a6c8bd0ffa7"},
-    {file = "coverage-6.0.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8251b37be1f2cd9c0e5ccd9ae0380909c24d2a5ed2162a41fcdbafaf59a85ebd"},
-    {file = "coverage-6.0.2-cp310-cp310-win32.whl", hash = "sha256:db42baa892cba723326284490283a68d4de516bfb5aaba369b4e3b2787a778b7"},
-    {file = "coverage-6.0.2-cp310-cp310-win_amd64.whl", hash = "sha256:bbffde2a68398682623d9dd8c0ca3f46fda074709b26fcf08ae7a4c431a6ab2d"},
-    {file = "coverage-6.0.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:60e51a3dd55540bec686d7fff61b05048ca31e804c1f32cbb44533e6372d9cc3"},
-    {file = "coverage-6.0.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6a6a9409223a27d5ef3cca57dd7cd4dfcb64aadf2fad5c3b787830ac9223e01a"},
-    {file = "coverage-6.0.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:4b34ae4f51bbfa5f96b758b55a163d502be3dcb24f505d0227858c2b3f94f5b9"},
-    {file = "coverage-6.0.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3bbda1b550e70fa6ac40533d3f23acd4f4e9cb4e6e77251ce77fdf41b3309fb2"},
-    {file = "coverage-6.0.2-cp36-cp36m-win32.whl", hash = "sha256:4e28d2a195c533b58fc94a12826f4431726d8eb029ac21d874345f943530c122"},
-    {file = "coverage-6.0.2-cp36-cp36m-win_amd64.whl", hash = "sha256:a82d79586a0a4f5fd1cf153e647464ced402938fbccb3ffc358c7babd4da1dd9"},
-    {file = "coverage-6.0.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3be1206dc09fb6298de3fce70593e27436862331a85daee36270b6d0e1c251c4"},
-    {file = "coverage-6.0.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c9cd3828bbe1a40070c11fe16a51df733fd2f0cb0d745fb83b7b5c1f05967df7"},
-    {file = "coverage-6.0.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:d036dc1ed8e1388e995833c62325df3f996675779541f682677efc6af71e96cc"},
-    {file = "coverage-6.0.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:04560539c19ec26995ecfb3d9307ff154fbb9a172cb57e3b3cfc4ced673103d1"},
-    {file = "coverage-6.0.2-cp37-cp37m-win32.whl", hash = "sha256:e4fb7ced4d9dec77d6cf533acfbf8e1415fe799430366affb18d69ee8a3c6330"},
-    {file = "coverage-6.0.2-cp37-cp37m-win_amd64.whl", hash = "sha256:77b1da5767ed2f44611bc9bc019bc93c03fa495728ec389759b6e9e5039ac6b1"},
-    {file = "coverage-6.0.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:61b598cbdbaae22d9e34e3f675997194342f866bb1d781da5d0be54783dce1ff"},
-    {file = "coverage-6.0.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:36e9040a43d2017f2787b28d365a4bb33fcd792c7ff46a047a04094dc0e2a30d"},
-    {file = "coverage-6.0.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:9f1627e162e3864a596486774876415a7410021f4b67fd2d9efdf93ade681afc"},
-    {file = "coverage-6.0.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e7a0b42db2a47ecb488cde14e0f6c7679a2c5a9f44814393b162ff6397fcdfbb"},
-    {file = "coverage-6.0.2-cp38-cp38-win32.whl", hash = "sha256:a1b73c7c4d2a42b9d37dd43199c5711d91424ff3c6c22681bc132db4a4afec6f"},
-    {file = "coverage-6.0.2-cp38-cp38-win_amd64.whl", hash = "sha256:1db67c497688fd4ba85b373b37cc52c50d437fd7267520ecd77bddbd89ea22c9"},
-    {file = "coverage-6.0.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f2f184bf38e74f152eed7f87e345b51f3ab0b703842f447c22efe35e59942c24"},
-    {file = "coverage-6.0.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cd1cf1deb3d5544bd942356364a2fdc8959bad2b6cf6eb17f47d301ea34ae822"},
-    {file = "coverage-6.0.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ad9b8c1206ae41d46ec7380b78ba735ebb77758a650643e841dd3894966c31d0"},
-    {file = "coverage-6.0.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:381d773d896cc7f8ba4ff3b92dee4ed740fb88dfe33b6e42efc5e8ab6dfa1cfe"},
-    {file = "coverage-6.0.2-cp39-cp39-win32.whl", hash = "sha256:424c44f65e8be58b54e2b0bd1515e434b940679624b1b72726147cfc6a9fc7ce"},
-    {file = "coverage-6.0.2-cp39-cp39-win_amd64.whl", hash = "sha256:abbff240f77347d17306d3201e14431519bf64495648ca5a49571f988f88dee9"},
-    {file = "coverage-6.0.2-pp36-none-any.whl", hash = "sha256:7092eab374346121805fb637572483270324407bf150c30a3b161fc0c4ca5164"},
-    {file = "coverage-6.0.2-pp37-none-any.whl", hash = "sha256:30922626ce6f7a5a30bdba984ad21021529d3d05a68b4f71ea3b16bda35b8895"},
-    {file = "coverage-6.0.2.tar.gz", hash = "sha256:6807947a09510dc31fa86f43595bf3a14017cd60bf633cc746d52141bfa6b149"},
+    {file = "coverage-6.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6dbc1536e105adda7a6312c778f15aaabe583b0e9a0b0a324990334fd458c94b"},
+    {file = "coverage-6.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:174cf9b4bef0db2e8244f82059a5a72bd47e1d40e71c68ab055425172b16b7d0"},
+    {file = "coverage-6.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:92b8c845527eae547a2a6617d336adc56394050c3ed8a6918683646328fbb6da"},
+    {file = "coverage-6.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c7912d1526299cb04c88288e148c6c87c0df600eca76efd99d84396cfe00ef1d"},
+    {file = "coverage-6.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d5d2033d5db1d58ae2d62f095e1aefb6988af65b4b12cb8987af409587cc0739"},
+    {file = "coverage-6.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3feac4084291642165c3a0d9eaebedf19ffa505016c4d3db15bfe235718d4971"},
+    {file = "coverage-6.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:276651978c94a8c5672ea60a2656e95a3cce2a3f31e9fb2d5ebd4c215d095840"},
+    {file = "coverage-6.2-cp310-cp310-win32.whl", hash = "sha256:f506af4f27def639ba45789fa6fde45f9a217da0be05f8910458e4557eed020c"},
+    {file = "coverage-6.2-cp310-cp310-win_amd64.whl", hash = "sha256:3f7c17209eef285c86f819ff04a6d4cbee9b33ef05cbcaae4c0b4e8e06b3ec8f"},
+    {file = "coverage-6.2-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:13362889b2d46e8d9f97c421539c97c963e34031ab0cb89e8ca83a10cc71ac76"},
+    {file = "coverage-6.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:22e60a3ca5acba37d1d4a2ee66e051f5b0e1b9ac950b5b0cf4aa5366eda41d47"},
+    {file = "coverage-6.2-cp311-cp311-win_amd64.whl", hash = "sha256:b637c57fdb8be84e91fac60d9325a66a5981f8086c954ea2772efe28425eaf64"},
+    {file = "coverage-6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f467bbb837691ab5a8ca359199d3429a11a01e6dfb3d9dcc676dc035ca93c0a9"},
+    {file = "coverage-6.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2641f803ee9f95b1f387f3e8f3bf28d83d9b69a39e9911e5bfee832bea75240d"},
+    {file = "coverage-6.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1219d760ccfafc03c0822ae2e06e3b1248a8e6d1a70928966bafc6838d3c9e48"},
+    {file = "coverage-6.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9a2b5b52be0a8626fcbffd7e689781bf8c2ac01613e77feda93d96184949a98e"},
+    {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:8e2c35a4c1f269704e90888e56f794e2d9c0262fb0c1b1c8c4ee44d9b9e77b5d"},
+    {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:5d6b09c972ce9200264c35a1d53d43ca55ef61836d9ec60f0d44273a31aa9f17"},
+    {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:e3db840a4dee542e37e09f30859f1612da90e1c5239a6a2498c473183a50e781"},
+    {file = "coverage-6.2-cp36-cp36m-win32.whl", hash = "sha256:4e547122ca2d244f7c090fe3f4b5a5861255ff66b7ab6d98f44a0222aaf8671a"},
+    {file = "coverage-6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:01774a2c2c729619760320270e42cd9e797427ecfddd32c2a7b639cdc481f3c0"},
+    {file = "coverage-6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fb8b8ee99b3fffe4fd86f4c81b35a6bf7e4462cba019997af2fe679365db0c49"},
+    {file = "coverage-6.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:619346d57c7126ae49ac95b11b0dc8e36c1dd49d148477461bb66c8cf13bb521"},
+    {file = "coverage-6.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0a7726f74ff63f41e95ed3a89fef002916c828bb5fcae83b505b49d81a066884"},
+    {file = "coverage-6.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cfd9386c1d6f13b37e05a91a8583e802f8059bebfccde61a418c5808dea6bbfa"},
+    {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:17e6c11038d4ed6e8af1407d9e89a2904d573be29d51515f14262d7f10ef0a64"},
+    {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c254b03032d5a06de049ce8bca8338a5185f07fb76600afff3c161e053d88617"},
+    {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:dca38a21e4423f3edb821292e97cec7ad38086f84313462098568baedf4331f8"},
+    {file = "coverage-6.2-cp37-cp37m-win32.whl", hash = "sha256:600617008aa82032ddeace2535626d1bc212dfff32b43989539deda63b3f36e4"},
+    {file = "coverage-6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:bf154ba7ee2fd613eb541c2bc03d3d9ac667080a737449d1a3fb342740eb1a74"},
+    {file = "coverage-6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f9afb5b746781fc2abce26193d1c817b7eb0e11459510fba65d2bd77fe161d9e"},
+    {file = "coverage-6.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:edcada2e24ed68f019175c2b2af2a8b481d3d084798b8c20d15d34f5c733fa58"},
+    {file = "coverage-6.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a9c8c4283e17690ff1a7427123ffb428ad6a52ed720d550e299e8291e33184dc"},
+    {file = "coverage-6.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f614fc9956d76d8a88a88bb41ddc12709caa755666f580af3a688899721efecd"},
+    {file = "coverage-6.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9365ed5cce5d0cf2c10afc6add145c5037d3148585b8ae0e77cc1efdd6aa2953"},
+    {file = "coverage-6.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8bdfe9ff3a4ea37d17f172ac0dff1e1c383aec17a636b9b35906babc9f0f5475"},
+    {file = "coverage-6.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:63c424e6f5b4ab1cf1e23a43b12f542b0ec2e54f99ec9f11b75382152981df57"},
+    {file = "coverage-6.2-cp38-cp38-win32.whl", hash = "sha256:49dbff64961bc9bdd2289a2bda6a3a5a331964ba5497f694e2cbd540d656dc1c"},
+    {file = "coverage-6.2-cp38-cp38-win_amd64.whl", hash = "sha256:9a29311bd6429be317c1f3fe4bc06c4c5ee45e2fa61b2a19d4d1d6111cb94af2"},
+    {file = "coverage-6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:03b20e52b7d31be571c9c06b74746746d4eb82fc260e594dc662ed48145e9efd"},
+    {file = "coverage-6.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:215f8afcc02a24c2d9a10d3790b21054b58d71f4b3c6f055d4bb1b15cecce685"},
+    {file = "coverage-6.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a4bdeb0a52d1d04123b41d90a4390b096f3ef38eee35e11f0b22c2d031222c6c"},
+    {file = "coverage-6.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c332d8f8d448ded473b97fefe4a0983265af21917d8b0cdcb8bb06b2afe632c3"},
+    {file = "coverage-6.2-cp39-cp39-win32.whl", hash = "sha256:6e1394d24d5938e561fbeaa0cd3d356207579c28bd1792f25a068743f2d5b282"},
+    {file = "coverage-6.2-cp39-cp39-win_amd64.whl", hash = "sha256:86f2e78b1eff847609b1ca8050c9e1fa3bd44ce755b2ec30e70f2d3ba3844644"},
+    {file = "coverage-6.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:5829192582c0ec8ca4a2532407bc14c2f338d9878a10442f5d03804a95fac9de"},
+    {file = "coverage-6.2.tar.gz", hash = "sha256:e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8"},
 ]
 idna = [
     {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"},
     {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"},
 ]
 importlib-metadata = [
-    {file = "importlib_metadata-4.8.1-py3-none-any.whl", hash = "sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15"},
-    {file = "importlib_metadata-4.8.1.tar.gz", hash = "sha256:f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1"},
+    {file = "importlib_metadata-4.8.3-py3-none-any.whl", hash = "sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e"},
+    {file = "importlib_metadata-4.8.3.tar.gz", hash = "sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668"},
 ]
 iniconfig = [
     {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
 ]
 packaging = [
-    {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"},
-    {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"},
+    {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
+    {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
 ]
 pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
 py = [
-    {file = "py-1.10.0-py2.py3-none-any.whl", hash = "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"},
-    {file = "py-1.10.0.tar.gz", hash = "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"},
+    {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
+    {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
 ]
 pyparsing = [
-    {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"},
-    {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"},
+    {file = "pyparsing-3.0.7-py3-none-any.whl", hash = "sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484"},
+    {file = "pyparsing-3.0.7.tar.gz", hash = "sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea"},
 ]
 pyside2 = [
     {file = "PySide2-5.12.2-5.12.2-cp27-cp27m-macosx_10_12_intel.whl", hash = "sha256:0ba1ed679ef6362223136d0361f5f2b356a88001accb5a3dac6f72f1ac5e5624"},
@@ -415,8 +432,8 @@ pytest-qt = [
     {file = "pytest_qt-4.0.2-py2.py3-none-any.whl", hash = "sha256:e03847ac02a890ccaac0fde1748855b9dce425aceba62005c6cfced6cf7d5456"},
 ]
 pytest-randomly = [
-    {file = "pytest-randomly-3.10.1.tar.gz", hash = "sha256:d4ef5dbf27e542e6a4e4cec7a20ef3f1b906bce21fa340ca5657b5326ef23a64"},
-    {file = "pytest_randomly-3.10.1-py3-none-any.whl", hash = "sha256:d28d490e3a743bdd64c5bc87c5fc182eac966ba6432c6bb6b224e32e76527e9e"},
+    {file = "pytest-randomly-3.10.3.tar.gz", hash = "sha256:22154cdcff7ba44e0599596490e6b75278ca973a33812ea6a54bf14d0b042ef1"},
+    {file = "pytest_randomly-3.10.3-py3-none-any.whl", hash = "sha256:b05a7a45f54cae2b5095752c6a10cb559df84448421b0420ae492dd2fb1727ef"},
 ]
 pytest-repeat = [
     {file = "pytest-repeat-0.9.1.tar.gz", hash = "sha256:5cd3289745ab3156d43eb9c8e7f7d00a926f3ae5c9cf425bec649b2fe15bad5b"},
@@ -443,17 +460,16 @@ toml = [
     {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
 ]
 tomli = [
-    {file = "tomli-1.2.1-py3-none-any.whl", hash = "sha256:8dd0e9524d6f386271a36b41dbf6c57d8e32fd96fd22b6584679dc569d20899f"},
-    {file = "tomli-1.2.1.tar.gz", hash = "sha256:a5b75cb6f3968abb47af1b40c1819dc519ea82bcc065776a866e8d74c5ca9442"},
+    {file = "tomli-1.2.3-py3-none-any.whl", hash = "sha256:e3069e4be3ead9668e21cb9b074cd948f7b3113fd9c8bba083f48247aab8b11c"},
+    {file = "tomli-1.2.3.tar.gz", hash = "sha256:05b6166bff487dc068d322585c7ea4ef78deed501cc124060e0f238e89a9231f"},
 ]
 typing-extensions = [
-    {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"},
-    {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"},
-    {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"},
+    {file = "typing_extensions-4.1.1-py3-none-any.whl", hash = "sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2"},
+    {file = "typing_extensions-4.1.1.tar.gz", hash = "sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42"},
 ]
 urllib3 = [
-    {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"},
-    {file = "urllib3-1.26.7.tar.gz", hash = "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"},
+    {file = "urllib3-1.26.8-py2.py3-none-any.whl", hash = "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed"},
+    {file = "urllib3-1.26.8.tar.gz", hash = "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c"},
 ]
 zipp = [
     {file = "zipp-3.6.0-py3-none-any.whl", hash = "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"},
diff --git a/pyproject.toml b/pyproject.toml
index 77319b67..1ccd8d90 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nukeserversocket"
-version = "0.4.1"
+version = "0.5.0"
 description = ""
 authors = ["virgilsisoe <virgilsisoe@gmail.com>"]
 packages = [
diff --git a/src/_nuke.py b/src/_nuke.py
index 2d3e864e..992ad944 100644
--- a/src/_nuke.py
+++ b/src/_nuke.py
@@ -3,8 +3,6 @@
 from __future__ import print_function
 
 import re
-import sys
-import subprocess
 from textwrap import dedent
 
 from PySide2.QtGui import QClipboard
@@ -33,6 +31,11 @@ def nodeCopy(string):
     ypos -301
     }
     """).strip()
+
+    # raise an exception for testing purposes
+    if isinstance(string, bool):
+        raise RuntimeError
+
     if re.match(r'^%.+%$', string):
         clipboard = QClipboard()
         clipboard.setText(copy_tmp)
@@ -41,10 +44,6 @@ def nodeCopy(string):
             file.write(copy_tmp)
 
 
-def executeInMainThreadWithResult(call, args):  # skipcq: PYL-W0613
+def executeInMainThreadWithResult(call, args):    # skipcq: PYL-W0613
     """Internal function placeholder that mimics the behavior of Nukes internal."""
-    if args.startswith('nuke.nodePaste'):
-        return args
-
-    code = subprocess.check_output([sys.executable, '-c', args])
-    return pyDecoder(code)
+    return args if args.startswith('nuke.nodePaste') else pyDecoder(call(args))
diff --git a/src/about.py b/src/about.py
index a97dd144..b19745cc 100644
--- a/src/about.py
+++ b/src/about.py
@@ -87,7 +87,7 @@ def about_links():
         ('Issues', github_web + '/issues'),
         ('Nukepedia', 'https://www.nukepedia.com/python/misc/nukeserversocket'),
         ('Logs', 'file:///%s/src/log' % _get_root()),
-        ('External Tools', 'https://github.com/sisoe24/NukeServerSocket#11-tools'),
+        ('Client apps', 'https://github.com/sisoe24/NukeServerSocket#11-client-applications'),
         ('Other', '')
     )
 
diff --git a/src/connection/nss_client.py b/src/connection/nss_client.py
index 1a08424b..62631bc7 100644
--- a/src/connection/nss_client.py
+++ b/src/connection/nss_client.py
@@ -7,11 +7,13 @@
 import logging
 
 from PySide2.QtCore import QObject, Signal
+from PySide2.QtWebSockets import QWebSocket
 from PySide2.QtNetwork import QAbstractSocket, QTcpSocket
 
 from .. import nuke
 from ..widgets import Timer
-from ..utils import AppSettings, validate_output
+from ..utils import AppSettings
+from .nss_socket import _AbstractSocket
 
 
 LOGGER = logging.getLogger('NukeServerSocket.client')
@@ -72,14 +74,12 @@ def __init__(self, hostname, port):  # type: (str, int) -> None
         self.tcp_host = hostname
         self.tcp_port = port
 
-        # TODO should make a custom tcp class
-        self.socket = QTcpSocket()
+        self.socket = _AbstractSocket(self._socket_constructor())
+        LOGGER.debug('Initialize QBaseClient socket: %s', self.socket._type)
 
-        self.socket.readyRead.connect(self.read_data)
-        self.socket.connected.connect(self.on_connected)
-        self.socket.disconnected.connect(self.on_disconnect)
-        self.socket.error.connect(self.on_error)
-        self.socket.stateChanged.connect(self.connection_state)
+        self.socket.socket.connected.connect(self.on_connected)
+        self.socket.socket.error.connect(self.on_error)
+        self.socket.socket.stateChanged.connect(self.connection_state)
 
         self.timer = Timer(
             int(AppSettings().value('timeout/client', 10))
@@ -87,6 +87,13 @@ def __init__(self, hostname, port):  # type: (str, int) -> None
         self.timer.time.connect(self.client_timeout.emit)
         self.timer._timer.timeout.connect(self._connection_timeout)
 
+    @staticmethod
+    def _socket_constructor():
+        """Initialize the socket type based on app settings."""
+        if AppSettings().get_bool('connection_type/websocket'):
+            return QWebSocket()
+        return QTcpSocket()
+
     def on_connected(self):
         """When connection is establish do stuff.
 
@@ -95,6 +102,17 @@ def on_connected(self):
         """
         raise NotImplementedError('Child class must implement method.')
 
+    def on_error(self, error):
+        """Error connection event.
+
+        This can happen when the host address is wrong. When error occurs,
+        stop the timeout timer and emit a `state_changed`: 'Error...'.
+        """
+        self.timer.stop()
+        self.state_changed.emit('Error: %s\n----' %
+                                self.socket.socket.errorString())
+        LOGGER.error("QBaseClient Error: %s", error)
+
     def connection_state(self, socket_state):
         """Check che socket connection state.
 
@@ -117,7 +135,7 @@ def connection_state(self, socket_state):
     def _disconnect(self):
         """Abort socket connection."""
         self.timer.stop()
-        self.socket.abort()
+        self.socket.socket.abort()
 
     def _connection_timeout(self):
         """Trigger connection timeout event.
@@ -126,7 +144,7 @@ def _connection_timeout(self):
         'Connection timeout' and close the socket.
         """
         self.state_changed.emit('Connection timeout.\n----')
-        LOGGER.debug('Connection Timeout')
+        LOGGER.debug('QBaseClient :: Connection Timeout')
         self._disconnect()
 
     def write_data(self, data):  # type: (dict) -> None
@@ -136,37 +154,16 @@ def write_data(self, data):  # type: (dict) -> None
             data (dict): valid dict type that is used from the socket class to
             initialize the code execution.
         """
-        self.socket.write(validate_output(json.dumps(data)))
-
-        self.socket.flush()
-        self.socket.disconnectFromHost()
-
-    @staticmethod
-    def on_disconnect():
-        """Disconnect event."""
-        LOGGER.debug('Client :: Disconnected from host')
+        self.socket.write(json.dumps(data))
+        self.socket.close()
 
     def connect_to_host(self):
         """Connect to host and start the timeout timer."""
-        LOGGER.debug('Client :: Connecting to host: %s %s',
+        LOGGER.debug('QBaseClient :: Connecting to host: %s %s',
                      self.tcp_host, self.tcp_port)
-        self.socket.connectToHost(self.tcp_host, self.tcp_port)
+        self.socket._connect(self.tcp_host, self.tcp_port)
         self.timer.start()
 
-    def on_error(self, error):
-        """Error connection event.
-
-        When error occurs, stop the timeout timer and emit a `state_changed`:
-        'Error...'.
-        """
-        self.timer.stop()
-        self.state_changed.emit('Error: %s\n----' % self.socket.errorString())
-        LOGGER.error("QBaseClient Error: %s", error)
-
-    def read_data(self):
-        """Read data ready event."""
-        LOGGER.debug('Reading data: %s', self.socket.readAll())
-
 
 class SendTestClient(QBaseClient):
     """Test connection by sending a sample text to the local host port."""
@@ -192,11 +189,15 @@ def on_connected(self):
 
         When connection is establish write data to socket.
         """
-        LOGGER.debug('SendTestClient :: Connection successful.')
+        LOGGER.debug('SendTestClient :: Handshake successful.')
         r = random.randint(1, 50)
 
+        client = 'WebSocket' if self.socket.is_websocket else 'TCP'
+        code = ("from __future__ import print_function\n"
+                "print('Hello from Test %s Client', %s)") % (client, r)
+
         output_text = {
-            "text": "from __future__ import print_function; print('Hello from Test Client', %s)" % r,
+            "text": code,
             "file": "path/to/tmp_file.py"
         }
 
@@ -220,7 +221,7 @@ def __init__(self, hostname=None, port=None):
             hostname (str, optional): hostname to connect. Defaults to None.
             port (int, optional): port to connect. Defaults to None.
         """
-        LOGGER.debug('Client :: Sending nodes...')
+        LOGGER.debug('SendNodesClient :: Sending nodes...')
 
         addresses = NetworkAddresses()
         hostname = hostname or addresses.send_address
@@ -234,7 +235,7 @@ def on_connected(self):
         When connection is establish write the content of the transfer file to
         the socket.
         """
-        LOGGER.debug('Client :: Send nodes connection successful.')
+        LOGGER.debug('SendNodesClient :: Handshake successful.')
         try:
             self.write_data(self.transfer_file_content())
         except NodesNotSelectedError:
@@ -258,6 +259,7 @@ def transfer_file_content(self):
             nuke.nodeCopy(transfer_file)
         except RuntimeError:
             self.state_changed.emit('No nodes selected.')
+            LOGGER.error('SendNodesClient :: NodesNotSelected error.')
             raise NodesNotSelectedError
         else:
             with open(transfer_file) as file:
diff --git a/src/connection/nss_server.py b/src/connection/nss_server.py
index cba3c893..f9884eda 100644
--- a/src/connection/nss_server.py
+++ b/src/connection/nss_server.py
@@ -5,6 +5,7 @@
 import logging
 
 from PySide2.QtCore import QObject, Signal
+from PySide2.QtWebSockets import QWebSocketServer
 from PySide2.QtNetwork import QAbstractSocket, QTcpServer, QHostAddress
 
 from .nss_socket import QSocket
@@ -40,7 +41,7 @@ def __init__(self):
 
         self.tcp_port = int(self.settings.value('server/port', '54321'))
 
-        self.server = QTcpServer()
+        self.server = self._init_server()
         self.server.newConnection.connect(self._create_connection)
         self.server.acceptError.connect(
             lambda err: LOGGER.error('QServer error: %s', err)
@@ -55,6 +56,13 @@ def __init__(self):
         self.timer.time.connect(self.server_timeout.emit)
         self.timer._timer.timeout.connect(self.timeout.emit)
 
+    @staticmethod
+    def _init_server():
+        """Initialize the server type based on settings."""
+        if AppSettings().get_bool('connection_type/websocket'):
+            return QWebSocketServer('NukeServerSocket', QWebSocketServer.NonSecureMode)
+        return QTcpServer()
+
     def connection_state(self, state):
         """Check if connection state.
 
diff --git a/src/connection/nss_socket.py b/src/connection/nss_socket.py
index 52bc9cfd..bf73efd4 100644
--- a/src/connection/nss_socket.py
+++ b/src/connection/nss_socket.py
@@ -4,7 +4,8 @@
 
 import logging
 
-from PySide2.QtCore import QObject, Signal
+from PySide2.QtCore import QObject, Signal, QUrl
+from PySide2.QtWebSockets import QWebSocket
 
 from .data_to_code import DataCode, InvalidData
 from ..utils import validate_output, AppSettings
@@ -14,6 +15,88 @@
 LOGGER = logging.getLogger('NukeServerSocket.socket')
 
 
+class _AbstractSocket(QObject):
+    """Abstract socket class QObject.
+
+    The class mostly resembles a TcpSocket object, so the same naming methods
+    are used. Because the socket type used to initialize the class could be
+    a websocket or tcpsocket, the methods expose will deal with both behavior
+    behind the scene.
+
+    The internal socket object is accessible via `self.socket` and the type
+    will vary based on the application settings.
+
+    Signals:
+        (str) messageReceived: emits when socket message is ready.
+    """
+
+    messageReceived = Signal(str)
+
+    def __init__(self, socket):
+        """Init method for the socket class.
+
+        Args:
+            socket (QWebSocket | QTcpSocket): The socket for the connection.
+        """
+        QObject.__init__(self)
+
+        self.socket = socket
+        self._type = type(self.socket)
+        self.is_websocket = isinstance(self.socket, QWebSocket)
+
+        self.socket.connected.connect(self.on_connected)
+        self.socket.disconnected.connect(self.on_disconnected)
+        self._connect_message_received()
+
+    def _connect_message_received(self):
+        """Emit message when socket message is ready."""
+        if self.is_websocket:
+            self.socket.textMessageReceived.connect(self.messageReceived.emit)
+        else:
+            self.socket.readyRead.connect(self._set_tcp_message)
+
+    def _set_tcp_message(self):
+        """Emit message to the tcp socket client."""
+        self.messageReceived.emit(self.socket.readAll().data().decode('utf-8'))
+
+    def write(self, text):
+        """Write socket data back to server."""
+        if self.is_websocket:
+            self.socket.sendTextMessage(text)
+        else:
+            self.socket.write(validate_output(text))
+
+    def _connect(self, host, port):
+        """Connect socket.
+
+        Args:
+            host (str): hostname
+            port (int): port
+        """
+        if self.is_websocket:
+            self.socket.open(QUrl('ws://%s:%s' % (host, port)))
+        else:
+            self.socket.connectToHost(host, port)
+
+    def close(self):
+        """Flush content and close socket."""
+        self.socket.flush()
+        if self.is_websocket:
+            self.socket.close()
+        else:
+            self.socket.disconnectFromHost()
+
+    @staticmethod
+    def on_connected():
+        """Connect event."""
+        LOGGER.debug('QSocket :: Connected.')
+
+    @staticmethod
+    def on_disconnected():
+        """Disconnect event."""
+        LOGGER.debug('QSocket :: Disconnected.')
+
+
 class QSocket(QObject):
     """QObject Socket class that deals with the incoming data.
 
@@ -39,10 +122,8 @@ def __init__(self, socket):
         QObject.__init__(self)
         LOGGER.debug('QSocket :: Listening...')
 
-        self.socket = socket
-        self.socket.connected.connect(self.on_connected)
-        self.socket.disconnected.connect(self.on_disconnected)
-        self.socket.readyRead.connect(self.on_readyRead)
+        self.socket = _AbstractSocket(socket)
+        self.socket.messageReceived.connect(self.on_readyRead)
 
         self.timer = Timer(
             int(AppSettings().value('timeout/socket', 30))
@@ -51,50 +132,18 @@ def __init__(self, socket):
         self.timer.time.connect(self.socket_timeout.emit)
         self.timer.start()
 
-    @staticmethod
-    def on_connected():
-        """Connect event."""
-        LOGGER.debug('QSocket :: Connected.')
-
-    @staticmethod
-    def on_disconnected():
-        """Disconnect event."""
-        LOGGER.debug('QSocket :: Disconnected.')
-
-    def close_socket(self):
-        """Close the socket and stop the timeout timer."""
-        self.socket.close()
-        self.timer.stop()
-
-    def _invalid_data(self, err):
-        """Close socket when data is invalid.
-
-        If data is invalid, the socket connection will be stop and the signal
-        `state_changed` will emit a message: 'Error. Invalid data:...'
-
-        Args:
-            err (Any): exception message.
-        """
-        msg = 'Error. Invalid data: %s' % err
-
-        LOGGER.warning('QSocket :: %s', msg)
-        self.state_changed.emit(msg)
-
-        self.close_socket()
-
-    def on_readyRead(self):
+    def on_readyRead(self, message):
         """Execute the received data.
 
         When data received is ready, method will pass the job to the CodeEditor
         class that will execute the received code.
         """
-        LOGGER.debug('QSocket :: Message ready')
+        LOGGER.debug('QSocket :: Message received')
         self.state_changed.emit("Message received.")
         self.timer.start()
 
         try:
-            data = self.socket.readAll().data().decode('utf-8')
-            msg_data = DataCode(data)
+            msg_data = DataCode(message)
         except InvalidData as err:
             self._invalid_data(err)
             return
@@ -109,9 +158,30 @@ class that will execute the received code.
         output_text = editor.execute()
 
         LOGGER.debug('QSocket :: sending message back.')
-        self.socket.write(validate_output(output_text))
+        self.socket.write(output_text)
 
         self.close_socket()
 
         self.received_text.emit(msg_data.text)
         self.output_text.emit(output_text)
+
+    def close_socket(self):
+        """Close the socket and stop the timeout timer."""
+        self.socket.socket.close()
+        self.timer.stop()
+
+    def _invalid_data(self, err):
+        """Close socket when data is invalid.
+
+        If data is invalid, the socket connection will be stop and the signal
+        `state_changed` will emit a message: 'Error. Invalid data:...'
+
+        Args:
+            err (Any): exception message.
+        """
+        msg = 'Error. Invalid data: %s' % err
+
+        LOGGER.warning('QSocket :: %s', msg)
+        self.state_changed.emit(msg)
+
+        self.close_socket()
diff --git a/src/controllers/nuke_controllers.py b/src/controllers/nuke_controllers.py
index 6e1d27b7..7ed68291 100644
--- a/src/controllers/nuke_controllers.py
+++ b/src/controllers/nuke_controllers.py
@@ -2,14 +2,12 @@
 # coding: utf-8
 from __future__ import print_function
 
-import io
 import re
 import os
 import sys
 import json
 import logging
 import contextlib
-
 from textwrap import dedent
 
 from PySide2.QtCore import QObject, Signal
@@ -18,6 +16,11 @@
 from ..utils import AppSettings, insert_time
 from .nuke_script_editor import ScriptEditorController
 
+if sys.version_info > (3, 0):
+    import io as stringIO
+else:
+    import StringIO as stringIO
+
 LOGGER = logging.getLogger('NukeServerSocket.controllers')
 
 
@@ -52,7 +55,7 @@ def stdoutIO(stdout=None):
         """
         old = sys.stdout
         if stdout is None:
-            stdout = io.StringIO()
+            stdout = stringIO.StringIO()
         sys.stdout = stdout
         yield stdout
         sys.stdout = old
@@ -64,7 +67,7 @@ def _exec(self, data):  # type: (str) -> str
                 exec(data)  # skipcq: PYL-W0122
             return s.getvalue()
         except Exception as err:  # skipcq: PYL-W0703
-            return "An exception occurred: `%s`" % str(err)
+            return "An exception occurred running Nuke Internal engine: `%s`" % str(err)
 
     def set_input(self, text):  # type: (str) -> None
         """Set input from the nuke command."""
@@ -76,11 +79,11 @@ def execute(self):
         If for some reason execution fails, method will fallback on the script
         editor execution mechanism.
         """
-        if AppSettings().get_bool('engine/nuke_internal', True):
+        if AppSettings().get_bool('code_execution_engine/nuke_internal', True):
             try:
                 self._output = nuke.executeInMainThreadWithResult(
                     self._exec, self._input)
-                LOGGER.debug('execute internal')
+                LOGGER.debug('Execute engine :: Nuke Internal')
             except Exception:  # skipcq: PYL-W0703
                 err = "executeInMainThread Error. Fallback on ScriptEditor for now."
                 self.execution_error.emit(err)
@@ -91,7 +94,7 @@ def execute(self):
 
     def _execute_script_editor(self):
         """Execute code from the internal script editor widget."""
-        LOGGER.debug('execute script editor')
+        LOGGER.debug('Execute engine :: Script Editor')
         self.script_editor.set_input(self._input)
         self.script_editor.execute()
         self._output = self.script_editor.output()
diff --git a/src/logger.py b/src/logger.py
index 0e7aada1..2467c0cf 100644
--- a/src/logger.py
+++ b/src/logger.py
@@ -50,10 +50,10 @@ def set_debug():
 def set_console():
     """Init function for the console handler logger."""
     console_format = logging.Formatter(
-        '%(name)s %(levelname)-8s %(module)-10s%(funcName)-15sL:%(lineno)-5d :: %(message)s')
+        '%(module)s:%(lineno)-5s %(funcName)-15s :: %(message)s')
     console = logging.StreamHandler(stream=sys.stdout)
     console.set_name('Console')
-    console.setLevel(logging.WARNING)
+    console.setLevel(logging.INFO)
     console.setFormatter(console_format)
     return console
 
diff --git a/src/utils/settings.py b/src/utils/settings.py
index 475ec5a2..b3d185c6 100644
--- a/src/utils/settings.py
+++ b/src/utils/settings.py
@@ -14,8 +14,6 @@
     os.path.expanduser('~'), '.nuke', 'NukeServerSocket.ini'
 )
 
-# TODO: should merge this into settings_widget.py
-
 
 class AppSettings(QSettings):
     """Custom QSettings app."""
diff --git a/src/widgets/settings_widget.py b/src/widgets/settings_widget.py
index 4d9c2354..df9188d0 100644
--- a/src/widgets/settings_widget.py
+++ b/src/widgets/settings_widget.py
@@ -3,6 +3,7 @@
 from __future__ import print_function
 
 import logging
+from collections import namedtuple
 
 from PySide2.QtCore import Qt
 from PySide2.QtWidgets import (
@@ -20,6 +21,8 @@
 
 LOGGER = logging.getLogger('NukeServerSocket.settings_widget')
 
+_RadioButton = namedtuple('RadioButtons', ['label', 'state'])
+
 
 def _format_name(name):
     """Format name.
@@ -224,7 +227,7 @@ def set_spinbox(label, value):  # type: (str, int) -> QSpinBox
         return spinbox
 
 
-class CodeEngineSettings(QGroupBox):
+class RadioButtons(QGroupBox):
     """A QGroupBox class for the code execution engine settings.
 
     Settings will allow the user to choose which engine to use when executing
@@ -233,19 +236,21 @@ class CodeEngineSettings(QGroupBox):
         * Script Editor: Qt scriptEditor widget.
     """
 
-    def __init__(self):
+    def __init__(self, title, buttons=None):
         """Initialize the CodeEngineSettings class."""
-        QGroupBox.__init__(self, 'Code Execution Engine')
+        QGroupBox.__init__(self, title)
 
         _layout = QVBoxLayout()
         _layout.setAlignment(Qt.AlignCenter)
-        _layout.addWidget(self.setup_button('Nuke Internal', True))
-        _layout.addWidget(self.setup_button('Script Editor', False))
+
+        if buttons:
+            for button in buttons:
+                _layout.addWidget(self.setup_button(
+                    button.label, button.state))
 
         self.setLayout(_layout)
 
-    @staticmethod
-    def setup_button(label, default_state):  # type: (str, bool) -> QRadioButton
+    def setup_button(self, label, default_state):  # type: (str, bool) -> QRadioButton
         """Set a QRadioButton widget.
 
         Set up a QRadioButton widget default state and connects its toggle
@@ -260,7 +265,8 @@ def setup_button(label, default_state):  # type: (str, bool) -> QRadioButton
             _type_: A QRadioButton object.
         """
         settings = AppSettings()
-        setting_name = 'engine/%s' % _format_name(label)
+        setting_name = '%s/%s' % (_format_name(self.title()),
+                                  _format_name(label))
 
         radiobutton = QRadioButton(label)
         radiobutton.setChecked(settings.get_bool(setting_name, default_state))
@@ -281,7 +287,12 @@ def __init__(self):
         self.setObjectName('SettingsWidget')
 
         _layout = QVBoxLayout()
-        _layout.addWidget(CodeEngineSettings())
+        _layout.addWidget(RadioButtons('Code Execution Engine',
+                                       [_RadioButton('Nuke Internal', True),
+                                        _RadioButton('Script Editor', False)]))
+        _layout.addWidget(RadioButtons('Connection Type',
+                                       [_RadioButton('TCP', True),
+                                        _RadioButton('WebSocket', False)]))
         _layout.addWidget(ScriptEditorSettings())
         _layout.addWidget(TimeoutSettings())
 
diff --git a/tests/connections/test_connection_classes.py b/tests/connections/test_connection_classes.py
new file mode 100644
index 00000000..adf93637
--- /dev/null
+++ b/tests/connections/test_connection_classes.py
@@ -0,0 +1,35 @@
+"""Test the CodeEditor class."""
+import pytest
+
+from PySide2.QtWebSockets import QWebSocket, QWebSocketServer
+from PySide2.QtNetwork import QTcpServer, QTcpSocket
+
+from src.utils.settings import AppSettings
+from src.connection.nss_server import QServer
+from src.connection.nss_client import QBaseClient
+
+
+def test_server_is_websocket():
+    """If websocket settings is true, server should be a webserversocket."""
+    AppSettings().setValue('connection_type/websocket', True)
+    server = QServer().server
+    assert isinstance(server, QWebSocketServer)
+
+
+def test_server_is_tcp():
+    """If websocket settings is false, server should be a tcpserver."""
+    server = QServer().server
+    assert isinstance(server, QTcpServer)
+
+
+def test_test_client_is_websocket():
+    """If websocket settings is true, client should be a websocket."""
+    AppSettings().setValue('connection_type/websocket', True)
+    socket = QBaseClient('localhost', 54321).socket.socket
+    assert isinstance(socket, QWebSocket)
+
+
+def test_test_client_is_tcpsocket():
+    """If websocket settings is false, socket should be a tcpsocket."""
+    socket = QBaseClient('localhost', 54321).socket.socket
+    assert isinstance(socket, QTcpSocket)
diff --git a/tests/connections/test_is_connected.py b/tests/connections/test_is_connected.py
index bb3e52fd..a08bc636 100644
--- a/tests/connections/test_is_connected.py
+++ b/tests/connections/test_is_connected.py
@@ -73,7 +73,7 @@ def test_tester_message_received(qtbot, _send_test_msg, _main_ui):
     """Send a test message and check received log text."""
     def check_status():
         """Wait for the status to register the transfer."""
-        msg = "Hello from Test Client"
+        msg = "Hello from Test TCP Client"
         assert msg in _main_ui.log_widgets.received_text
 
     qtbot.waitUntil(check_status)
@@ -83,7 +83,7 @@ def test_tester_message_output(qtbot, _send_test_msg, _main_ui):
     """Send a test message and check output log text."""
     def check_status():
         """Wait for the status to register the transfer."""
-        assert "Hello from Test Client" in _main_ui.log_widgets.output_text
+        assert "Hello from Test TCP Client" in _main_ui.log_widgets.output_text
 
     qtbot.waitUntil(check_status)
 
diff --git a/tests/connections/test_is_websocket.py b/tests/connections/test_is_websocket.py
new file mode 100644
index 00000000..9f493d9d
--- /dev/null
+++ b/tests/connections/test_is_websocket.py
@@ -0,0 +1,51 @@
+"""Test connection when is a websocket."""
+import pytest
+
+from src.utils import AppSettings
+from src.connection import QServer
+
+
+@pytest.fixture(autouse=True)
+def _start_connection(_main_ui):
+    """Click the connect button of the UI and enter in the connected state."""
+    AppSettings().setValue('connection_type/websocket', True)
+
+    _main_ui.connect_btn.setChecked(True)
+    yield
+    _main_ui.connect_btn.setChecked(False)
+
+
+@pytest.fixture()
+def _send_test_msg_web(_main_ui):
+    """Send a test message from TestClient."""
+    test_client = _main_ui.send_test()
+    yield
+    test_client._disconnect()
+
+
+def test_tester_message_status_websocket(qtbot, _send_test_msg_web, _main_ui):
+    """Send a test message and check status log text."""
+    def check_status():
+        """Wait for the status to register the transfer."""
+        assert 'Connection successful' in _main_ui.log_widgets.status_text
+
+    qtbot.waitUntil(check_status)
+
+
+def test_tester_message_received_websocket(qtbot, _send_test_msg_web, _main_ui):
+    """Send a test message and check received log text."""
+    def check_status():
+        """Wait for the status to register the transfer."""
+        msg = "Hello from Test WebSocket Client"
+        assert msg in _main_ui.log_widgets.received_text
+
+    qtbot.waitUntil(check_status, timeout=10000)
+
+
+def test_tester_message_output_websocket(qtbot, _send_test_msg_web, _main_ui):
+    """Send a test message and check output log text."""
+    def check_status():
+        """Wait for the status to register the transfer."""
+        assert "Hello from Test WebSocket Client" in _main_ui.log_widgets.output_text
+
+    qtbot.waitUntil(check_status)
diff --git a/tests/connections/test_send_nodes.py b/tests/connections/test_send_nodes.py
index 55b86541..b21972a1 100644
--- a/tests/connections/test_send_nodes.py
+++ b/tests/connections/test_send_nodes.py
@@ -5,9 +5,11 @@
 from shutil import rmtree
 
 import pytest
+from src.connection.nss_client import NodesNotSelectedError
 
 from src.main import init_settings
 from src.connection import SendNodesClient
+from src.utils import AppSettings
 
 
 TRANSFER_NODES_FILE = """
@@ -62,6 +64,22 @@ def test_transfer_dir_exists(_transfer_node_file):
     assert os.path.exists(os.path.dirname(_transfer_node_file))
 
 
+def test_raise_nodeNotSelected(_main_ui):
+    """Raise not NodesNotSelectedError if nodes are not selected.
+
+    In this case I am forcing the exception by changing a file path inside the
+    nuke internal module which will raise a RuntimeError
+     """
+    AppSettings().setValue('path/transfer_file', False)
+    _main_ui.toggle_connection(True)
+
+    client = SendNodesClient()
+    with pytest.raises(NodesNotSelectedError):
+        client.transfer_file_content()
+
+    _main_ui._server.close_server()
+
+
 def test_received_was_successful(_main_ui, qtbot):
     """Check if nodes were received with success."""
     _main_ui.toggle_connection(True)
diff --git a/tests/controllers/test_code_editor.py b/tests/controllers/test_code_editor.py
index 82904f52..cbb24f45 100644
--- a/tests/controllers/test_code_editor.py
+++ b/tests/controllers/test_code_editor.py
@@ -8,9 +8,9 @@
 from src.controllers import nuke_controllers as se
 
 
-def _data_code(file):
+def _data_code(code='test', file=''):
     """Return a initialized DataCode object."""
-    return DataCode(json.dumps({'text': 'test', 'file': file}))
+    return DataCode(json.dumps({'text': code, 'file': file}))
 
 
 @pytest.mark.usefixtures('_init_fake_editor')
@@ -23,18 +23,29 @@ class TestCodeEditor:
     @pytest.mark.parametrize('file', ['file.py', ''])
     def test_is_python_controller(self, file):
         """Check if is a valid PyController when file ends .py, None."""
-        editor = se.CodeEditor(_data_code(file))
+        editor = se.CodeEditor(_data_code(file=file))
         assert isinstance(editor._controller, se._PyController)
 
     @pytest.mark.parametrize('file', ['file.cpp', 'file.blink'])
     def test_is_blink_controller(self, file):
         """Check if is a valid BlinkController when file ends .cpp, .blink."""
-        editor = se.CodeEditor(_data_code(file))
+        editor = se.CodeEditor(_data_code(file=file))
 
         assert isinstance(editor._controller, se._BlinkController)
 
     def test_is_nodes_controller(self):
         """Check if is a valid CopyNodesController when file ends .tmp."""
-        editor = se.CodeEditor(_data_code('file.tmp'))
+        editor = se.CodeEditor(_data_code(file='file.tmp'))
 
         assert isinstance(editor._controller, se._CopyNodesController)
+
+    def test_execute_script_editor_code(self):
+        """Test executing code from the script editor instead of nuke internal."""
+        code = 'print("hello".upper())'
+        editor = se.CodeEditor(_data_code(code, 'tmp.py'))
+
+        # when bypassing the main execute function, need to set the input
+        controller = editor._controller
+        controller.set_input(code)
+        controller._execute_script_editor()
+        assert controller.output() == 'HELLO\n'
diff --git a/tests/test_options_names.py b/tests/test_options_names.py
index 4a58f27c..98a2a8af 100644
--- a/tests/test_options_names.py
+++ b/tests/test_options_names.py
@@ -55,7 +55,7 @@ def _get_engine_keys(file):
     """
     # TODO: this will not find the names in the test_settings_widget.py file.
     with open(file) as src_file:
-        return re.findall(r'(?<=engine/)\w+', src_file.read())
+        return re.findall(r'(?<=code_execution_engine/)\w+', src_file.read())
 
 
 def _format_name(name):