increase performance by polyfilling ResizeObserver only if required

refactor features to use shared functions #41
fix safari cleanup scripts that are not working on modern versions
2021-03-25 13:24:19 +01:00 · 2021-03-24 15:29:39 +01:00 · 2021-03-23 19:06:20 +01:00 · 2021-03-20 16:13:25 +01:00 · 2021-03-14 17:26:56 +01:00 · 2021-03-13 12:54:13 +01:00
148 changed files with 5994 additions and 2651 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,37 @@
 # Changelog

+## 0.10.0 (2021-03-02)
+
+* allow functions to call other functions #53 | [7661575](https://github.com/undergroundwires/privacy.sexy/commit/7661575573c6d3e8f4bc28bfa7a124a764c72ef9)
+* add option to run script directly in desktop app | [9a6b903](https://github.com/undergroundwires/privacy.sexy/commit/9a6b903b9297802845043fd41115756acd4a145c)
+* add script to automatically kill devicecensus process | [c9b91f6](https://github.com/undergroundwires/privacy.sexy/commit/c9b91f6d8f9bd16308b6beda119e7154a985b6cf)
+* refactor disabling application experience and document better | [45a3669](https://github.com/undergroundwires/privacy.sexy/commit/45a3669443d82855a52f60524d341c15f380f9e7)
+* escape printed characters to prevent command injection #45 | [1260eea](https://github.com/undergroundwires/privacy.sexy/commit/1260eea690e4fa5420e58c9de9f88cc29cb242db)
+* move code area to right on bigger screens | [cf39e6d](https://github.com/undergroundwires/privacy.sexy/commit/cf39e6d2541ea547f41d9553c380c54c24c58038)
+* more scripts to disable speech recognition and Cortana | [ee43fd9](https://github.com/undergroundwires/privacy.sexy/commit/ee43fd92a019ebd26c13890f9146c5b5bb56afaf)
+* add more macos scripts for privacy cleanup | [b0a7d0b](https://github.com/undergroundwires/privacy.sexy/commit/b0a7d0b53b3d8ac144a0241d70c037f460b0c0cc)
+* add better error messages to setting vscode settings | [65226f3](https://github.com/undergroundwires/privacy.sexy/commit/65226f3984480d0bc7932fd8d76a328f08308850)
+* remove windows scripts for removing non-bloating system apps #55 | [15004ff](https://github.com/undergroundwires/privacy.sexy/commit/15004ff1f1fb85a1d92e11ef695bcb2f37110610)
+* remove "preview" disclaimer from macOS | [970221b](https://github.com/undergroundwires/privacy.sexy/commit/970221b996e25fe5b029cbaa78607c9bbc8c3c0e)
+* update screenshot | [bd41af4](https://github.com/undergroundwires/privacy.sexy/commit/bd41af466fd135f7dc2f171633e4f60d8547c373)
+
+[compare](https://github.com/undergroundwires/privacy.sexy/compare/0.9.2...0.10.0)
+
+## 0.9.2 (2021-02-13)
+
+* do not compile with unused locals vuejs/vetur#1063 | [73e0520](https://github.com/undergroundwires/privacy.sexy/commit/73e0520de70cdbaf0ecdc6e9be5e85f003fcfb79)
+* fix wrong path for NvTelemtry file in NVIDIA script | [34b8822](https://github.com/undergroundwires/privacy.sexy/commit/34b8822ac821acb47e483e21b57e380551bcf455)
+* refactor event handling to consume base class for lifecycling | [f1e21ba](https://github.com/undergroundwires/privacy.sexy/commit/f1e21babbfaac21903594a37e30163bfe3338279)
+* make compiler throw if a function call includes an unexpected parameter | [15353d0](https://github.com/undergroundwires/privacy.sexy/commit/15353d0e2513c89ee4ffd9d9c5e9e83ef69b96b6)
+* refactor vscode configuration scripts using functions #41 | [67b2d1c](https://github.com/undergroundwires/privacy.sexy/commit/67b2d1c11cd5b131dff93a4437db79d96ed8b3dc)
+* refactor state handling to make application available independent of the state | [df273f7](https://github.com/undergroundwires/privacy.sexy/commit/df273f7f635ab156ac51a8dfb3fec66c4979f1c4)
+* add test to ensure correct shared functions are being parsed | [d7de420](https://github.com/undergroundwires/privacy.sexy/commit/d7de420d5c91bd9ce64880cd4a4391ad3a0a5401)
+* refactor and add tests for NonCollapsingDirective | [5934b17](https://github.com/undergroundwires/privacy.sexy/commit/5934b1728328c3b2ece1597b74dd87477d162175)
+* add GitHub issue templates | [daa997b](https://github.com/undergroundwires/privacy.sexy/commit/daa997b21b624d133c6f5e4cd6b70214588f9144)
+* correct the typo in application.md (#60) | [575636e](https://github.com/undergroundwires/privacy.sexy/commit/575636e6b728a2bdd1a9bd72c57bbf2752f10887)
+
+[compare](https://github.com/undergroundwires/privacy.sexy/compare/0.9.1...0.9.2)
+
 ## 0.9.1 (2021-01-23)

 * in CI/CD, allow publishing to github if release is more than 2 hours old electron-userland/electron-builder#2074 | [cf907d0](https://github.com/undergroundwires/privacy.sexy/commit/cf907d029a6d80682ba78ec887a9c4fab639db51)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,9 +7,9 @@
  - Proposing new features
  - Becoming a maintainer

-## Pull Request Process
+## Pull request process

- [GitHub flow](https://guides.github.com/introduction/flow/index.html) is used
+- [GitHub flow](https://guides.github.com/introduction/flow/index.html) with [GitOps](./img/architecture/gitops.png) is used
 - Your pull requests are actively welcomed.
 - The steps:
  1. Fork the repo and create your branch from master.
@@ -25,4 +25,10 @@

 ## License

-By contributing, you agree that your contributions will be licensed under its GNU General Public License v3.0.
+By contributing, you agree that your contributions will be licensed under its [GNU General Public License v3.0](./LICENSE).
+
+## Read more
+
+- See [tests](./docs/tests.md) for testing
+- See [extend script](./README.md#extend-scripts) for quick steps to extend scripts
+- See [architecture overview](./README.md#architecture-overview) to deep dive into privacy.sexy codebase
--- a/README.md
+++ b/README.md
@@ -14,11 +14,13 @@

 ## Get started

- Online version: [https://privacy.sexy](https://privacy.sexy)
-  - or download latest desktop version for [Windows](https://github.com/undergroundwires/privacy.sexy/releases/download/0.9.1/privacy.sexy-Setup-0.9.1.exe), [Linux](https://github.com/undergroundwires/privacy.sexy/releases/download/0.9.1/privacy.sexy-0.9.1.AppImage), [macOS](https://github.com/undergroundwires/privacy.sexy/releases/download/0.9.1/privacy.sexy-0.9.1.dmg)
- 💡 Come back regularly to apply latest version for stronger privacy and security.
+- Online version at [https://privacy.sexy](https://privacy.sexy)
+  - 💡 No need to run any compiled software on your computer.
+- Alternatively download offline version for [Windows](https://github.com/undergroundwires/privacy.sexy/releases/download/0.10.0/privacy.sexy-Setup-0.10.0.exe), [macOS](https://github.com/undergroundwires/privacy.sexy/releases/download/0.10.0/privacy.sexy-0.10.0.dmg) or [Linux](https://github.com/undergroundwires/privacy.sexy/releases/download/0.10.0/privacy.sexy-0.10.0.AppImage).
+  - 💡 Single click to execute your script.
+- ❗ Come back regularly to apply latest version for stronger privacy and security.

-[![privacy.sexy application](img/screenshot.png)](https://privacy.sexy)
+[![privacy.sexy application](img/screenshot.png?raw=true)](https://privacy.sexy)

 ## Why

@@ -51,8 +53,8 @@
  - Development: `npm run serve` to compile & hot-reload for development.
  - Production: `npm run build` to prepare files for distribution.
  - Or run using Docker:
-    1. Build: `docker build -t undergroundwires/privacy.sexy:0.9.1 .`
-    2. Run: `docker run -it -p 8080:80 --rm --name privacy.sexy-0.9.1 undergroundwires/privacy.sexy:0.9.1`
+    1. Build: `docker build -t undergroundwires/privacy.sexy:0.10.0 .`
+    2. Run: `docker run -it -p 8080:80 --rm --name privacy.sexy-0.10.0 undergroundwires/privacy.sexy:0.10.0`

 ## Architecture overview

--- a/docs/application.md
+++ b/docs/application.md
@@ -2,7 +2,7 @@

 - It's mainly responsible for
  - creating and event based [application state](#application-state)
-  - parsing and compiling [application data](#application-data)
+  - [parsing](#parsing) and [compiling](#compiling) [application data](#application-data)

 ## Application state

@@ -14,9 +14,23 @@

 ## Application data

- Compiled to `Application` domain object.
+- Compiled to [`Application`](./../src/domain/Application.ts) domain object.
 - The scripts are defined and controlled in different data files per OS
 - Enables [data-driven programming](https://en.wikipedia.org/wiki/Data-driven_programming) and easier contributions
 - Application data is defined in collection files and
 - 📖 See [Application data | Presentation layer](./presentation.md#application-data) to read how the application data is read by the presentation layer.
 - 📖 See [collection files documentation](./collection-files.md) to read more about how the data files are structured/defined and see [collection yaml files](./../src/application/collections/) to directly check the code.
+
+## Parsing
+
+- Application data is parsed to domain object [`Application.ts`](./../src/domain/Application.ts)
+- Steps
+  1. (Compile time) Load application data from [collection yaml files](./../src/application/collections/) using webpack loader
+  2. (Runtime) Parse and compile application and make it available to presentation layer by [`ApplicationFactory.ts`](./../src/application/ApplicationFactory.ts)
+
+### Compiling
+
+- Parsing the application files includes compiling scripts using [collection file defined functions](./collection-files.md#function)
+- To extend the syntax:
+  1. Add a new parser under [SyntaxParsers](./../src/application/Parser/Script/Compiler/Expressions/SyntaxParsers) where you can look at other parsers to understand more.
+  2. Register your in [CompositeExpressionParser](./../src/application/Parser/Script/Compiler/Expressions/Parser/CompositeExpressionParser.ts)
--- a/docs/collection-files.md
+++ b/docs/collection-files.md
@@ -101,11 +101,15 @@
 ### `Function`

 - Functions allow re-usable code throughout the defined scripts.
- Functions are templates compiled by privacy.sexy and uses special expressions.
- Expressions are defined inside mustaches (double brackets, `{{` and `}}`)
+- Functions are templates compiled by privacy.sexy and uses special [expressions](#expressions).
+- Functions can call other functions by defining `call` property instead of `code`
 - 👀 See [parameter substitution](#parameter-substitution) for an example usage

-#### Parameter substitution
+#### Expressions
+
+- Expressions are defined inside mustaches (double brackets, `{{` and `}}`)
+
+##### Parameter substitution

 A simple function example

@@ -125,6 +129,22 @@ It would print "Hello world" if it's called in a [script](#script) as following:
      argument: World
 ```

+A function can call other functions such as:
+
+```yaml
+  - 
+    function: CallerFunction
+    parameters: [ 'value' ]
+    call:
+      function: EchoArgument
+      parameters:
+        argument: {{ $value }}
+  -
+    function: EchoArgument
+    parameters: [ 'argument' ]
+    code: Hello {{ $argument }} !
+```
+
 #### `Function` syntax

 - `name`: *`string`* (**required**)
@@ -135,15 +155,20 @@ It would print "Hello world" if it's called in a [script](#script) as following:
 - `parameters`: `[` *`string`* `, ... ]`
  - Name of the parameters that the function has.
  - Parameter values are provided by a [Script](#script) through a [FunctionCall](#FunctionCall)
-  - Parameter names must be defined to be used in expressions such as [parameter substitution](#parameter-substitution)
+  - Parameter names must be defined to be used in [expressions](#expressions)
  - ❗ Parameter names must be unique
- `code`: *`string`* (**required**)
+ `code`: *`string`* (**required** if `call` is undefined)
  - Batch file commands that will be executed
  - 💡 If defined, best practice to also define `revertCode`
+  - ❗ If not defined `call` must be defined
 - `revertCode`: *`string`*
  - Code that'll undo the change done by `code` property.
  - E.g. let's say `code` sets an environment variable as `setx POWERSHELL_TELEMETRY_OPTOUT 1`
    - then `revertCode` should be doing `setx POWERSHELL_TELEMETRY_OPTOUT 0`
+- `call`: ***[`FunctionCall`](#FunctionCall)*** | `[` ***[`FunctionCall`](#FunctionCall)*** `, ... ]` (may be **required**)
+  - A shared function or sequence of functions to call (called in order)
+  - The parameter values that are sent can use [expressions](#expressions)
+  - ❗ If not defined `code` must be defined

 ### `ScriptingDefinition`

--- a/docs/presentation.md
+++ b/docs/presentation.md
@@ -4,6 +4,20 @@
 - Desktop application is created using [Electron](https://www.electronjs.org/).
 - Event driven as in components simply listens to events from the state and act accordingly.

+## Structure
+
+- [`/src/` **`presentation/`**](./../src/presentation/): Contains all presentation related code including Vue and Electron configurations
+  - [**`bootstrapping/`**](./../src/presentation/bootstrapping/): Registers Vue global objects including components and plugins.
+  - [**`components/`**](./../src/presentation/components/): Contains all Vue components and their helper classes.
+    - [**`Shared/`**](./../src/presentation/components/Shared): Contains Vue components and component helpers that are shared across other components.
+  - [**`styles/`**](./../src/presentation/styles/): Contains shared styles used throughout different components.
+  - [**`main.ts`**](./../src/presentation/main.ts): Application entry point that mounts and starts Vue application.
+  - [**`background.ts`**](./../src/presentation/background.ts): Main process of Electron, started as first thing when app starts.
+- [**`/public/`**](./../public/): Contains static assets that will simply be copied and not go through webpack.
+- [**`/vue.config.js`**](./../vue.config.js): Global Vue CLI configurations loaded by `@vue/cli-service`
+- [**`/postcss.config.js`**](./../postcss.config.js): PostCSS configurations that are used by Vue CLI internally
+- [**`/babel.config.js`**](./../babel.config.js): Babel configurations for polyfills used by `@vue/cli-plugin-babel`
+
 ## Application data

 - Components and should use [ApplicationFactory](./../src/application/ApplicationFactory.ts) singleton to reach the application domain.
@@ -16,9 +30,22 @@

 - Stateful components mutate or/and react to state changes in [ApplicationContext](./../src/application/Context/ApplicationContext.ts).
 - Stateless components that does not handle state extends `Vue`
- Stateful components that depends on the collection state such as user selection, search queries and more extends [`StatefulVue`](./../src/presentation/StatefulVue.ts)
- The single source of truth is a singleton of the state created and made available to presentation layer by [`StatefulVue`](./../src/presentation/StatefulVue.ts)
+- Stateful components that depends on the collection state such as user selection, search queries and more extends [`StatefulVue`](./../src/presentation/components/Shared/StatefulVue.ts)
+- The single source of truth is a singleton of the state created and made available to presentation layer by [`StatefulVue`](./../src/presentation/components/Shared/StatefulVue.ts)
 - `StatefulVue` includes abstract `handleCollectionState` that is fired once the component is loaded and also each time [collection](./collection-files.md) is changed.
 - Do not forget to subscribe from events when component is destroyed or if needed [collection](./collection-files.md) is changed.
-  - 💡 `events` in base class [`StatefulVue`](./../src/presentation/StatefulVue.ts) makes lifecycling easier
+  - 💡 `events` in base class [`StatefulVue`](./../src/presentation/components/Shared/StatefulVue.ts) makes lifecycling easier
 - 📖 See [Application state | Application layer](./presentation.md#application-state) where the state is implemented using using state pattern.
+
+## Modals
+
+- [Dialog.vue](./../src/presentation/components/Shared/Dialog.vue) is a shared component that can be used to show modal windows
+- Simply wrap the content inside of its slot and call `.show()` method on its reference.
+- Example:
+
+  ```html
+    <Dialog ref="testDialog">
+      <div>Hello world</div>
+    </Dialog>
+    <div @click="$refs.testDialog.show()">Show dialog</div>
+  ```
--- a/docs/tests.md
+++ b/docs/tests.md
@@ -0,0 +1,29 @@
+# Unit tests
+
+- Unit tests are defined in [`./tests`](./../tests)
+- They follow same folder structure as [`./src`](./../src)
+
+## Naming
+
+- Each test suite first describe the system under test
+  - E.g. tests for class `Application` is categorized under `Application`
+- Tests for specific methods are categorized under method name (if applicable)
+  - E.g. test for `run()` is categorized under `run`
+
+## Act, arrange, assert
+
+- Tests use act, arrange and assert (AAA) pattern when applicable
+- **Arrange**
+  - Should set up the test case
+  - Starts with comment line `// arrange`
+- **Act**
+  - Should cover the main thing to be tested
+  - Starts with comment line `// act`
+- **Assert**
+  - Should elicit some sort of response
+  - Starts with comment line `// assert`
+
+## Stubs
+
+- Stubs are defined in [`./tests/stubs`](./../tests/unit/stubs)
+- They implement dummy behavior to be functional
--- a/img/screenshot.png
+++ b/img/screenshot.png
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "privacy.sexy",
-  "version": "0.9.1",
+  "version": "0.10.0",
  "private": true,
  "description": "Enforce privacy & security best-practices on Windows and macOS, because privacy is sexy 🍑🍆",
  "author": "undergroundwires",
@@ -21,47 +21,49 @@
  },
  "main": "background.js",
  "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.32",
-    "@fortawesome/free-brands-svg-icons": "^5.15.1",
-    "@fortawesome/free-regular-svg-icons": "^5.15.1",
-    "@fortawesome/free-solid-svg-icons": "^5.15.1",
+    "@fortawesome/fontawesome-svg-core": "^1.2.34",
+    "@fortawesome/free-brands-svg-icons": "^5.15.2",
+    "@fortawesome/free-regular-svg-icons": "^5.15.2",
+    "@fortawesome/free-solid-svg-icons": "^5.15.2",
    "@fortawesome/vue-fontawesome": "^2.0.2",
+    "@juggle/resize-observer": "^3.3.0",
    "ace-builds": "^1.4.12",
-    "core-js": "^3.6.5",
+    "core-js": "^3.9.1",
    "file-saver": "^2.0.5",
    "inversify": "^5.0.5",
    "liquor-tree": "^0.2.70",
-    "v-tooltip": "2.0.2",
+    "v-tooltip": "2.1.2",
    "vue": "^2.6.12",
    "vue-class-component": "^7.2.6",
    "vue-js-modal": "^2.0.0-rc.6",
    "vue-property-decorator": "^9.1.2"
  },
  "devDependencies": {
-    "@types/ace": "0.0.44",
-    "@types/chai": "^4.2.14",
+    "@types/ace": "0.0.45",
+    "@types/chai": "^4.2.15",
    "@types/file-saver": "^2.0.1",
-    "@types/mocha": "^8.2.0",
-    "@vue/cli-plugin-babel": "^4.5.10",
-    "@vue/cli-plugin-typescript": "^4.5.9",
-    "@vue/cli-plugin-unit-mocha": "^4.5.9",
-    "@vue/cli-service": "^4.5.9",
-    "@vue/test-utils": "1.1.2",
-    "chai": "^4.2.0",
-    "electron": "^11.1.0",
+    "@types/mocha": "^8.2.1",
+    "@vue/cli-plugin-babel": "^4.5.11",
+    "@vue/cli-plugin-typescript": "^4.5.11",
+    "@vue/cli-plugin-unit-mocha": "^4.5.11",
+    "@vue/cli-service": "^4.5.11",
+    "@vue/test-utils": "1.1.3",
+    "chai": "^4.3.3",
+    "electron": "^12.0.1",
    "electron-devtools-installer": "^3.1.1",
-    "electron-log": "^4.3.1",
-    "electron-updater": "^4.3.5",
+    "electron-log": "^4.3.2",
+    "electron-updater": "^4.3.8",
    "js-yaml-loader": "^1.2.2",
-    "markdownlint-cli": "^0.26.0",
+    "markdownlint-cli": "^0.27.1",
    "remark-cli": "^9.0.0",
    "remark-lint-no-dead-urls": "^1.1.0",
    "remark-preset-lint-consistent": "^4.0.0",
-    "remark-validate-links": "^10.0.2",
-    "sass": "^1.30.0",
-    "sass-loader": "^10.1.0",
-    "typescript": "^4.1.3",
-    "vue-cli-plugin-electron-builder": "^2.0.0-rc.5",
+    "remark-validate-links": "^10.0.3",
+    "sass": "^1.32.8",
+    "sass-loader": "^10.1.1",
+    "tslib": "^2.1.0",
+    "typescript": "^4.2.3",
+    "vue-cli-plugin-electron-builder": "^2.0.0-rc.6",
    "vue-template-compiler": "^2.6.12",
    "yaml-lint": "^1.2.4"
  },
--- a/src/application/Context/State/Code/Generation/Languages/BatchBuilder.ts
+++ b/src/application/Context/State/Code/Generation/Languages/BatchBuilder.ts
@@ -5,6 +5,12 @@ export class BatchBuilder extends CodeBuilder {
        return '::';
    }
    protected writeStandardOut(text: string): string {
-        return `echo ${text}`;
+        return `echo ${escapeForEcho(text)}`;
    }
 }
+
+function escapeForEcho(text: string) {
+    return text
+        .replace(/&/g, '^&')
+        .replace(/%/g, '%%');
+}
--- a/src/application/Context/State/Code/Generation/Languages/ShellBuilder.ts
+++ b/src/application/Context/State/Code/Generation/Languages/ShellBuilder.ts
@@ -5,6 +5,11 @@ export class ShellBuilder extends CodeBuilder {
        return '#';
    }
    protected writeStandardOut(text: string): string {
-        return `echo '${text}'`;
+        return `echo '${escapeForEcho(text)}'`;
    }
 }
+
+function escapeForEcho(text: string) {
+    return text
+        .replace(/'/g, '\'\\\'\'');
+}
--- a/src/application/Parser/CategoryCollectionParser.ts
+++ b/src/application/Parser/CategoryCollectionParser.ts
@@ -2,19 +2,20 @@ import { Category } from '@/domain/Category';
 import { CollectionData } from 'js-yaml-loader!@/*';
 import { parseCategory } from './CategoryParser';
 import { OperatingSystem } from '@/domain/OperatingSystem';
-import { parseScriptingDefinition } from './ScriptingDefinitionParser';
 import { createEnumParser } from '../Common/Enum';
 import { ICategoryCollection } from '@/domain/ICategoryCollection';
 import { CategoryCollection } from '@/domain/CategoryCollection';
 import { IProjectInformation } from '@/domain/IProjectInformation';
 import { CategoryCollectionParseContext } from './Script/CategoryCollectionParseContext';
+import { ScriptingDefinitionParser } from './ScriptingDefinition/ScriptingDefinitionParser';

 export function parseCategoryCollection(
    content: CollectionData,
    info: IProjectInformation,
    osParser = createEnumParser(OperatingSystem)): ICategoryCollection {
    validate(content);
-    const scripting = parseScriptingDefinition(content.scripting, info);
+    const scripting = new ScriptingDefinitionParser()
+        .parse(content.scripting, info);
    const context = new CategoryCollectionParseContext(content.functions, scripting);
    const categories = new Array<Category>();
    for (const action of content.actions) {
--- a/src/application/Parser/Script/Compiler/Expressions/Expression/Expression.ts
+++ b/src/application/Parser/Script/Compiler/Expressions/Expression/Expression.ts
@@ -0,0 +1,35 @@
+import { ExpressionPosition } from './ExpressionPosition';
+import { ExpressionArguments, IExpression } from './IExpression';
+
+export type ExpressionEvaluator = (args?: ExpressionArguments) => string;
+export class Expression implements IExpression {
+    constructor(
+        public readonly position: ExpressionPosition,
+        public readonly evaluator: ExpressionEvaluator,
+        public readonly parameters: readonly string[] = new Array<string>()) {
+        if (!position) {
+            throw new Error('undefined position');
+        }
+        if (!evaluator) {
+            throw new Error('undefined evaluator');
+        }
+    }
+    public evaluate(args?: ExpressionArguments): string {
+        args = filterUnusedArguments(this.parameters, args);
+        return this.evaluator(args);
+    }
+}
+
+function filterUnusedArguments(
+    parameters: readonly string[], args: ExpressionArguments): ExpressionArguments {
+    let result: ExpressionArguments = {};
+    for (const parameter of Object.keys(args)) {
+        if (parameters.includes(parameter)) {
+            result = {
+                ...result,
+                [parameter]: args[parameter],
+            };
+        }
+    }
+    return result;
+}
--- a/src/application/Parser/Script/Compiler/Expressions/Expression/ExpressionPosition.ts
+++ b/src/application/Parser/Script/Compiler/Expressions/Expression/ExpressionPosition.ts
@@ -0,0 +1,15 @@
+export class ExpressionPosition {
+    constructor(
+        public readonly start: number,
+        public readonly end: number) {
+        if (start === end) {
+            throw new Error(`no length (start = end = ${start})`);
+        }
+        if (start > end) {
+            throw Error(`start (${start}) after end (${end})`);
+        }
+        if (start < 0) {
+            throw Error(`negative start position: ${start}`);
+        }
+    }
+}
--- a/src/application/Parser/Script/Compiler/Expressions/Expression/IExpression.ts
+++ b/src/application/Parser/Script/Compiler/Expressions/Expression/IExpression.ts
@@ -0,0 +1,12 @@
+import { ExpressionPosition } from './ExpressionPosition';
+
+export interface IExpression {
+    readonly position: ExpressionPosition;
+    readonly parameters?: readonly string[];
+    evaluate(args?: ExpressionArguments): string;
+}
+
+export interface ExpressionArguments {
+    readonly [parameter: string]: string;
+}
+
--- a/src/application/Parser/Script/Compiler/Expressions/ExpressionsCompiler.ts
+++ b/src/application/Parser/Script/Compiler/Expressions/ExpressionsCompiler.ts
@@ -0,0 +1,52 @@
+import { IExpressionsCompiler, ParameterValueDictionary } from './IExpressionsCompiler';
+import { IExpression } from './Expression/IExpression';
+import { IExpressionParser } from './Parser/IExpressionParser';
+import { CompositeExpressionParser } from './Parser/CompositeExpressionParser';
+
+export class ExpressionsCompiler implements IExpressionsCompiler {
+    public constructor(private readonly extractor: IExpressionParser = new CompositeExpressionParser()) { }
+    public compileExpressions(code: string, parameters?: ParameterValueDictionary): string {
+        const expressions = this.extractor.findExpressions(code);
+        const requiredParameterNames = expressions.map((e) => e.parameters).filter((p) => p).flat();
+        const uniqueParameterNames = Array.from(new Set(requiredParameterNames));
+        ensureRequiredArgsProvided(uniqueParameterNames, parameters);
+        return compileExpressions(expressions, code, parameters);
+    }
+}
+
+function compileExpressions(expressions: IExpression[], code: string, parameters?: ParameterValueDictionary) {
+    let compiledCode = '';
+    expressions = expressions
+        .slice() // copy the array to not mutate the parameter
+        .sort((a, b) => b.position.start - a.position.start);
+    let index = 0;
+    while (index !== code.length) {
+        const nextExpression = expressions.pop();
+        if (nextExpression) {
+            compiledCode += code.substring(index, nextExpression.position.start);
+            const expressionCode = nextExpression.evaluate(parameters);
+            compiledCode += expressionCode;
+            index = nextExpression.position.end;
+        } else {
+            compiledCode += code.substring(index, code.length);
+            break;
+        }
+    }
+    return compiledCode;
+}
+
+function ensureRequiredArgsProvided(parameters: readonly string[], args: ParameterValueDictionary) {
+    parameters = parameters || [];
+    args = args || {};
+    if (!parameters.length) {
+        return;
+    }
+    const notProvidedParameters = parameters.filter((parameter) => !Boolean(args[parameter]));
+    if (notProvidedParameters.length) {
+        throw new Error(`parameter value(s) not provided for: ${printList(notProvidedParameters)}`);
+    }
+}
+
+function printList(list: readonly string[]): string {
+    return `"${list.join('", "')}"`;
+}
--- a/src/application/Parser/Script/Compiler/Expressions/IExpressionsCompiler.ts
+++ b/src/application/Parser/Script/Compiler/Expressions/IExpressionsCompiler.ts
@@ -0,0 +1,5 @@
+export interface ParameterValueDictionary { [parameterName: string]: string; }
+
+export interface IExpressionsCompiler {
+    compileExpressions(code: string, parameters?: ParameterValueDictionary): string;
+}
--- a/src/application/Parser/Script/Compiler/Expressions/Parser/CompositeExpressionParser.ts
+++ b/src/application/Parser/Script/Compiler/Expressions/Parser/CompositeExpressionParser.ts
@@ -0,0 +1,23 @@
+import { IExpression } from '../Expression/IExpression';
+import { IExpressionParser } from './IExpressionParser';
+import { ParameterSubstitutionParser } from '../SyntaxParsers/ParameterSubstitutionParser';
+
+const parsers = [
+    new ParameterSubstitutionParser(),
+];
+
+export class CompositeExpressionParser implements IExpressionParser {
+    public constructor(private readonly leafs: readonly IExpressionParser[] = parsers) {
+        if (leafs.some((leaf) => !leaf)) { throw new Error('undefined leaf'); }
+    }
+    public findExpressions(code: string): IExpression[] {
+        const expressions = new Array<IExpression>();
+        for (const parser of this.leafs) {
+            const newExpressions = parser.findExpressions(code);
+            if (newExpressions && newExpressions.length) {
+                expressions.push(...newExpressions);
+            }
+        }
+        return expressions;
+    }
+}
--- a/src/application/Parser/Script/Compiler/Expressions/Parser/IExpressionParser.ts
+++ b/src/application/Parser/Script/Compiler/Expressions/Parser/IExpressionParser.ts
@@ -0,0 +1,5 @@
+import { IExpression } from '../Expression/IExpression';
+
+export interface IExpressionParser {
+    findExpressions(code: string): IExpression[];
+}
--- a/src/application/Parser/Script/Compiler/Expressions/Parser/RegexParser.ts
+++ b/src/application/Parser/Script/Compiler/Expressions/Parser/RegexParser.ts
@@ -0,0 +1,35 @@
+import { IExpressionParser } from './IExpressionParser';
+import { ExpressionPosition } from '../Expression/ExpressionPosition';
+import { IExpression } from '../Expression/IExpression';
+import { Expression, ExpressionEvaluator } from '../Expression/Expression';
+
+export abstract class RegexParser implements IExpressionParser {
+    protected abstract readonly regex: RegExp;
+    public findExpressions(code: string): IExpression[] {
+        return Array.from(this.findRegexExpressions(code));
+    }
+
+    protected abstract buildExpression(match: RegExpMatchArray): IPrimitiveExpression;
+
+    private* findRegexExpressions(code: string): Iterable<IExpression> {
+        const matches = Array.from(code.matchAll(this.regex));
+        for (const match of matches) {
+            const startPos = match.index;
+            const endPos = startPos + match[0].length;
+            let position: ExpressionPosition;
+            try {
+                position = new ExpressionPosition(startPos, endPos);
+            } catch (error) {
+                throw new Error(`[${this.constructor.name}] invalid script position: ${error.message}\nRegex ${this.regex}\nCode: ${code}`);
+            }
+            const primitiveExpression = this.buildExpression(match);
+            const expression = new Expression(position, primitiveExpression.evaluator, primitiveExpression.parameters);
+            yield expression;
+        }
+    }
+}
+
+export interface IPrimitiveExpression {
+    evaluator: ExpressionEvaluator;
+    parameters?: readonly string[];
+}
--- a/src/application/Parser/Script/Compiler/Expressions/SyntaxParsers/ParameterSubstitutionParser.ts
+++ b/src/application/Parser/Script/Compiler/Expressions/SyntaxParsers/ParameterSubstitutionParser.ts
@@ -0,0 +1,12 @@
+import { RegexParser, IPrimitiveExpression } from '../Parser/RegexParser';
+
+export class ParameterSubstitutionParser extends RegexParser {
+    protected readonly regex = /{{\s*\$\s*([^}| ]+)\s*}}/g;
+    protected buildExpression(match: RegExpMatchArray): IPrimitiveExpression {
+        const parameterName = match[1];
+        return {
+            parameters: [ parameterName ],
+            evaluator: (args) => args[parameterName],
+        };
+    }
+}
--- a/src/application/Parser/Script/Compiler/Function/FunctionCompiler.ts
+++ b/src/application/Parser/Script/Compiler/Function/FunctionCompiler.ts
@@ -0,0 +1,126 @@
+import { FunctionData, InstructionHolder } from 'js-yaml-loader!*';
+import { SharedFunction } from './SharedFunction';
+import { SharedFunctionCollection } from './SharedFunctionCollection';
+import { ISharedFunctionCollection } from './ISharedFunctionCollection';
+import { IFunctionCompiler } from './IFunctionCompiler';
+import { IFunctionCallCompiler } from '../FunctionCall/IFunctionCallCompiler';
+import { FunctionCallCompiler } from '../FunctionCall/FunctionCallCompiler';
+
+export class FunctionCompiler implements IFunctionCompiler {
+    public static readonly instance: IFunctionCompiler = new FunctionCompiler();
+    protected constructor(
+        private readonly functionCallCompiler: IFunctionCallCompiler = FunctionCallCompiler.instance) {
+     }
+    public compileFunctions(functions: readonly FunctionData[]): ISharedFunctionCollection {
+        const collection = new SharedFunctionCollection();
+        if (!functions || !functions.length) {
+            return collection;
+        }
+        ensureValidFunctions(functions);
+        functions
+            .filter((func) => hasCode(func))
+            .forEach((func) => {
+                const shared = new SharedFunction(func.name, func.parameters, func.code, func.revertCode);
+                collection.addFunction(shared);
+            });
+        functions
+            .filter((func) => hasCall(func))
+            .forEach((func) => {
+                const code = this.functionCallCompiler.compileCall(func.call, collection);
+                const shared = new SharedFunction(func.name, func.parameters, code.code, code.revertCode);
+                collection.addFunction(shared);
+            });
+        return collection;
+    }
+}
+
+function hasCode(data: FunctionData): boolean {
+    return Boolean(data.code);
+}
+
+function hasCall(data: FunctionData): boolean {
+    return Boolean(data.call);
+}
+
+
+function ensureValidFunctions(functions: readonly FunctionData[]) {
+    ensureNoUndefinedItem(functions);
+    ensureNoDuplicatesInFunctionNames(functions);
+    ensureNoDuplicatesInParameterNames(functions);
+    ensureNoDuplicateCode(functions);
+    ensureEitherCallOrCodeIsDefined(functions);
+    ensureExpectedParameterNameTypes(functions);
+}
+
+function printList(list: readonly string[]): string {
+    return `"${list.join('","')}"`;
+}
+
+function ensureEitherCallOrCodeIsDefined(holders: readonly InstructionHolder[]) {
+    // Ensure functions do not define both call and code
+    const withBothCallAndCode = holders.filter((holder) => hasCode(holder) && hasCall(holder));
+    if (withBothCallAndCode.length) {
+        throw new Error(`both "code" and "call" are defined in ${printNames(withBothCallAndCode)}`);
+    }
+    // Ensure functions have either code or call
+    const hasEitherCodeOrCall = holders.filter((holder) => !hasCode(holder) && !hasCall(holder));
+    if (hasEitherCodeOrCall.length) {
+        throw new Error(`neither "code" or "call" is defined in ${printNames(hasEitherCodeOrCall)}`);
+    }
+}
+
+function ensureExpectedParameterNameTypes(functions: readonly FunctionData[]) {
+    const unexpectedFunctions = functions.filter((func) => func.parameters && !isArrayOfStrings(func.parameters));
+    if (unexpectedFunctions.length) {
+        throw new Error(`unexpected parameter name type in ${printNames(unexpectedFunctions)}`);
+    }
+    function isArrayOfStrings(value: any): boolean {
+        return Array.isArray(value) && value.every((item) => typeof item === 'string');
+     }
+}
+
+function printNames(holders: readonly InstructionHolder[]) {
+    return printList(holders.map((holder) => holder.name));
+}
+
+function ensureNoDuplicatesInFunctionNames(functions: readonly FunctionData[]) {
+    const duplicateFunctionNames = getDuplicates(functions
+        .map((func) => func.name.toLowerCase()));
+    if (duplicateFunctionNames.length) {
+        throw new Error(`duplicate function name: ${printList(duplicateFunctionNames)}`);
+    }
+}
+function ensureNoUndefinedItem(functions: readonly FunctionData[]) {
+    if (functions.some((func) => !func)) {
+        throw new Error(`some functions are undefined`);
+    }
+}
+function ensureNoDuplicatesInParameterNames(functions: readonly FunctionData[]) {
+    const functionsWithParameters = functions
+        .filter((func) => func.parameters && func.parameters.length > 0);
+    for (const func of functionsWithParameters) {
+        const duplicateParameterNames = getDuplicates(func.parameters);
+        if (duplicateParameterNames.length) {
+            throw new Error(`"${func.name}": duplicate parameter name: ${printList(duplicateParameterNames)}`);
+        }
+    }
+}
+function ensureNoDuplicateCode(functions: readonly FunctionData[]) {
+    const duplicateCodes = getDuplicates(functions
+        .map((func) => func.code)
+        .filter((code) => code),
+    );
+    if (duplicateCodes.length > 0) {
+        throw new Error(`duplicate "code" in functions: ${printList(duplicateCodes)}`);
+    }
+    const duplicateRevertCodes = getDuplicates(functions
+        .filter((func) => func.revertCode)
+        .map((func) => func.revertCode));
+    if (duplicateRevertCodes.length > 0) {
+        throw new Error(`duplicate "revertCode" in functions: ${printList(duplicateRevertCodes)}`);
+    }
+}
+
+function getDuplicates(texts: readonly string[]): string[] {
+    return texts.filter((item, index) => texts.indexOf(item) !== index);
+}
--- a/src/application/Parser/Script/Compiler/Function/IFunctionCompiler.ts
+++ b/src/application/Parser/Script/Compiler/Function/IFunctionCompiler.ts
@@ -0,0 +1,6 @@
+import { FunctionData } from 'js-yaml-loader!*';
+import { ISharedFunctionCollection } from './ISharedFunctionCollection';
+
+export interface IFunctionCompiler {
+    compileFunctions(functions: readonly FunctionData[]): ISharedFunctionCollection;
+}
--- a/src/application/Parser/Script/Compiler/Function/ISharedFunction.ts
+++ b/src/application/Parser/Script/Compiler/Function/ISharedFunction.ts
@@ -0,0 +1,6 @@
+export interface ISharedFunction {
+    readonly name: string;
+    readonly parameters?: readonly string[];
+    readonly code: string;
+    readonly revertCode?: string;
+}
--- a/src/application/Parser/Script/Compiler/Function/ISharedFunctionCollection.ts
+++ b/src/application/Parser/Script/Compiler/Function/ISharedFunctionCollection.ts
@@ -0,0 +1,5 @@
+import { ISharedFunction } from './ISharedFunction';
+
+export interface ISharedFunctionCollection {
+    getFunctionByName(name: string): ISharedFunction;
+}
--- a/src/application/Parser/Script/Compiler/Function/SharedFunction.ts
+++ b/src/application/Parser/Script/Compiler/Function/SharedFunction.ts
@@ -0,0 +1,14 @@
+import { ISharedFunction } from './ISharedFunction';
+
+export class SharedFunction implements ISharedFunction {
+    constructor(
+        public readonly name: string,
+        public readonly parameters: readonly string[],
+        public readonly code: string,
+        public readonly revertCode: string,
+        ) {
+        if (!name) { throw new Error('undefined function name'); }
+        if (!code) { throw new Error(`undefined function ("${name}") code`); }
+        this.parameters = parameters || [];
+    }
+}
--- a/src/application/Parser/Script/Compiler/Function/SharedFunctionCollection.ts
+++ b/src/application/Parser/Script/Compiler/Function/SharedFunctionCollection.ts
@@ -0,0 +1,23 @@
+import { ISharedFunction } from './ISharedFunction';
+import { ISharedFunctionCollection } from './ISharedFunctionCollection';
+
+export class SharedFunctionCollection implements ISharedFunctionCollection {
+    private readonly functionsByName = new Map<string, ISharedFunction>();
+
+    public addFunction(func: ISharedFunction): void {
+        if (!func) { throw new Error('undefined function'); }
+        if (this.functionsByName.has(func.name)) {
+            throw new Error(`function with name ${func.name} already exists`);
+        }
+        this.functionsByName.set(func.name, func);
+    }
+
+    public getFunctionByName(name: string): ISharedFunction {
+        if (!name) { throw Error('undefined function name'); }
+        const func = this.functionsByName.get(name);
+        if (!func) {
+            throw new Error(`called function is not defined "${name}"`);
+        }
+        return func;
+    }
+}
--- a/src/application/Parser/Script/Compiler/FunctionCall/FunctionCallCompiler.ts
+++ b/src/application/Parser/Script/Compiler/FunctionCall/FunctionCallCompiler.ts
@@ -0,0 +1,89 @@
+import { FunctionCallData, FunctionCallParametersData, FunctionData, ScriptFunctionCallData } from 'js-yaml-loader!*';
+import { ICompiledCode } from './ICompiledCode';
+import { ISharedFunctionCollection } from '../Function/ISharedFunctionCollection';
+import { IFunctionCallCompiler } from './IFunctionCallCompiler';
+import { IExpressionsCompiler } from '../Expressions/IExpressionsCompiler';
+import { ExpressionsCompiler } from '../Expressions/ExpressionsCompiler';
+
+export class FunctionCallCompiler implements IFunctionCallCompiler {
+    public static readonly instance: IFunctionCallCompiler = new FunctionCallCompiler();
+    protected constructor(
+        private readonly expressionsCompiler: IExpressionsCompiler = new ExpressionsCompiler()) { }
+    public compileCall(
+        call: ScriptFunctionCallData,
+        functions: ISharedFunctionCollection): ICompiledCode {
+        if (!functions) { throw new Error('undefined functions'); }
+        if (!call) { throw new Error('undefined call'); }
+        const compiledCodes = new Array<ICompiledCode>();
+        const calls = getCallSequence(call);
+        calls.forEach((currentCall, currentCallIndex) => {
+            ensureValidCall(currentCall);
+            const commonFunction = functions.getFunctionByName(currentCall.function);
+            ensureExpectedParameters(commonFunction, currentCall);
+            let functionCode = compileCode(commonFunction, currentCall.parameters, this.expressionsCompiler);
+            if (currentCallIndex !== calls.length - 1) {
+                functionCode = appendLine(functionCode);
+            }
+            compiledCodes.push(functionCode);
+        });
+        const compiledCode = merge(compiledCodes);
+        return compiledCode;
+    }
+}
+
+function ensureExpectedParameters(func: FunctionData, call: FunctionCallData) {
+    const actual = Object.keys(call.parameters || {});
+    const expected = func.parameters || [];
+    if (!actual.length && !expected.length) {
+        return;
+    }
+    const unexpectedParameters = actual.filter((callParam) => !expected.includes(callParam));
+    if (unexpectedParameters.length) {
+        throw new Error(
+            `function "${func.name}" has unexpected parameter(s) provided: "${unexpectedParameters.join('", "')}"`);
+    }
+}
+
+function merge(codes: readonly ICompiledCode[]): ICompiledCode {
+    return {
+        code: codes.map((code) => code.code).join(''),
+        revertCode: codes.map((code) => code.revertCode).join(''),
+    };
+}
+
+function compileCode(
+    func: FunctionData,
+    parameters: FunctionCallParametersData,
+    compiler: IExpressionsCompiler): ICompiledCode {
+    return {
+        code: compiler.compileExpressions(func.code, parameters),
+        revertCode: compiler.compileExpressions(func.revertCode, parameters),
+    };
+}
+
+function getCallSequence(call: ScriptFunctionCallData): FunctionCallData[] {
+    if (typeof call !== 'object') {
+        throw new Error('called function(s) must be an object');
+    }
+    if (call instanceof Array) {
+        return call as FunctionCallData[];
+    }
+    return [ call as FunctionCallData ];
+}
+
+function ensureValidCall(call: FunctionCallData) {
+    if (!call) {
+        throw new Error(`undefined function call`);
+    }
+    if (!call.function) {
+        throw new Error(`empty function name called`);
+    }
+}
+
+function appendLine(code: ICompiledCode): ICompiledCode {
+    const appendLineIfNotEmpty = (str: string) => str ? `${str}\n` : str;
+    return {
+        code: appendLineIfNotEmpty(code.code),
+        revertCode: appendLineIfNotEmpty(code.revertCode),
+    };
+}
--- a/src/application/Parser/Script/Compiler/FunctionCall/ICompiledCode.ts
+++ b/src/application/Parser/Script/Compiler/FunctionCall/ICompiledCode.ts
@@ -0,0 +1,4 @@
+export interface ICompiledCode {
+    readonly code: string;
+    readonly revertCode?: string;
+}
--- a/src/application/Parser/Script/Compiler/FunctionCall/IFunctionCallCompiler.ts
+++ b/src/application/Parser/Script/Compiler/FunctionCall/IFunctionCallCompiler.ts
@@ -0,0 +1,9 @@
+import { ScriptFunctionCallData } from 'js-yaml-loader!*';
+import { ICompiledCode } from './ICompiledCode';
+import { ISharedFunctionCollection } from '../Function/ISharedFunctionCollection';
+
+export interface IFunctionCallCompiler {
+    compileCall(
+        call: ScriptFunctionCallData,
+        functions: ISharedFunctionCollection): ICompiledCode;
+}
--- a/src/application/Parser/Script/Compiler/ILCode.ts
+++ b/src/application/Parser/Script/Compiler/ILCode.ts
@@ -1,73 +0,0 @@
-export interface IILCode {
-    compile(): string;
-    getUniqueParameterNames(): string[];
-    substituteParameter(parameterName: string, parameterValue: string): IILCode;
-}
-
-export function generateIlCode(rawText: string): IILCode {
-    const ilCode = generateIl(rawText);
-    return new ILCode(ilCode);
-}
-
-class ILCode implements IILCode {
-    private readonly ilCode: string;
-
-    constructor(ilCode: string) {
-        this.ilCode = ilCode;
-    }
-
-    public substituteParameter(parameterName: string, parameterValue: string): IILCode {
-        const newCode = substituteParameter(this.ilCode, parameterName, parameterValue);
-        return new ILCode(newCode);
-    }
-
-    public getUniqueParameterNames(): string[] {
-        return getUniqueParameterNames(this.ilCode);
-    }
-
-    public compile(): string {
-        ensureNoExpressionLeft(this.ilCode);
-        return this.ilCode;
-    }
-}
-
-// Trim each expression and put them inside "{{exp|}}" e.g. "{{ $hello }}" becomes "{{exp|$hello}}"
-function generateIl(rawText: string): string {
-    return rawText.replace(/\{\{([\s]*[^;\s\{]+[\s]*)\}\}/g, (_, match) => {
-        return `\{\{exp|${match.trim()}\}\}`;
-    });
-}
-
-// finds all "{{exp|..}} left"
-function ensureNoExpressionLeft(ilCode: string) {
-    const allSubstitutions = ilCode.matchAll(/\{\{exp\|(.*?)\}\}/g);
-    const allMatches = Array.from(allSubstitutions, (match) => match[1]);
-    const uniqueExpressions = getDistinctValues(allMatches);
-    if (uniqueExpressions.length > 0) {
-        throw new Error(`unknown expression: ${printList(uniqueExpressions)}`);
-    }
-}
-
-// Parses all distinct usages of {{exp|$parameterName}}
-function getUniqueParameterNames(ilCode: string) {
-    const allSubstitutions = ilCode.matchAll(/\{\{exp\|\$([^;\s\{]+[\s]*)\}\}/g);
-    const allParameters = Array.from(allSubstitutions, (match) => match[1]);
-    const uniqueParameterNames = getDistinctValues(allParameters);
-    return uniqueParameterNames;
-}
-
-// substitutes {{exp|$parameterName}} to value of the parameter
-function substituteParameter(ilCode: string, parameterName: string, parameterValue: string) {
-    const pattern = `{{exp|$${parameterName}}}`;
-    return ilCode.split(pattern).join(parameterValue); // as .replaceAll() is not yet supported by TS
-}
-
-function getDistinctValues(values: readonly string[]): string[] {
-    return values.filter((value, index, self) => {
-        return self.indexOf(value) === index;
-      });
-}
-
-function printList(list: readonly string[]): string {
-    return `"${list.join('","')}"`;
-}
--- a/src/application/Parser/Script/Compiler/ScriptCompiler.ts
+++ b/src/application/Parser/Script/Compiler/ScriptCompiler.ts
@@ -1,184 +1,42 @@
-import { generateIlCode, IILCode } from './ILCode';
 import { IScriptCode } from '@/domain/IScriptCode';
 import { ScriptCode } from '@/domain/ScriptCode';
-import { ScriptData, FunctionData, FunctionCallData, ScriptFunctionCallData, FunctionCallParametersData } from 'js-yaml-loader!@/*';
+import { FunctionData, ScriptData } from 'js-yaml-loader!@/*';
 import { IScriptCompiler } from './IScriptCompiler';
 import { ILanguageSyntax } from '@/domain/ScriptCode';
-
-interface ICompiledCode {
-    readonly code: string;
-    readonly revertCode: string;
-}
+import { ISharedFunctionCollection } from './Function/ISharedFunctionCollection';
+import { IFunctionCallCompiler } from './FunctionCall/IFunctionCallCompiler';
+import { FunctionCallCompiler } from './FunctionCall/FunctionCallCompiler';
+import { IFunctionCompiler } from './Function/IFunctionCompiler';
+import { FunctionCompiler } from './Function/FunctionCompiler';

 export class ScriptCompiler implements IScriptCompiler {
+    private readonly functions: ISharedFunctionCollection;
    constructor(
-        private readonly functions: readonly FunctionData[] | undefined,
-        private syntax: ILanguageSyntax) {
-        ensureValidFunctions(functions);
+        functions: readonly FunctionData[] | undefined,
+        private readonly syntax: ILanguageSyntax,
+        functionCompiler: IFunctionCompiler = FunctionCompiler.instance,
+        private readonly callCompiler: IFunctionCallCompiler = FunctionCallCompiler.instance,
+        ) {
        if (!syntax) { throw new Error('undefined syntax'); }
+        this.functions = functionCompiler.compileFunctions(functions);
    }
    public canCompile(script: ScriptData): boolean {
+        if (!script) { throw new Error('undefined script'); }
        if (!script.call) {
            return false;
        }
        return true;
    }
    public compile(script: ScriptData): IScriptCode {
-        this.ensureCompilable(script.call);
-        const compiledCodes = new Array<ICompiledCode>();
-        const calls = getCallSequence(script.call);
-        calls.forEach((currentCall, currentCallIndex) => {
-            ensureValidCall(currentCall, script.name);
-            const commonFunction = this.getFunctionByName(currentCall.function);
-            ensureExpectedParameters(commonFunction, currentCall);
-            let functionCode = compileCode(commonFunction, currentCall.parameters);
-            if (currentCallIndex !== calls.length - 1) {
-                functionCode = appendLine(functionCode);
-            }
-            compiledCodes.push(functionCode);
-        });
-        const scriptCode = merge(compiledCodes);
-        return new ScriptCode(scriptCode.code, scriptCode.revertCode, script.name, this.syntax);
-    }
-
-    private getFunctionByName(name: string): FunctionData {
-        const func = this.functions.find((f) => f.name === name);
-        if (!func) {
-            throw new Error(`called function is not defined "${name}"`);
-        }
-        return func;
-    }
-    private ensureCompilable(call: ScriptFunctionCallData) {
-        if (!this.functions || this.functions.length === 0) {
-            throw new Error('cannot compile without shared functions');
-        }
-        if (typeof call !== 'object') {
-            throw new Error('called function(s) must be an object');
+        if (!script) { throw new Error('undefined script'); }
+        try {
+            const compiledCode = this.callCompiler.compileCall(script.call, this.functions);
+            return new ScriptCode(
+                compiledCode.code,
+                compiledCode.revertCode,
+                this.syntax);
+        } catch (error) {
+            throw Error(`Script "${script.name}" ${error.message}`);
        }
    }
 }
-
-function ensureExpectedParameters(func: FunctionData, call: FunctionCallData) {
-    if (!func.parameters && !call.parameters) {
-        return;
-    }
-    const unexpectedParameters = Object.keys(call.parameters || {})
-        .filter((callParam) => !func.parameters.includes(callParam));
-    if (unexpectedParameters.length) {
-        throw new Error(
-            `function "${func.name}" has unexpected parameter(s) provided: "${unexpectedParameters.join('", "')}"`);
-    }
-}
-
-function getDuplicates(texts: readonly string[]): string[] {
-    return texts.filter((item, index) => texts.indexOf(item) !== index);
-}
-
-function printList(list: readonly string[]): string {
-    return `"${list.join('","')}"`;
-}
-
-function ensureNoDuplicatesInFunctionNames(functions: readonly FunctionData[]) {
-    const duplicateFunctionNames = getDuplicates(functions
-        .map((func) => func.name.toLowerCase()));
-    if (duplicateFunctionNames.length) {
-        throw new Error(`duplicate function name: ${printList(duplicateFunctionNames)}`);
-    }
-}
-function ensureNoUndefinedItem(functions: readonly FunctionData[]) {
-    if (functions.some((func) => !func)) {
-        throw new Error(`some functions are undefined`);
-    }
-}
-function ensureNoDuplicatesInParameterNames(functions: readonly FunctionData[]) {
-    const functionsWithParameters = functions
-        .filter((func) => func.parameters && func.parameters.length > 0);
-    for (const func of functionsWithParameters) {
-        const duplicateParameterNames = getDuplicates(func.parameters);
-        if (duplicateParameterNames.length) {
-            throw new Error(`"${func.name}": duplicate parameter name: ${printList(duplicateParameterNames)}`);
-        }
-    }
-}
-
-function ensureNoDuplicateCode(functions: readonly FunctionData[]) {
-    const duplicateCodes = getDuplicates(functions.map((func) => func.code));
-    if (duplicateCodes.length > 0) {
-        throw new Error(`duplicate "code" in functions: ${printList(duplicateCodes)}`);
-    }
-    const duplicateRevertCodes = getDuplicates(functions
-        .filter((func) => func.revertCode)
-        .map((func) => func.revertCode));
-    if (duplicateRevertCodes.length > 0) {
-        throw new Error(`duplicate "revertCode" in functions: ${printList(duplicateRevertCodes)}`);
-    }
-}
-
-function ensureValidFunctions(functions: readonly FunctionData[]) {
-    if (!functions || functions.length === 0) {
-        return;
-    }
-    ensureNoUndefinedItem(functions);
-    ensureNoDuplicatesInFunctionNames(functions);
-    ensureNoDuplicatesInParameterNames(functions);
-    ensureNoDuplicateCode(functions);
-}
-
-function appendLine(code: ICompiledCode): ICompiledCode {
-    const appendLineIfNotEmpty = (str: string) => str ? `${str}\n` : str;
-    return {
-        code: appendLineIfNotEmpty(code.code),
-        revertCode: appendLineIfNotEmpty(code.revertCode),
-    };
-}
-
-function merge(codes: readonly ICompiledCode[]): ICompiledCode {
-    return {
-        code: codes.map((code) => code.code).join(''),
-        revertCode: codes.map((code) => code.revertCode).join(''),
-    };
-}
-
-function compileCode(func: FunctionData, parameters: FunctionCallParametersData): ICompiledCode {
-    return {
-        code: compileExpressions(func.code, parameters),
-        revertCode: compileExpressions(func.revertCode, parameters),
-    };
-}
-
-function compileExpressions(code: string, parameters: FunctionCallParametersData): string {
-    let intermediateCode = generateIlCode(code);
-    intermediateCode = substituteParameters(intermediateCode, parameters);
-    return intermediateCode.compile();
-}
-
-function substituteParameters(intermediateCode: IILCode, parameters: FunctionCallParametersData): IILCode {
-    const parameterNames = intermediateCode.getUniqueParameterNames();
-    if (parameterNames.length && !parameters) {
-        throw new Error(`no parameters defined, expected: ${printList(parameterNames)}`);
-    }
-    for (const parameterName of parameterNames) {
-        const parameterValue = parameters[parameterName];
-        if (!parameterValue) {
-            throw Error(`parameter value is not provided for "${parameterName}" in function call`);
-        }
-        intermediateCode = intermediateCode.substituteParameter(parameterName, parameterValue);
-    }
-    return intermediateCode;
-}
-
-function ensureValidCall(call: FunctionCallData, scriptName: string) {
-    if (!call) {
-        throw new Error(`undefined function call in script "${scriptName}"`);
-    }
-    if (!call.function) {
-        throw new Error(`empty function name called in script "${scriptName}"`);
-    }
-}
-
-function getCallSequence(call: ScriptFunctionCallData): FunctionCallData[] {
-    if (call instanceof Array) {
-        return call as FunctionCallData[];
-    }
-    return [ call as FunctionCallData ];
-}
--- a/src/application/Parser/Script/ScriptParser.ts
+++ b/src/application/Parser/Script/ScriptParser.ts
@@ -31,7 +31,7 @@ function parseCode(script: ScriptData, context: ICategoryCollectionParseContext)
    if (context.compiler.canCompile(script)) {
        return context.compiler.compile(script);
    }
-    return new ScriptCode(script.code, script.revertCode, script.name, context.syntax);
+    return new ScriptCode(script.code, script.revertCode, context.syntax);
 }

 function ensureNotBothCallAndCode(script: ScriptData) {
--- a/src/application/Parser/ScriptingDefinition/CodeSubstituter.ts
+++ b/src/application/Parser/ScriptingDefinition/CodeSubstituter.ts
@@ -0,0 +1,33 @@
+import { IExpressionsCompiler, ParameterValueDictionary } from '@/application/Parser/Script/Compiler/Expressions/IExpressionsCompiler';
+import { ParameterSubstitutionParser } from '@/application/Parser/Script/Compiler/Expressions/SyntaxParsers/ParameterSubstitutionParser';
+import { CompositeExpressionParser } from '@/application/Parser/Script/Compiler/Expressions/Parser/CompositeExpressionParser';
+import { ExpressionsCompiler } from '@/application/Parser/Script/Compiler/Expressions/ExpressionsCompiler';
+import { IProjectInformation } from '@/domain/IProjectInformation';
+import { ICodeSubstituter } from './ICodeSubstituter';
+
+export class CodeSubstituter implements ICodeSubstituter {
+    constructor(
+        private readonly compiler: IExpressionsCompiler = createSubstituteCompiler(),
+        private readonly date = new Date(),
+    ) {
+
+    }
+    public substitute(code: string, info: IProjectInformation): string {
+        if (!code) { throw new Error('undefined code'); }
+        if (!info) { throw new Error('undefined info'); }
+        const parameters: ParameterValueDictionary = {
+            homepage: info.homepage,
+            version: info.version,
+            date: this.date.toUTCString(),
+        };
+        const compiledCode = this.compiler.compileExpressions(code, parameters);
+        return compiledCode;
+    }
+}
+
+function createSubstituteCompiler(): IExpressionsCompiler {
+    const parsers = [ new ParameterSubstitutionParser() ];
+    const parser = new CompositeExpressionParser(parsers);
+    const expressionCompiler = new ExpressionsCompiler(parser);
+    return expressionCompiler;
+}
--- a/src/application/Parser/ScriptingDefinition/ICodeSubstituter.ts
+++ b/src/application/Parser/ScriptingDefinition/ICodeSubstituter.ts
@@ -0,0 +1,5 @@
+import { IProjectInformation } from '@/domain/IProjectInformation';
+
+export interface ICodeSubstituter {
+    substitute(code: string, info: IProjectInformation): string;
+}
--- a/src/application/Parser/ScriptingDefinition/IScriptingDefinitionParser.ts
+++ b/src/application/Parser/ScriptingDefinition/IScriptingDefinitionParser.ts
--- a/src/application/Parser/ScriptingDefinition/ScriptingDefinitionParser.ts
+++ b/src/application/Parser/ScriptingDefinition/ScriptingDefinitionParser.ts
@@ -0,0 +1,31 @@
+import { IScriptingDefinition } from '@/domain/IScriptingDefinition';
+import { ScriptingDefinitionData } from 'js-yaml-loader!@/*';
+import { ScriptingDefinition } from '@/domain/ScriptingDefinition';
+import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
+import { IProjectInformation } from '@/domain/IProjectInformation';
+import { createEnumParser } from '../../Common/Enum';
+import { ICodeSubstituter } from './ICodeSubstituter';
+import { CodeSubstituter } from './CodeSubstituter';
+
+export class ScriptingDefinitionParser {
+    constructor(
+        private readonly languageParser = createEnumParser(ScriptingLanguage),
+        private readonly codeSubstituter: ICodeSubstituter = new CodeSubstituter(),
+    ) {
+    }
+    public parse(
+        definition: ScriptingDefinitionData,
+        info: IProjectInformation): IScriptingDefinition {
+        if (!info) { throw new Error('undefined info'); }
+        if (!definition) { throw new Error('undefined definition'); }
+        const language = this.languageParser.parseEnum(definition.language, 'language');
+        const startCode = this.codeSubstituter.substitute(definition.startCode, info);
+        const endCode = this.codeSubstituter.substitute(definition.endCode, info);
+        return new ScriptingDefinition(
+            language,
+            startCode,
+            endCode,
+        );
+    }
+}
+
--- a/src/application/Parser/ScriptingDefinitionParser.ts
+++ b/src/application/Parser/ScriptingDefinitionParser.ts
@@ -1,36 +0,0 @@
-import { IScriptingDefinition } from '@/domain/IScriptingDefinition';
-import { ScriptingDefinitionData } from 'js-yaml-loader!@/*';
-import { ScriptingDefinition } from '@/domain/ScriptingDefinition';
-import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
-import { IProjectInformation } from '@/domain/IProjectInformation';
-import { createEnumParser } from '../Common/Enum';
-import { generateIlCode } from './Script/Compiler/ILCode';
-
-export function parseScriptingDefinition(
-    definition: ScriptingDefinitionData,
-    info: IProjectInformation,
-    date = new Date(),
-    languageParser = createEnumParser(ScriptingLanguage)): IScriptingDefinition {
-    if (!info) {
-        throw new Error('undefined info');
-    }
-    if (!definition) {
-        throw new Error('undefined definition');
-    }
-    const language = languageParser.parseEnum(definition.language, 'language');
-    const startCode = applySubstitutions(definition.startCode, info, date);
-    const endCode = applySubstitutions(definition.endCode, info, date);
-    return new ScriptingDefinition(
-        language,
-        startCode,
-        endCode,
-    );
-}
-
-function applySubstitutions(code: string, info: IProjectInformation, date: Date): string {
-    let ilCode = generateIlCode(code);
-    ilCode = ilCode.substituteParameter('homepage', info.homepage);
-    ilCode = ilCode.substituteParameter('version', info.version);
-    ilCode = ilCode.substituteParameter('date', date.toUTCString());
-    return ilCode.compile();
-}
--- a/src/application/collections/collection.yaml.d.ts
+++ b/src/application/collections/collection.yaml.d.ts
@@ -18,30 +18,33 @@ declare module 'js-yaml-loader!*' {
        readonly docs?: DocumentationUrlsData;
    }

-    export interface FunctionData {
-        name: string;
-        code: string;
-        revertCode?: string;
-        parameters?: readonly string[];
+    export interface InstructionHolder {
+        readonly name: string;
+
+        readonly code?: string;
+        readonly revertCode?: string;
+
+        readonly call?: ScriptFunctionCallData;
+    }
+
+    export interface FunctionData extends InstructionHolder {
+        readonly parameters?: readonly string[];
    }

    export interface FunctionCallParametersData {
-        [index: string]: string;
+        readonly [index: string]: string;
    }

    export interface FunctionCallData {
-        function: string;
-        parameters?: FunctionCallParametersData;
+        readonly function: string;
+        readonly parameters?: FunctionCallParametersData;
    }

    export type ScriptFunctionCallData = readonly FunctionCallData[] | FunctionCallData | undefined;

-    export interface ScriptData extends DocumentableData {
-        name: string;
-        code?: string;
-        revertCode?: string;
-        call: ScriptFunctionCallData;
-        recommend?: string;
+    export interface ScriptData extends InstructionHolder, DocumentableData {
+        readonly name: string;
+        readonly recommend?: string;
    }

    export interface ScriptingDefinitionData {
--- a/src/application/collections/macos.yaml
+++ b/src/application/collections/macos.yaml
@@ -40,17 +40,352 @@ actions:
                    sudo rm -rfv /var/spool/cups/tmp/*
                    sudo rm -rfv /var/spool/cups/cache/job.cache*
            -
-                name: Clear the list of iOS devices connected
+                name: Empty trash on all volumes
                recommend: strict
                code: |-
-                    sudo defaults delete /Users/$USER/Library/Preferences/com.apple.iPod.plist "conn:128:Last Connect"
-                    sudo defaults delete /Users/$USER/Library/Preferences/com.apple.iPod.plist Devices
-                    sudo defaults delete /Library/Preferences/com.apple.iPod.plist "conn:128:Last Connect"
-                    sudo defaults delete /Library/Preferences/com.apple.iPod.plist Devices
-                    sudo rm -rfv /var/db/lockdown/*
+                    # on all mounted volumes
+                    sudo rm -rfv /Volumes/*/.Trashes/* &>/dev/null
+                    # on main HDD
+                    sudo rm -rfv ~/.Trash/* &>/dev/null
            -
-                name: Reset privacy database (remove all permissions)
-                code: sudo tccutil reset All 
+                name: Clear system cache files
+                recommend: strict
+                code: |-
+                    sudo rm -rfv /Library/Caches/* &>/dev/null
+                    sudo rm -rfv /System/Library/Caches/* &>/dev/null
+                    sudo rm -rfv ~/Library/Caches/* &>/dev/null
+            -
+                name: Clear system log files
+                recommend: strict
+                code: |-
+                    sudo rm -rfv /private/var/log/asl/*.asl &>/dev/null
+                    sudo rm -rfv /Library/Logs/DiagnosticReports/* &>/dev/null
+                    sudo rm -rfv /Library/Logs/Adobe/* &>/dev/null
+                    rm -rfv ~/Library/Containers/com.apple.mail/Data/Library/Logs/Mail/* &>/dev/null
+                    rm -rfv ~/Library/Logs/CoreSimulator/* &>/dev/null
+                    sudo rm -rfv /var/log/*
+            -
+                category: Clear browser history
+                children:
+                    -
+                        category: Clear Google Chrome history
+                        children:
+                            -
+                                name: Clear Google Chrome browsing history
+                                code: |-
+                                    rm -rfv ~/Library/Application\ Support/Google/Chrome/Default/History &>/dev/null
+                                    rm -rfv ~/Library/Application\ Support/Google/Chrome/Default/History-journal &>/dev/null
+                            -
+                                name: Google Chrome Cache Files
+                                code: sudo rm -rfv ~/Library/Application\ Support/Google/Chrome/Default/Application\ Cache/* &>/dev/null
+                    -
+                        category: Clear Safari history
+                        children:
+                            -
+                                name: Clear Safari browsing history
+                                docs:
+                                    - https://discussions.apple.com/thread/7586106?answerId=30314600022#30314600022
+                                    - https://davidkoepi.wordpress.com/2013/04/20/safariforensic/
+                                code: |-
+                                    rm -f ~/Library/Safari/History.db
+                                    rm -f ~/Library/Safari/History.db-lock
+                                    rm -f ~/Library/Safari/History.db-shm
+                                    rm -f ~/Library/Safari/History.db-wal
+                                    # For older versions of Safari
+                                    rm -f ~/Library/Safari/History.plist # URL, visit count, webpage title, last visited timestamp, redirected URL, autocomplete
+                                    rm -f ~/Library/Safari/HistoryIndex.sk # History index
+                            -
+                                name: Clear Safari downloads history
+                                docs: https://blog.d204n6.com/2020/09/macos-safari-preferences-and-privacy.html
+                                code: rm -f ~/Library/Safari/Downloads.plist
+                            -
+                                name: Clear Safari top sites
+                                docs: https://davidkoepi.wordpress.com/2013/04/20/safariforensic/
+                                code: rm -f ~/Library/Safari/TopSites.plist
+                            -
+                                name: Clear Safari last session (open tabs) history
+                                docs:
+                                    - https://apple.stackexchange.com/a/374116
+                                    - https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-7127
+                                code: rm -f ~/Library/Safari/LastSession.plist
+                            -
+                                category: Clear Safari caches
+                                children:
+                                    -
+                                        name: Clear Safari cached blobs, URLs and timestamps
+                                        docs: https://davidkoepi.wordpress.com/2013/04/20/safariforensic/
+                                        code: rm -f ~/Library/Caches/com.apple.Safari/Cache.db
+                                    -
+                                        name: Clear Safari web page icons displayed on URL bar
+                                        docs:
+                                          - https://davidkoepi.wordpress.com/2013/04/20/safariforensic/
+                                          - https://lifehacker.com/safaris-private-browsing-mode-saves-urls-in-an-easily-a-1691944343
+                                        code: rm -f ~/Library/Safari/WebpageIcons.db
+                                    -
+                                        name: Clear Safari webpage previews (thumbnails)
+                                        docs:
+                                          - https://davidkoepi.wordpress.com/2013/04/20/safariforensic/
+                                          - https://www.reddit.com/r/apple/comments/18lp92/your_apple_computer_keeps_a_screen_shot_of_nearly/
+                                        code: rm -rfv ~/Library/Caches/com.apple.Safari/Webpage\ Previews
+                            -
+                                name: Clear copy of the Safari history
+                                docs: https://forensicsfromthesausagefactory.blogspot.com/2010/06/safari-history-spotlight-webhistory.html
+                                code: rm -rfv ~/Library/Caches/Metadata/Safari/History
+                            -
+                                name: Clear search history embedded in Safari preferences
+                                docs: https://krypted.com/tag/recentsearchstrings/
+                                code: defaults write ~/Library/Preferences/com.apple.Safari RecentSearchStrings '( )'
+                            -
+                                name: Clear Safari cookies
+                                docs:
+                                  - https://www.toolbox.com/tech/operating-systems/blogs/understanding-the-safari-cookiesbinarycookies-file-format-010712/
+                                  - https://link.springer.com/content/pdf/10.1007/0-387-36891-4_13.pdf
+                                code: |-
+                                    rm -f ~/Library/Cookies/Cookies.binarycookies
+                                    # Used before Safari 5.1
+                                    rm -f ~/Library/Cookies/Cookies.plist
+                            -
+                                name: Clear Safari zoom level preferences per site
+                                docs: https://blog.d204n6.com/2020/09/macos-safari-preferences-and-privacy.html
+                                code: rm -f ~/Library/Safari/PerSiteZoomPreferences.plist
+                            -
+                                name: Clear URLs that are allowed to display notifications in Safari
+                                docs: https://blog.d204n6.com/2020/09/macos-safari-preferences-and-privacy.html
+                                code: rm -f ~/Library/Safari/UserNotificationPreferences.plist
+                            -
+                                name: Clear Safari per-site preferences for Downloads, Geolocation, PopUps, and Autoplays
+                                docs: https://blog.d204n6.com/2020/09/macos-safari-preferences-and-privacy.html
+                                code: rm -f ~/Library/Safari/PerSitePreferences.db
+                    -
+                        category: Clear Firefox history
+                        children:
+                            -
+                                name: Clear Firefox cache
+                                code: |-
+                                    sudo rm -rf ~/Library/Caches/Mozilla/
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/netpredictions.sqlite
+                            -
+                                name: Delete Firefox form history
+                                code: |-
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/formhistory.sqlite
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/formhistory.dat
+                            -
+                                name: Delete Firefox site preferences
+                                code: rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/content-prefs.sqlite
+                            -
+                                name: Delete Firefox session restore data (loads after the browser closes or crashes)
+                                code: |-
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionCheckpoints.json
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionstore*.js*
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionstore.bak*
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionstore-backups/previous.js*
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionstore-backups/recovery.js*
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionstore-backups/recovery.bak*
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionstore-backups/previous.bak*
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionstore-backups/upgrade.js*-20*
+                            -
+                                name: Delete Firefox passwords
+                                docs: http://kb.mozillazine.org/Password_Manager
+                                code: |-
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/signons.txt
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/signons2.txt
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/signons3.txt
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/signons.sqlite
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/logins.json
+                            -
+                                name: Delete Firefox HTML5 cookies
+                                code: rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/webappsstore.sqlite
+                            -
+                                name: Delete Firefox crash reports
+                                code: |-
+                                    rm -rfv ~/Library/Application\ Support/Firefox/Crash\ Reports/
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/minidumps/*.dmp
+                            -
+                                name: Delete Firefox backup files
+                                code: |-
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/bookmarkbackups/*.json
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/bookmarkbackups/*.jsonlz4
+                            -
+                                name: Delete Firefox cookies
+                                code: |-
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/cookies.txt
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/cookies.sqlite
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/cookies.sqlite-shm
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/cookies.sqlite-wal
+                                    rm -rfv ~/Library/Application\ Support/Firefox/Profiles/*/storage/default/http*
+            -
+                category: Clear third party application data
+                children:
+                    -
+                        name: Clear Adobe cache
+                        recommend: standard
+                        code: sudo rm -rfv ~/Library/Application\ Support/Adobe/Common/Media\ Cache\ Files/* &>/dev/null
+                    -
+                        name: Clear Gradle cache
+                        recommend: strict
+                        code: |-
+                            if [ -d "/Users/${HOST}/.gradle/caches" ]; then
+                                rm -rfv ~/.gradle/caches/ &> /dev/null
+                            fi
+                    -
+                        name: Clear Dropbox cache
+                        recommend: standard
+                        code: |-
+                            if [ -d "/Users/${HOST}/Dropbox" ]; then
+                                sudo rm -rfv ~/Dropbox/.dropbox.cache/* &>/dev/null
+                            fi
+                    -
+                        name: Clear Google Drive file stream cache
+                        recommend: standard
+                        code: |-
+                            killall "Google Drive File Stream"
+                            rm -rfv ~/Library/Application\ Support/Google/DriveFS/[0-9a-zA-Z]*/content_cache &>/dev/null
+                    -
+                        name: Clear Composer cache
+                        recommend: strict
+                        code: |-
+                            if type "composer" &> /dev/null; then
+                                composer clearcache &> /dev/null
+                            fi
+                    -
+                        name: Clear Homebrew cache
+                        recommend: strict
+                        code: |-
+                            if type "brew" &>/dev/null; then
+                                brew cleanup -s &>/dev/null
+                                rm -rfv $(brew --cache) &>/dev/null
+                                brew tap --repair &>/dev/null
+                            fi
+                    -
+                        name: Clear any old versions of Ruby gems
+                        recommend: strict
+                        code: |-
+                            if type "gem" &> /dev/null; then
+                                gem cleanup &>/dev/null
+                            fi
+                    -
+                        name: Clear Docker
+                        recommend: strict
+                        code: |-
+                            if type "docker" &> /dev/null; then
+                                docker system prune -af
+                            fi
+                    -
+                        name: Clear Pyenv-VirtualEnv cache
+                        recommend: strict
+                        code: |-
+                            if [ "$PYENV_VIRTUALENV_CACHE_PATH" ]; then
+                                rm -rfv $PYENV_VIRTUALENV_CACHE_PATH &>/dev/null
+                            fi
+                    -
+                        name: Clear NPM cache
+                        recommend: strict
+                        code: |-
+                            if type "npm" &> /dev/null; then
+                                npm cache clean --force
+                            fi
+                    -
+                        name: Clear Yarn cache
+                        recommend: strict
+                        code: |-
+                            if type "yarn" &> /dev/null; then
+                                echo 'Cleanup Yarn Cache...'
+                                yarn cache clean --force
+                            fi
+            -
+                category: iOS Cleanup
+                children:
+                    -
+                        name: Clear iOS applications
+                        recommend: strict
+                        code: rm -rfv ~/Music/iTunes/iTunes\ Media/Mobile\ Applications/* &>/dev/null
+                    -
+                        name: Clear iOS photo caches
+                        recommend: standard
+                        code: rm -rf ~/Pictures/iPhoto\ Library/iPod\ Photo\ Cache/*
+                    -
+                        name: Remove iOS Device Backups
+                        recommend: strict
+                        code: rm -rfv ~/Library/Application\ Support/MobileSync/Backup/* &>/dev/null
+                    -
+                        name: Clear iOS Simulators
+                        recommend: strict
+                        code: |-
+                            if type "xcrun" &>/dev/null; then
+                                osascript -e 'tell application "com.apple.CoreSimulator.CoreSimulatorService" to quit'
+                                osascript -e 'tell application "iOS Simulator" to quit'
+                                osascript -e 'tell application "Simulator" to quit'
+                                xcrun simctl shutdown all
+                                xcrun simctl erase all
+                            fi
+                    -
+                        name: Clear the list of iOS devices connected
+                        recommend: strict
+                        code: |-
+                            sudo defaults delete /Users/$USER/Library/Preferences/com.apple.iPod.plist "conn:128:Last Connect"
+                            sudo defaults delete /Users/$USER/Library/Preferences/com.apple.iPod.plist Devices
+                            sudo defaults delete /Library/Preferences/com.apple.iPod.plist "conn:128:Last Connect"
+                            sudo defaults delete /Library/Preferences/com.apple.iPod.plist Devices
+                            sudo rm -rfv /var/db/lockdown/*
+            -
+                name: Clear XCode Derived Data and Archives
+                recommend: strict
+                code: |-
+                    rm -rfv ~/Library/Developer/Xcode/DerivedData/* &>/dev/null
+                    rm -rfv ~/Library/Developer/Xcode/Archives/* &>/dev/null
+                    rm -rfv ~/Library/Developer/Xcode/iOS Device Logs/* &>/dev/null
+            -
+                name: Clear DNS cache
+                recommend: standard
+                code: |-
+                    sudo dscacheutil -flushcache
+                    sudo killall -HUP mDNSResponder
+            -
+                name: Purge inactive memory
+                recommend: standard
+                code: sudo purge
+            -
+                category: Reset privacy permissions for all applications
+                children:
+                    -
+                        name: Reset camera permissions
+                        code: tccutil reset Camera
+                    -
+                        name: Reset microphone permissions
+                        code: tccutil reset Microphone
+                    -
+                        name: Reset accessibility permissions
+                        code: tccutil reset Accessibility
+                    -
+                        name: Reset screen capture permissions
+                        code: tccutil reset ScreenCapture
+                    -
+                        name: Reset reminders permissions
+                        code: tccutil reset Reminders
+                    -
+                        name: Reset photos permissions
+                        code: tccutil reset Photos
+                    -
+                        name: Reset calendar permissions
+                        code: tccutil reset Calendar
+                    -
+                        name: Reset full disk access permissions
+                        code: tccutil reset SystemPolicyAllFiles
+                    -
+                        name: Reset contacts permissions
+                        code: tccutil reset SystemPolicyAllFiles
+                    -
+                        name: Reset desktop folder permissions
+                        code: tccutil reset SystemPolicyDesktopFolder
+                    -
+                        name: Reset documents folder permissions
+                        code: tccutil reset SystemPolicyDocumentsFolder
+                    -
+                        name: Reset downloads permissions
+                        code: tccutil reset SystemPolicyDownloadsFolder
+                    -
+                        name: Reset all app permissions
+                        code: tccutil reset All 
    -
        category: Configure programs
        children:
--- a/src/application/collections/windows.yaml
+++ b/src/application/collections/windows.yaml
@@ -476,26 +476,62 @@ actions:
                            schtasks /change /TN "\Microsoft\Windows\Customer Experience Improvement Program\KernelCeipTask" /ENABLE
                            schtasks /change /TN "\Microsoft\Windows\Customer Experience Improvement Program\UsbCeip" /ENABLE
                    -
-                        name: Disable Webcam Telemetry (devicecensus.exe)
-                        recommend: standard
-                        docs: https://www.ghacks.net/2019/09/23/what-is-devicecensus-exe-on-windows-10-and-why-does-it-need-internet-connectivity/
-                        code: schtasks /change /TN "Microsoft\Windows\Device Information\Device" /DISABLE
-                        revertCode: schtasks /change /TN "Microsoft\Windows\Device Information\Device" /ENABLE
+                        category: Disable Webcam Telemetry (devicecensus.exe)
+                        docs:
+                            - https://www.ghacks.net/2019/09/23/what-is-devicecensus-exe-on-windows-10-and-why-does-it-need-internet-connectivity/
+                            - https://answers.microsoft.com/en-us/windows/forum/windows_10-security/devicecensusexe-and-host-process-for-windows-task/520d42a2-45c1-402a-81de-e1116ecf2538
+                        children:
+                            -
+                                name: Disable devicecensus.exe (telemetry) task
+                                recommend: standard
+                                code: schtasks /change /TN "Microsoft\Windows\Device Information\Device" /disable
+                                revertCode: schtasks /change /TN "Microsoft\Windows\Device Information\Device" /enable
+                            -
+                                name: Disable devicecensus.exe (telemetry) process
+                                recommend: standard
+                                call:
+                                    function: KillProcessWhenItStarts
+                                    parameters:
+                                        processName: DeviceCensus.exe
                    -
-                        name: Disable Application Experience (Compatibility Telemetry)
-                        recommend: standard
-                        code: |-
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\Microsoft Compatibility Appraiser" /DISABLE
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\ProgramDataUpdater" /DISABLE
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\StartupAppTask" /DISABLE
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\AitAgent" /DISABLE
-                            reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\CompatTelRunner.exe" /v "Debugger" /t REG_SZ /d "%windir%\System32\taskkill.exe" /f
-                        revertCode: |-
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\Microsoft Compatibility Appraiser" /ENABLE
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\ProgramDataUpdater" /ENABLE
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\StartupAppTask" /ENABLE
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\AitAgent" /ENABLE
-                            reg delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\CompatTelRunner.exe" /v "Debugger" /f
+                        category: Disable Compatibility Telemetry (Application Experience)
+                        children:
+                            -
+                                category: Disable Microsoft Compatibility Appraiser
+                                docs: https://www.ghacks.net/2016/10/26/turn-off-the-windows-customer-experience-program/
+                                children:
+                                    -
+                                        name: Disable Microsoft Compatibility Appraiser task
+                                        recommend: standard
+                                        code: schtasks /change /TN "Microsoft\Windows\Application Experience\Microsoft Compatibility Appraiser" /disable
+                                        revertCode: schtasks /change /TN "Microsoft\Windows\Application Experience\Microsoft Compatibility Appraiser" /enable
+                                    -
+                                        name: Disable CompatTelRunner.exe (Microsoft Compatibility Appraiser) process
+                                        recommend: standard
+                                        call:
+                                            function: KillProcessWhenItStarts
+                                            parameters:
+                                                processName: CompatTelRunner.exe
+                            -
+                                name: Disable sending information to Customer Experience Improvement Program
+                                recommend: standard
+                                docs:
+                                    - https://www.ghacks.net/2016/10/26/turn-off-the-windows-customer-experience-program/
+                                    - https://answers.microsoft.com/en-us/windows/forum/windows_10-performance/permanently-disabling-windows-compatibility/6bf71583-81b0-4a74-ae2e-8fd73305aad1
+                                code: schtasks /change /TN "Microsoft\Windows\Application Experience\ProgramDataUpdater" /disable
+                                revertCode: schtasks /change /TN "Microsoft\Windows\Application Experience\ProgramDataUpdater" /enable
+                            -
+                                name: Disable Application Impact Telemetry Agent task
+                                recommend: standard
+                                docs: https://www.shouldiblockit.com/aitagent.exe-6181.aspx
+                                code: schtasks /change /TN "Microsoft\Windows\Application Experience\AitAgent" /disable
+                                revertCode: schtasks /change /TN "Microsoft\Windows\Application Experience\AitAgent" /enable
+                            -
+                                name: Disable "Disable apps to improve performance" reminder
+                                recommend: strict
+                                docs: https://www.ghacks.net/2016/10/26/turn-off-the-windows-customer-experience-program/
+                                code: schtasks /change /TN "Microsoft\Windows\Application Experience\StartupAppTask" /disable
+                                revertCode: schtasks /change /TN "Microsoft\Windows\Application Experience\StartupAppTask" /enable
                    -
                        name: Disable telemetry in data collection policy
                        recommend: standard
@@ -1001,6 +1037,34 @@ actions:
                        recommend: standard
                        code: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\bluetoothSync" /v "Value" /d "Deny" /t REG_SZ /f
                        revertCode: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\bluetoothSync" /v "Value" /d "Allow" /t REG_SZ /f
+                    -
+                        category: Disable app access to voice activation
+                        docs: https://www.tenforums.com/tutorials/130122-allow-deny-apps-access-use-voice-activation-windows-10-a.html
+                        children:
+                            -
+                                name: Disable apps and Cortana to activate with voice
+                                recommend: standard
+                                docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.AppPrivacy::LetAppsActivateWithVoice
+                                code: |-
+                                    reg add "HKCU\Software\Microsoft\Speech_OneCore\Settings\VoiceActivation\UserPreferenceForAllApps" /v "AgentActivationEnabled" /t REG_DWORD /d 0 /f
+                                    :: Using GPO (re-activation through GUI is not possible)
+                                    reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" /v "LetAppsActivateWithVoice" /t REG_DWORD /d 2 /f
+                                revertCode: |-
+                                    reg add "HKCU\Software\Microsoft\Speech_OneCore\Settings\VoiceActivation\UserPreferenceForAllApps" /v "AgentActivationEnabled" /t REG_DWORD /d 1 /f
+                                    :: Using GPO
+                                    reg delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" /v "LetAppsActivateWithVoice" /f
+                            -
+                                name: Disable apps and Cortana to activate with voice when sytem is locked
+                                recommend: standard
+                                docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.AppPrivacy::LetAppsActivateWithVoiceAboveLock
+                                code: |-
+                                    reg add "HKCU\Software\Microsoft\Speech_OneCore\Settings\VoiceActivation\UserPreferenceForAllApps" /v "AgentActivationOnLockScreenEnabled" /t REG_DWORD /d 0 /f
+                                    :: Using GPO (re-activation through GUI is not possible)
+                                    reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" /v "LetAppsActivateWithVoiceAboveLock" /t REG_DWORD /d 2 /f
+                                revertCode: |-
+                                    reg add "HKCU\Software\Microsoft\Speech_OneCore\Settings\VoiceActivation\UserPreferenceForAllApps" /v "AgentActivationOnLockScreenEnabled" /t REG_DWORD /d 1 /f
+                                    :: Using GPO
+                                    reg delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" /v "LetAppsActivateWithVoiceAboveLock" /f
            -
                category: Disable location access
                children:
@@ -1081,11 +1145,61 @@ actions:
                                revertCode: |-
                                    reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "CortanaEnabled" /t REG_DWORD /d 1 /f 
                                    reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "CortanaEnabled" /t REG_DWORD /d 1 /f
+                            -
+                                category: Disable Cortana history
+                                children:
+                                    -
+                                        name: Prevent Cortana from displaying history
+                                        recommend: standard
+                                        code: reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "HistoryViewEnabled" /t REG_DWORD /d 0 /f 
+                                        revertCode: reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "HistoryViewEnabled" /f 
+                                    -
+                                        name: Prevent Cortana from using device history
+                                        recommend: standard
+                                        code: reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "DeviceHistoryEnabled" /t REG_DWORD /d 0 /f 
+                                        revertCode: reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "DeviceHistoryEnabled" /f 
                            -
                                name: Remove the Cortana taskbar icon
                                recommend: standard
                                code: reg add HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced /v "ShowCortanaButton" /t REG_DWORD /d 0 /f
                                revertCode: reg delete HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced /v "ShowCortanaButton" /f
+                            -
+                                name: Disable Cortana in ambient mode
+                                recommend: standard
+                                code: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "CortanaInAmbientMode" /t REG_DWORD /d 0 /f
+                                revertCode: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "CortanaInAmbientMode" /t REG_DWORD /d 1 /f
+                            -
+                                category: Disable Cortana voice listening
+                                children:
+                                    -
+                                        name: Disable "Hey Cortana" voice activation
+                                        recommend: standard
+                                        code: |-
+                                            reg add "HKCU\Software\Microsoft\Speech_OneCore\Preferences" /v "VoiceActivationOn" /t REG_DWORD /d 0 /f
+                                            reg add "HKLM\Software\Microsoft\Speech_OneCore\Preferences" /v "VoiceActivationDefaultOn" /t REG_DWORD /d 0 /f
+                                        revertCode: |-
+                                            reg add "HKCU\Software\Microsoft\Speech_OneCore\Preferences" /v "VoiceActivationOn" /t REG_DWORD /d 1 /f
+                                            reg add "HKLM\Software\Microsoft\Speech_OneCore\Preferences" /v "VoiceActivationDefaultOn" /t REG_DWORD /d 1 /f
+                                    -
+                                        name: Disable Cortana listening to commands on Windows key + C
+                                        recommend: standard
+                                        code: reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Search" /v "VoiceShortcut" /t REG_DWORD /d 0 /f
+                                        revertCode: reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Search" /v "VoiceShortcut" /t REG_DWORD /d 1 /f
+                                    -
+                                        name: Disable using Cortana even when device is locked
+                                        recommend: standard
+                                        code: reg add "HKCU\Software\Microsoft\Speech_OneCore\Preferences" /v "VoiceActivationEnableAboveLockscreen" /t REG_DWORD /d 0 /f
+                                        revertCode: reg add "HKCU\Software\Microsoft\Speech_OneCore\Preferences" /v "VoiceActivationEnableAboveLockscreen" /t REG_DWORD /d 1 /f
+                                    -
+                                        name: Disable automatic update of Speech Data
+                                        recommend: standard
+                                        code: reg add "HKCU\Software\Microsoft\Speech_OneCore\Preferences" /v "ModelDownloadAllowed" /t REG_DWORD /d 0 /f
+                                        revertCode: reg delete "HKCU\Software\Microsoft\Speech_OneCore\Preferences" /v "ModelDownloadAllowed" /f
+                                    -
+                                        name: Disable Cortana voice support during Windows setup
+                                        recommend: standard
+                                        code: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OOBE" /v "DisableVoice" /t REG_DWORD /d 1 /f
+                                        revertCode: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OOBE" /v "DisableVoice" /f
                    -
                        category: Configure Windows search indexing
                        children:
@@ -2719,8 +2833,19 @@ actions:
            -
                name: Disable NetBios for all interfaces
                docs: https://10dsecurity.com/saying-goodbye-netbios/
-                code: Powershell -Command "$key = 'HKLM:SYSTEM\CurrentControlSet\services\NetBT\Parameters\Interfaces'; Get-ChildItem $key | foreach { Set-ItemProperty -Path \"$key\$($_.pschildname)\" -Name NetbiosOptions -Value 2 -Verbose}"
-                revertCode: Powershell -Command "$key = 'HKLM:SYSTEM\CurrentControlSet\services\NetBT\Parameters\Interfaces'; Get-ChildItem $key | foreach { Set-ItemProperty -Path \"$key\$($_.pschildname)\" -Name NetbiosOptions -Value 0 -Verbose}"
+                call:
+                    function: RunPowerShell
+                    parameters:
+                        code: 
+                            $key = 'HKLM:SYSTEM\CurrentControlSet\services\NetBT\Parameters\Interfaces';
+                            Get-ChildItem $key | foreach {
+                                Set-ItemProperty -Path \"$key\$($_.pschildname)\" -Name NetbiosOptions -Value 2 -Verbose
+                            }
+                        revertCode:
+                            $key = 'HKLM:SYSTEM\CurrentControlSet\services\NetBT\Parameters\Interfaces';
+                            Get-ChildItem $key | foreach {
+                                Set-ItemProperty -Path \"$key\$($_.pschildname)\" -Name NetbiosOptions -Value 0 -Verbose
+                            }
    -
        category: Remove bloatware
        children:
@@ -3486,12 +3611,13 @@ actions:
                                            function: UninstallSystemApp
                                            parameters:
                                                packageName: Microsoft.Windows.SecureAssessmentBrowser
-                            -
-                                name: Start app
-                                call:
-                                    function: UninstallSystemApp
-                                    parameters:
-                                        packageName: Microsoft.Windows.ShellExperienceHost
+                            # -
+                            #   # Not a bloatware, required for different setting windows such as WiFi and battery panes in action bar
+                            #   name: Start app
+                            #   call:
+                            #       function: UninstallSystemApp
+                            #       parameters:
+                            #       packageName: Microsoft.Windows.ShellExperienceHost
                            -
                                category: Windows Feedback
                                children:
@@ -3523,12 +3649,13 @@ actions:
                                    function: UninstallSystemApp
                                    parameters:
                                        packageName: Windows.ContactSupport
-                            -
-                                name: Settings app
-                                call:
-                                    function: UninstallSystemApp
-                                    parameters:
-                                        packageName: Windows.immersivecontrolpanel
+                            # -
+                            #     # Not a bloatware, required for core OS functinoality
+                            #     name: Settings app
+                            #     call:
+                            #         function: UninstallSystemApp
+                            #         parameters:
+                            #             packageName: Windows.immersivecontrolpanel
                            -
                                name: Windows Print 3D app
                                call:
@@ -3649,22 +3776,31 @@ actions:
                children:
                    -
                        name: Direct Play feature
-                        code: dism /Online /Disable-Feature /FeatureName:"DirectPlay" /NoRestart
-                        revertCode: dism /Online /Enable-Feature /FeatureName:"DirectPlay" /NoRestart
+                        call:
+                            function: DisableFeature
+                            parameters:
+                                featureName: DirectPlay
                    -
                        name: Internet Explorer feature
-                        code: |-
-                            dism /Online /Disable-Feature /FeatureName:"Internet-Explorer-Optional-x64" /NoRestart
-                            dism /Online /Disable-Feature /FeatureName:"Internet-Explorer-Optional-x84" /NoRestart
-                            dism /Online /Disable-Feature /FeatureName:"Internet-Explorer-Optional-amd64" /NoRestart
-                        revertCode: |-
-                            dism /Online /Enable-Feature /FeatureName:"Internet-Explorer-Optional-x64" /NoRestart
-                            dism /Online /Enable-Feature /FeatureName:"Internet-Explorer-Optional-x84" /NoRestart
-                            dism /Online /Enable-Feature /FeatureName:"Internet-Explorer-Optional-amd64" /NoRestart
+                        call:
+                            -
+                                function: DisableFeature
+                                parameters:
+                                    featureName: Internet-Explorer-Optional-x64
+                            -
+                                function: DisableFeature
+                                parameters:
+                                    featureName: Internet-Explorer-Optional-x84
+                            -
+                                function: DisableFeature
+                                parameters:
+                                    featureName: Internet-Explorer-Optional-amd64
                    -
                        name: Legacy Components feature
-                        code: dism /Online /Disable-Feature /FeatureName:"LegacyComponents" /NoRestart
-                        revertCode: dism /Online /Enable-Feature /FeatureName:"LegacyComponents" /NoRestart
+                        call:
+                            function: DisableFeature
+                            parameters:
+                                featureName: LegacyComponents
                    -
                        category: Server features for developers & administrators
                        children:
@@ -3673,39 +3809,55 @@ actions:
                                children:
                                    -
                                        name: Hyper-V feature
-                                        code: dism /Online /Disable-Feature /FeatureName:"Microsoft-Hyper-V-All" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Microsoft-Hyper-V-All" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: Microsoft-Hyper-V-All
                                    -
                                        name: Hyper-V GUI Management Tools feature
-                                        code: dism /Online /Disable-Feature /FeatureName:"Microsoft-Hyper-V-Management-Clients" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Microsoft-Hyper-V-Management-Clients" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: Microsoft-Hyper-V-Management-Clients
                                    -
                                        name: Hyper-V Management Tools feature
-                                        code: dism /Online /Disable-Feature /FeatureName:"Microsoft-Hyper-V-Tools-All" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Microsoft-Hyper-V-Tools-All" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: Microsoft-Hyper-V-Tools-All
                                    -
                                        name: Hyper-V Module for Windows PowerShell feature
-                                        code: dism /Online /Disable-Feature /FeatureName:"Microsoft-Hyper-V-Management-PowerShell" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Microsoft-Hyper-V-Management-PowerShell" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: Microsoft-Hyper-V-Management-PowerShell
                            -
                                name: Telnet Client feature
-                                code: dism /Online /Disable-Feature /FeatureName:"TelnetClient" /NoRestart
-                                revertCode: dism /Online /Enable-Feature /FeatureName:"TelnetClient" /NoRestart
                                docs: https://social.technet.microsoft.com/wiki/contents/articles/38433.windows-10-enabling-telnet-client.aspx
+                                call:
+                                    function: DisableFeature
+                                    parameters:
+                                        featureName: TelnetClient
                            -
                                name: Net.TCP Port Sharing feature
-                                code: dism /Online /Disable-Feature /FeatureName:"WCF-TCP-PortSharing45" /NoRestart
-                                revertCode: dism /Online /Enable-Feature /FeatureName:"WCF-TCP-PortSharing45" /NoRestart
                                docs: https://docs.microsoft.com/en-us/dotnet/framework/wcf/feature-details/net-tcp-port-sharing
+                                call:
+                                    function: DisableFeature
+                                    parameters:
+                                        featureName: WCF-TCP-PortSharing45
                            -
                                name: SMB Direct feature
-                                code: dism /Online /Disable-Feature /FeatureName:"SmbDirect" /NoRestart
-                                revertCode: dism /Online /Enable-Feature /FeatureName:"SmbDirect" /NoRestart
                                docs: https://docs.microsoft.com/en-us/windows-server/storage/file-server/smb-direct
+                                call:
+                                    function: DisableFeature
+                                    parameters:
+                                        featureName: SmbDirect
                            -
                                name: TFTP Client feature
-                                code: dism /Online /Disable-Feature /FeatureName:"TFTP" /NoRestart
-                                revertCode: dism /Online /Enable-Feature /FeatureName:"TFTP" /NoRestart
+                                call:
+                                    function: DisableFeature
+                                    parameters:
+                                        featureName: TFTP
                    -
                        category: Printing features
                        children:
@@ -3714,60 +3866,86 @@ actions:
                                children:
                                    -
                                        name: Internet Printing Client
-                                        code: dism /Online /Disable-Feature /FeatureName:"Printing-Foundation-InternetPrinting-Client" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Printing-Foundation-InternetPrinting-Client" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: Printing-Foundation-InternetPrinting-Client
                                    -
                                        name: LPD Print Service
-                                        code: dism /Online /Disable-Feature /FeatureName:"Printing-Foundation-LPDPrintService" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Printing-Foundation-LPDPrintService" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: LPDPrintService
                                    -
                                        name: LPR Port Monitor feature
-                                        code: dism /Online /Disable-Feature /FeatureName:"Printing-Foundation-LPRPortMonitor" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Printing-Foundation-LPRPortMonitor" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: Printing-Foundation-LPRPortMonitor
                                    -
                                        name: Microsoft Print to PDF feature
-                                        code: dism /Online /Disable-Feature /FeatureName:"Printing-PrintToPDFServices-Features" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Printing-PrintToPDFServices-Features" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: Printing-PrintToPDFServices-Features
                            -
                                name: Print and Document Services feature
-                                code: dism /Online /Disable-Feature /FeatureName:"Printing-Foundation-Features" /NoRestart
-                                revertCode: dism /Online /Enable-Feature /FeatureName:"Printing-Foundation-Features" /NoRestart
+                                call:
+                                    function: DisableFeature
+                                    parameters:
+                                        featureName: Printing-Foundation-Features
                            -
                                name: Work Folders Client feature
-                                code: dism /Online /Disable-Feature /FeatureName:"WorkFolders-Client" /NoRestart
-                                revertCode: dism /Online /Enable-Feature /FeatureName:"WorkFolders-Client" /NoRestart
                                docs: https://docs.microsoft.com/en-us/windows-server/storage/work-folders/work-folders-overview
+                                call:
+                                    function: DisableFeature
+                                    parameters:
+                                        featureName: WorkFolders-Client
                            -
                                category: XPS support
                                children:
                                -
                                    name: XPS Services feature
-                                    code: dism /Online /Disable-Feature /FeatureName:"Printing-XPSServices-Features" /NoRestart
-                                    revertCode: dism /Online /Enable-Feature /FeatureName:"Printing-XPSServices-Features" /NoRestart
+                                    call:
+                                        function: DisableFeature
+                                        parameters:
+                                            featureName: Printing-XPSServices-Features
                                -
                                    name: XPS Viewer feature
-                                    code: dism /Online /Disable-Feature /FeatureName:"Xps-Foundation-Xps-Viewer" /NoRestart
-                                    revertCode: dism /Online /Enable-Feature /FeatureName:"Xps-Foundation-Xps-Viewer" /NoRestart
+                                    call:
+                                        function: DisableFeature
+                                        parameters:
+                                            featureName: Xps-Foundation-Xps-Viewer
                    -
                        name: Media Features feature
-                        code: dism /Online /Disable-Feature /FeatureName:"MediaPlayback" /NoRestart
-                        revertCode: dism /Online /Enable-Feature /FeatureName:"MediaPlayback" /NoRestart
+                        call:
+                            function: DisableFeature
+                            parameters:
+                                featureName: MediaPlayback
                    -
                        name: Scan Management feature
-                        code: dism /Online /Disable-Feature /FeatureName:"ScanManagementConsole" /NoRestart
-                        revertCode: dism /Online /Enable-Feature /FeatureName:"ScanManagementConsole" /NoRestart
+                        call:
+                            function: DisableFeature
+                            parameters:
+                                featureName: ScanManagementConsole
                    -
                        name: Windows Fax and Scan feature
-                        code: dism /Online /Disable-Feature /FeatureName:"FaxServicesClientPackage" /NoRestart
-                        revertCode: dism /Online /Enable-Feature /FeatureName:"FaxServicesClientPackage" /NoRestart
+                        call:
+                            function: DisableFeature
+                            parameters:
+                                featureName: FaxServicesClientPackage
                    -
                        name: Windows Media Player feature
-                        code: dism /Online /Disable-Feature /FeatureName:"WindowsMediaPlayer" /NoRestart
-                        revertCode: dism /Online /Enable-Feature /FeatureName:"WindowsMediaPlayer" /NoRestart
+                        call:
+                            function: DisableFeature
+                            parameters:
+                                featureName: WindowsMediaPlayer
                    -
                        name: Windows Search feature
-                        code: dism /Online /Disable-Feature /FeatureName:"SearchEngine-Client-Package" /NoRestart
-                        revertCode: dism /Online /Enable-Feature /FeatureName:"SearchEngine-Client-Package" /NoRestart
+                        call:
+                            function: DisableFeature
+                            parameters:
+                                featureName: SearchEngine-Client-Package
            -
                category: Uninstall capabilities & features on demand
                docs: https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/features-on-demand-non-language-fod#fods-that-are-not-preinstalled-but-may-need-to-be-preinstalled
@@ -4165,67 +4343,86 @@ actions:
                    copy "%~dpnx0" "%AppData%\Microsoft\Windows\Start Menu\Programs\Startup\privacy-cleanup.bat"
                revertCode: del /f /q %AppData%\Microsoft\Windows\Start Menu\Programs\Startup\privacy-cleanup.bat
 functions:
+    -
+        name: KillProcessWhenItStarts
+        parameters: [ processName ]
+        # https://docs.microsoft.com/en-us/previous-versions/windows/desktop/xperf/image-file-execution-options
+        code: reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\'{{ $processName }}'" /v "Debugger" /t REG_SZ /d "%windir%\System32\taskkill.exe" /f
+        revertCode: reg delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\'{{ $processName }}'" /v "Debugger" /f
+    -
+        name: DisableFeature
+        parameters: [ featureName ]
+        code: dism /Online /Disable-Feature /FeatureName:"{{ $featureName }}" /NoRestart
+        revertCode: dism /Online /Enable-Feature /FeatureName:"{{ $featureName }}" /NoRestart
    -
        name: UninstallStoreApp
        parameters: [ packageName ]
-        code: PowerShell -Command "Get-AppxPackage '{{ $packageName }}' | Remove-AppxPackage"
-        revertCode:
-            PowerShell -ExecutionPolicy Unrestricted -Command "
-                $package = Get-AppxPackage -AllUsers '{{ $packageName }}';
-                if (!$package) {
-                    Write-Error \"Cannot reinstall '{{ $packageName }}'\" -ErrorAction Stop
-                }
-                $manifest = $package.InstallLocation + '\AppxManifest.xml';
-                Add-AppxPackage -DisableDevelopmentMode -Register \"$manifest\" "
+        call:
+            function: RunPowerShell
+            parameters:
+                code: Get-AppxPackage '{{ $packageName }}' | Remove-AppxPackage
+                revertCode:
+                    $package = Get-AppxPackage -AllUsers '{{ $packageName }}';
+                    if (!$package) {
+                        Write-Error \"Cannot reinstall '{{ $packageName }}'\" -ErrorAction Stop
+                    }
+                    $manifest = $package.InstallLocation + '\AppxManifest.xml';
+                    Add-AppxPackage -DisableDevelopmentMode -Register \"$manifest\"
    -
        name: UninstallSystemApp
        parameters: [ packageName ]
        # It simply renames files
        #   Because system apps are non removable (check: (Get-AppxPackage -AllUsers 'Windows.CBSPreview').NonRemovable)
        #   Otherwise they throw 0x80070032 when trying to uninstall them
-        code:
-            PowerShell -Command "
-            $package = (Get-AppxPackage -AllUsers '{{ $packageName }}');
-            if (!$package) { 
-                Write-Host 'Not installed';
-                exit 0;
-            }
-            $directories = @($package.InstallLocation, \"$env:LOCALAPPDATA\Packages\$($package.PackageFamilyName)\");
-            foreach($dir in $directories) {
-                if ( !$dir -Or !(Test-Path \"$dir\") ) { continue; }
-                cmd /c ('takeown /f \"' + $dir + '\" /r /d y 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
-                cmd /c ('icacls \"' + $dir + '\" /grant administrators:F /t 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
-                $files = Get-ChildItem -File -Path $dir -Recurse -Force;
-                foreach($file in $files) {
-                    if($file.Name.EndsWith('.OLD')) { continue; }
-                    $newName =  $file.FullName + '.OLD';
-                    Write-Host \"Rename '$($file.FullName)' to '$newName'\";
-                    Move-Item -LiteralPath \"$($file.FullName)\" -Destination \"$newName\" -Force;
-                }
-            };"
-        revertCode:
-            PowerShell -Command "
-            $package = (Get-AppxPackage -AllUsers '{{ $packageName }}');
-            if (!$package) { 
-                Write-Error 'App could not be found' -ErrorAction Stop;
-            }
-            $directories = @($package.InstallLocation, \"$env:LOCALAPPDATA\Packages\$($package.PackageFamilyName)\");
-            foreach($dir in $directories) {
-                if ( !$dir -Or !(Test-Path \"$dir\") ) { continue; }
-                cmd /c ('takeown /f \"' + $dir + '\" /r /d y 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
-                cmd /c ('icacls \"' + $dir + '\" /grant administrators:F /t 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
-                $files = Get-ChildItem -File -Path \"$dir\*.OLD\" -Recurse -Force;
-                foreach($file in $files) {
-                    $newName = $file.FullName.Substring(0, $file.FullName.Length - 4);
-                    Write-Host \"Rename '$($file.FullName)' to '$newName'\";
-                    Move-Item -LiteralPath \"$($file.FullName)\" -Destination \"$newName\" -Force;
-                }
-            };"
+        call:
+            function: RunPowerShell
+            parameters:
+                code:
+                    $package = (Get-AppxPackage -AllUsers '{{ $packageName }}');
+                    if (!$package) { 
+                        Write-Host 'Not installed';
+                        exit 0;
+                    }
+                    $directories = @($package.InstallLocation, \"$env:LOCALAPPDATA\Packages\$($package.PackageFamilyName)\");
+                    foreach($dir in $directories) {
+                        if ( !$dir -Or !(Test-Path \"$dir\") ) { continue; }
+                        cmd /c ('takeown /f \"' + $dir + '\" /r /d y 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
+                        cmd /c ('icacls \"' + $dir + '\" /grant administrators:F /t 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
+                        $files = Get-ChildItem -File -Path $dir -Recurse -Force;
+                        foreach($file in $files) {
+                            if($file.Name.EndsWith('.OLD')) { continue; }
+                            $newName =  $file.FullName + '.OLD';
+                            Write-Host \"Rename '$($file.FullName)' to '$newName'\";
+                            Move-Item -LiteralPath \"$($file.FullName)\" -Destination \"$newName\" -Force;
+                        }
+                    }
+                revertCode:
+                    $package = (Get-AppxPackage -AllUsers '{{ $packageName }}');
+                    if (!$package) { 
+                        Write-Error 'App could not be found' -ErrorAction Stop;
+                    }
+                    $directories = @($package.InstallLocation, \"$env:LOCALAPPDATA\Packages\$($package.PackageFamilyName)\");
+                    foreach($dir in $directories) {
+                        if ( !$dir -Or !(Test-Path \"$dir\") ) { continue; }
+                        cmd /c ('takeown /f \"' + $dir + '\" /r /d y 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
+                        cmd /c ('icacls \"' + $dir + '\" /grant administrators:F /t 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
+                        $files = Get-ChildItem -File -Path \"$dir\*.OLD\" -Recurse -Force;
+                        foreach($file in $files) {
+                            $newName = $file.FullName.Substring(0, $file.FullName.Length - 4);
+                            Write-Host \"Rename '$($file.FullName)' to '$newName'\";
+                            Move-Item -LiteralPath \"$($file.FullName)\" -Destination \"$newName\" -Force;
+                        }
+                    }
    -
        name: UninstallCapability
        parameters: [ capabilityName ]
-        code: PowerShell -Command "Get-WindowsCapability -Online -Name '{{ $capabilityName }}*' | Remove-WindowsCapability -Online"
-        revertCode: PowerShell -Command "$capability = Get-WindowsCapability -Online -Name '{{ $capabilityName }}*'; Add-WindowsCapability -Name \"$capability.Name\" -Online"
+        call:
+            function: RunPowerShell
+            parameters:
+                code: Get-WindowsCapability -Online -Name '{{ $capabilityName }}*' | Remove-WindowsCapability -Online
+                revertCode:
+                    $capability = Get-WindowsCapability -Online -Name '{{ $capabilityName }}*';
+                    Add-WindowsCapability -Name \"$capability.Name\" -Online
    -
        name: RenameSystemFile
        parameters: [ filePath ]
@@ -4250,15 +4447,28 @@ functions:
    -
        name: SetVsCodeSetting
        parameters: [ setting, powerShellValue ]
-        code:
-            Powershell -Command "
-                $jsonfile = \"$env:APPDATA\Code\User\settings.json\";
-                $json = Get-Content $jsonfile | Out-String | ConvertFrom-Json;
-                $json | Add-Member -Type NoteProperty -Name '{{ $setting }}' -Value {{ $powerShellValue }} -Force;
-                $json | ConvertTo-Json | Set-Content $jsonfile;"
-        revertCode:
-            Powershell -Command "
-                $jsonfile = \"$env:APPDATA\Code\User\settings.json\";
-                $json = Get-Content $jsonfile | ConvertFrom-Json;
-                $json.PSObject.Properties.Remove('{{ $setting }}');
-                $json | ConvertTo-Json | Set-Content $jsonfile;"
+        call:
+            function: RunPowerShell
+            parameters:
+                code:
+                    $jsonfile = \"$env:APPDATA\Code\User\settings.json\";
+                    if (!(Test-Path $jsonfile -PathType Leaf)) {
+                        Write-Host \"No updates. Settings file was not at $jsonfile\";
+                        exit 0;
+                    }
+                    $json = Get-Content $jsonfile | Out-String | ConvertFrom-Json;
+                    $json | Add-Member -Type NoteProperty -Name '{{ $setting }}' -Value {{ $powerShellValue }} -Force;
+                    $json | ConvertTo-Json | Set-Content $jsonfile;
+                revertCode:
+                    $jsonfile = \"$env:APPDATA\Code\User\settings.json\";
+                    if (!(Test-Path $jsonfile -PathType Leaf)) {
+                        Write-Error \"Settings file could not be found at $jsonfile\" -ErrorAction Stop;
+                    }
+                    $json = Get-Content $jsonfile | ConvertFrom-Json;
+                    $json.PSObject.Properties.Remove('{{ $setting }}');
+                    $json | ConvertTo-Json | Set-Content $jsonfile;
+    -
+        name: RunPowerShell
+        parameters: [ code, revertCode ]
+        code: PowerShell -ExecutionPolicy Unrestricted -Command "{{ $code }}"
+        revertCode: PowerShell -ExecutionPolicy Unrestricted -Command "{{ $revertCode }}"
--- a/src/domain/ScriptCode.ts
+++ b/src/domain/ScriptCode.ts
@@ -4,16 +4,17 @@ export class ScriptCode implements IScriptCode {
    constructor(
        public readonly execute: string,
        public readonly revert: string,
-        scriptName: string,
        syntax: ILanguageSyntax) {
-        if (!scriptName)    {   throw new Error('script name is undefined');    }
-        if (!syntax)        {   throw new Error('syntax is undefined');         }
-        validateCode(scriptName, execute, syntax);
+        if (!syntax) { throw new Error('undefined syntax'); }
+        validateCode(execute, syntax);
        if (revert) {
-            scriptName = `${scriptName} (revert)`;
-            validateCode(scriptName, revert, syntax);
-            if (execute === revert) {
-                throw new Error(`${scriptName}: Code itself and its reverting code cannot be the same`);
+            try {
+                validateCode(revert, syntax);
+                if (execute === revert) {
+                    throw new Error(`Code itself and its reverting code cannot be the same`);
+                }
+            } catch (err) {
+                throw Error(`(revert): ${err.message}`);
            }
        }
    }
@@ -24,21 +25,21 @@ export interface ILanguageSyntax {
    readonly commonCodeParts: string[];
 }

-function validateCode(name: string, code: string, syntax: ILanguageSyntax): void {
+function validateCode(code: string, syntax: ILanguageSyntax): void {
    if (!code || code.length === 0) {
-        throw new Error(`code of ${name} is empty or undefined`);
+        throw new Error(`code is empty or undefined`);
    }
-    ensureNoEmptyLines(name, code);
-    ensureCodeHasUniqueLines(name, code, syntax);
+    ensureNoEmptyLines(code);
+    ensureCodeHasUniqueLines(code, syntax);
 }

-function ensureNoEmptyLines(name: string, code: string): void {
+function ensureNoEmptyLines(code: string): void {
    if (code.split('\n').some((line) => line.trim().length === 0)) {
-        throw Error(`script has empty lines "${name}"`);
+        throw Error(`script has empty lines`);
    }
 }

-function ensureCodeHasUniqueLines(name: string, code: string, syntax: ILanguageSyntax): void {
+function ensureCodeHasUniqueLines(code: string, syntax: ILanguageSyntax): void {
    const lines = code.split('\n')
        .filter((line) => !shouldIgnoreLine(line, syntax));
    if (lines.length === 0) {
@@ -46,7 +47,7 @@ function ensureCodeHasUniqueLines(name: string, code: string, syntax: ILanguageS
    }
    const duplicateLines = lines.filter((e, i, a) => a.indexOf(e) !== i);
    if (duplicateLines.length !== 0) {
-        throw Error(`Duplicates detected in script "${name}":\n ${duplicateLines.join('\n')}`);
+        throw Error(`Duplicates detected in script:\n${duplicateLines.map((line, index) => `(${index}) - ${line}`).join('\n')}`);
    }
 }

--- a/src/infrastructure/Clipboard.ts
+++ b/src/infrastructure/Clipboard.ts
@@ -1,4 +1,3 @@
-
 export class Clipboard {
    public static copyText(text: string): void {
        const el = document.createElement('textarea');
--- a/src/infrastructure/CodeRunner.ts
+++ b/src/infrastructure/CodeRunner.ts
@@ -0,0 +1,69 @@
+import { Environment } from '@/application/Environment/Environment';
+import os from 'os';
+import path from 'path';
+import fs from 'fs';
+import child_process from 'child_process';
+import { OperatingSystem } from '@/domain/OperatingSystem';
+
+export async function runCodeAsync(
+    code: string, folderName: string, fileExtension: string,
+    node = getNodeJs(), environment = Environment.CurrentEnvironment): Promise<void> {
+    const dir = node.path.join(node.os.tmpdir(), folderName);
+    await node.fs.promises.mkdir(dir, {recursive: true});
+    const filePath = node.path.join(dir, `run.${fileExtension}`);
+    await node.fs.promises.writeFile(filePath, code);
+    await node.fs.promises.chmod(filePath, '755');
+    const command = getExecuteCommand(filePath, environment);
+    node.child_process.exec(command);
+}
+
+function getExecuteCommand(scriptPath: string, environment: Environment): string {
+    switch (environment.os) {
+        case OperatingSystem.macOS:
+            return `open -a Terminal.app ${scriptPath}`;
+            // Another option with graphical sudo would be
+            //  `osascript -e "do shell script \\"${scriptPath}\\" with administrator privileges"`
+            // However it runs in background
+        case OperatingSystem.Windows:
+            return scriptPath;
+        default:
+            throw Error('undefined os');
+    }
+}
+
+function getNodeJs(): INodeJs {
+    return { os, path, fs, child_process };
+}
+
+export interface INodeJs {
+    os: INodeOs;
+    path: INodePath;
+    fs: INodeFs;
+    child_process: INodeChildProcess;
+}
+
+export interface INodeOs {
+    tmpdir(): string;
+}
+
+export interface INodePath {
+    join(...paths: string[]): string;
+}
+
+export interface INodeChildProcess {
+    exec(command: string): void;
+}
+
+export interface INodeFs {
+    readonly promises: INodeFsPromises;
+}
+
+interface INodeFsPromisesMakeDirectoryOptions {
+    recursive?: boolean;
+}
+
+interface INodeFsPromises { // https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/node/v13/fs.d.ts
+    chmod(path: string, mode: string | number): Promise<void>;
+    mkdir(path: string, options: INodeFsPromisesMakeDirectoryOptions): Promise<string>;
+    writeFile(path: string, data: string): Promise<void>;
+}
--- a/src/presentation/background.ts
+++ b/src/presentation/background.ts
@@ -1,5 +1,9 @@
 'use strict';

+// This is main process of Electron, started as first thing when app starts.
+// This script is running through entire life of the application.
+// It doesn't have any windows which you can see on screen, opens the main window from here.
+
 import { app, protocol, BrowserWindow, shell } from 'electron';
 import { createProtocol } from 'vue-cli-plugin-electron-builder/lib';
 import installExtension, { VUEJS_DEVTOOLS } from 'electron-devtools-installer';
@@ -34,6 +38,7 @@ function createWindow() {
    width: 1350,
    height: 955,
    webPreferences: {
+      contextIsolation: false, // To reach node https://github.com/nklayman/vue-cli-plugin-electron-builder/issues/1285
      // Use pluginOptions.nodeIntegration, leave this alone
      // See https://nklayman.github.io/vue-cli-plugin-electron-builder/guide/security.html#node-integration
      nodeIntegration: (process.env
@@ -110,14 +115,14 @@ if (isDevelopment) {
 function loadApplication(window: BrowserWindow) {
  if (process.env.WEBPACK_DEV_SERVER_URL) {
    // Load the url of the dev server if in development mode
-    win.loadURL(process.env.WEBPACK_DEV_SERVER_URL as string);
+    loadUrlWithNodeWorkaround(win, process.env.WEBPACK_DEV_SERVER_URL as string);
    if (!process.env.IS_TEST) {
      win.webContents.openDevTools();
    }
  } else {
    createProtocol('app');
    // Load the index.html when not in development
-    win.loadURL('app://./index.html');
+    loadUrlWithNodeWorkaround(win, 'app://./index.html');
    // tslint:disable-next-line:max-line-length
    autoUpdater.checkForUpdatesAndNotify(); // https://nklayman.github.io/vue-cli-plugin-electron-builder/guide/recipes.html#check-for-updates-in-background-js-ts
  }
@@ -131,3 +136,10 @@ function configureExternalsUrlsOpenBrowser(window: BrowserWindow) {
    }
  });
 }
+
+// Workaround for https://github.com/electron/electron/issues/19554 otherwise fs does not work
+function loadUrlWithNodeWorkaround(window: BrowserWindow, url: string) {
+  setTimeout(() => {
+    window.loadURL(url);
+  }, 10);
+}
--- a/src/presentation/bootstrapping/ApplicationBootstrapper.ts
+++ b/src/presentation/bootstrapping/ApplicationBootstrapper.ts
--- a/src/presentation/bootstrapping/IVueBootstrapper.ts
+++ b/src/presentation/bootstrapping/IVueBootstrapper.ts
--- a/src/presentation/bootstrapping/Modules/IconBootstrapper.ts
+++ b/src/presentation/bootstrapping/Modules/IconBootstrapper.ts
@@ -7,8 +7,7 @@ import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 import { faFolderOpen, faFolder, faSmile } from '@fortawesome/free-regular-svg-icons';
 /** SOLID ICONS (PREFIX: fas (default)) */
 import { faTimes, faFileDownload, faCopy, faSearch, faInfoCircle, faUserSecret, faDesktop,
-    faTag, faGlobe, faSave, faBatteryFull, faBatteryHalf } from '@fortawesome/free-solid-svg-icons';
-
+    faTag, faGlobe, faSave, faBatteryFull, faBatteryHalf, faPlay, faArrowsAltH } from '@fortawesome/free-solid-svg-icons';

 export class IconBootstrapper implements IVueBootstrapper {
    public bootstrap(vue: VueConstructor): void {
@@ -24,9 +23,12 @@ export class IconBootstrapper implements IVueBootstrapper {
            faTimes,
            faFileDownload, faSave,
            faCopy,
+            faPlay,
            faSearch,
            faBatteryFull, faBatteryHalf,
-            faInfoCircle);
+            faInfoCircle,
+            faArrowsAltH,
+        );
        vue.component('font-awesome-icon', FontAwesomeIcon);
    }
 }
--- a/src/presentation/bootstrapping/Modules/TooltipBootstrapper.ts
+++ b/src/presentation/bootstrapping/Modules/TooltipBootstrapper.ts
--- a/src/presentation/bootstrapping/Modules/TreeBootstrapper.ts
+++ b/src/presentation/bootstrapping/Modules/TreeBootstrapper.ts
--- a/src/presentation/bootstrapping/Modules/VModalBootstrapper.ts
+++ b/src/presentation/bootstrapping/Modules/VModalBootstrapper.ts
--- a/src/presentation/bootstrapping/Modules/VueBootstrapper.ts
+++ b/src/presentation/bootstrapping/Modules/VueBootstrapper.ts
--- a/src/presentation/components/App.vue
+++ b/src/presentation/components/App.vue
@@ -1,31 +1,28 @@
 <template>
  <div id="app">
      <div class="wrapper">
-          <TheHeader class="row" />
-          <TheSearchBar class="row" />
-          <TheScripts class="row"/>
-          <TheCodeArea class="row" theme="xcode" />
-          <TheCodeButtons class="row code-buttons" />
-          <TheFooter />
+        <TheHeader class="row" />
+        <TheSearchBar class="row" />
+        <TheScriptArea class="row" />
+        <TheCodeButtons class="row code-buttons" />
+        <TheFooter />
      </div>
   </div>
 </template>

 <script lang="ts">
 import { Component, Vue } from 'vue-property-decorator';
-import TheHeader from '@/presentation/TheHeader.vue';
-import TheFooter from '@/presentation/TheFooter/TheFooter.vue';
-import TheCodeArea from '@/presentation/TheCodeArea.vue';
-import TheCodeButtons from '@/presentation/CodeButtons/TheCodeButtons.vue';
-import TheSearchBar from '@/presentation/TheSearchBar.vue';
-import TheScripts from '@/presentation/Scripts/TheScripts.vue';
+import TheHeader from '@/presentation/components/TheHeader.vue';
+import TheFooter from '@/presentation/components/TheFooter/TheFooter.vue';
+import TheCodeButtons from '@/presentation/components/Code/CodeButtons/TheCodeButtons.vue';
+import TheScriptArea from '@/presentation/components/Scripts/TheScriptArea.vue';
+import TheSearchBar from '@/presentation/components/TheSearchBar.vue';

@Component({
  components: {
    TheHeader,
-    TheCodeArea,
    TheCodeButtons,
-    TheScripts,
+    TheScriptArea,
    TheSearchBar,
    TheFooter,
  },
@@ -38,6 +35,7 @@ export default class App extends Vue {
 <style lang="scss">
@import "@/presentation/styles/colors.scss";
@import "@/presentation/styles/fonts.scss";
+@import "@/presentation/styles/media.scss";

 * {
  box-sizing: border-box;
@@ -49,12 +47,10 @@ body {
  color: $slate;
 }

-
 #app {
  margin-right: auto;
  margin-left: auto;
-  max-width: 1500px;
-  
+  max-width: 1600px;
  .wrapper {
    margin: 0% 2% 0% 2%;
    background-color: white;
@@ -62,18 +58,15 @@ body {
    padding: 2%;
    display:flex;
    flex-direction: column;
-
    .row {
      margin-bottom: 10px;
    }
-
    .code-buttons {
      padding-bottom: 10px;
    }
  }
 }

-
@import "@/presentation/styles/tooltip.scss";
@import "@/presentation/styles/tree.scss";
 </style>
--- a/src/presentation/components/Code/CodeButtons/Code.vue
+++ b/src/presentation/components/Code/CodeButtons/Code.vue
--- a/src/presentation/components/Code/CodeButtons/IconButton.vue
+++ b/src/presentation/components/Code/CodeButtons/IconButton.vue
--- a/src/presentation/components/Code/CodeButtons/MacOsInstructions.vue
+++ b/src/presentation/components/Code/CodeButtons/MacOsInstructions.vue
@@ -1,8 +1,8 @@
 <template>
    <div class="instructions">
-        <!-- <p>
+        <p>
            Since you're using online version of {{ this.appName }}, you will need to do additional steps after downloading the file to execute your script on macOS:
-        </p> -->
+        </p>
        <p>
            <ol>
                <li>
@@ -73,9 +73,9 @@
                </li>
            </ol>
        </p>
-        <!-- <p>
+        <p>
            Or download the <a :href="this.macOsDownloadUrl">offline version</a> to run your scripts directly to skip these steps.
-        </p> -->
+        </p>
    </div>
 </template>

--- a/src/presentation/components/Code/CodeButtons/TheCodeButtons.vue
+++ b/src/presentation/components/Code/CodeButtons/TheCodeButtons.vue
@@ -1,5 +1,11 @@
 <template>
    <div class="container" v-if="hasCode">
+        <IconButton
+            v-if="this.canRun"
+            text="Run"
+            v-on:click="executeCodeAsync"
+            icon-prefix="fas" icon-name="play">
+        </IconButton>
        <IconButton
            :text="this.isDesktopVersion ? 'Save' : 'Download'"
            v-on:click="saveCodeAsync"
@@ -11,25 +17,18 @@
            v-on:click="copyCodeAsync"
            icon-prefix="fas" icon-name="copy">
        </IconButton>
-        <modal :name="macOsModalName" height="auto" :scrollable="true" :adaptive="true"
-          v-if="this.isMacOsCollection">
-          <div class="modal">
-            <div class="modal__content">
-                <MacOsInstructions :fileName="this.fileName" />
-            </div>
-            <div class="modal__close-button">
-              <font-awesome-icon :icon="['fas', 'times']"  @click="$modal.hide(macOsModalName)"/>
-            </div>
-          </div>
-        </modal>
+        <Dialog v-if="this.isMacOsCollection" ref="instructionsDialog">
+          <MacOsInstructions :fileName="this.fileName" />
+        </Dialog>
    </div>
 </template>

 <script lang="ts">
 import { Component } from 'vue-property-decorator';
-import { StatefulVue } from '@/presentation/StatefulVue';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
 import { SaveFileDialog, FileType } from '@/infrastructure/SaveFileDialog';
 import { Clipboard } from '@/infrastructure/Clipboard';
+import Dialog from '@/presentation/components/Shared/Dialog.vue';
 import IconButton from './IconButton.vue';
 import MacOsInstructions from './MacOsInstructions.vue';
 import { Environment } from '@/application/Environment/Environment';
@@ -38,18 +37,20 @@ import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
 import { IApplicationCode } from '@/application/Context/State/Code/IApplicationCode';
 import { IScriptingDefinition } from '@/domain/IScriptingDefinition';
 import { OperatingSystem } from '@/domain/OperatingSystem';
+import { runCodeAsync } from '@/infrastructure/CodeRunner';
+import { IApplicationContext } from '@/application/Context/IApplicationContext';

@Component({
  components: {
    IconButton,
    MacOsInstructions,
+    Dialog,
  },
 })
 export default class TheCodeButtons extends StatefulVue {
-  public readonly macOsModalName = 'macos-instructions';
-
+  public readonly isDesktopVersion = Environment.CurrentEnvironment.isDesktop;
+  public canRun = false;
  public hasCode = false;
-  public isDesktopVersion = Environment.CurrentEnvironment.isDesktop;
  public isMacOsCollection = false;
  public fileName = '';

@@ -61,11 +62,16 @@ export default class TheCodeButtons extends StatefulVue {
    const context = await this.getCurrentContextAsync();
    saveCode(this.fileName, context.state);
    if (this.isMacOsCollection) {
-      this.$modal.show(this.macOsModalName);
+      (this.$refs.instructionsDialog as any).show();
    }
  }
+  public async executeCodeAsync() {
+    const context = await this.getCurrentContextAsync();
+    await executeCodeAsync(context);
+  }

  protected handleCollectionState(newState: ICategoryCollectionState): void {
+    this.canRun = this.isDesktopVersion && newState.collection.os === Environment.CurrentEnvironment.os;
    this.isMacOsCollection = newState.collection.os === OperatingSystem.macOS;
    this.fileName = buildFileName(newState.collection.scripting);
    this.react(newState.code);
@@ -108,12 +114,18 @@ function buildFileName(scripting: IScriptingDefinition) {
  }
  return fileName;
 }
+
+async function executeCodeAsync(context: IApplicationContext) {
+    await runCodeAsync(
+        /*code*/ context.state.code.current,
+        /*appName*/ context.app.info.name,
+        /*fileExtension*/ context.state.collection.scripting.fileExtension,
+      );
+}
+
 </script>

 <style scoped lang="scss">
-@import "@/presentation/styles/colors.scss";
-@import "@/presentation/styles/fonts.scss";
-
 .container {
    display: flex;
    flex-direction: row;
@@ -122,26 +134,4 @@ function buildFileName(scripting: IScriptingDefinition) {
 .container > * + * {
  margin-left: 30px;
 }
-.modal {
-    font-family: $normal-font;
-    margin-bottom: 10px;
-    display: flex;
-    flex-direction: row;
-
-    &__content {
-      width: 100%;
-      margin: 5%;
-    }
-
-    &__close-button {
-      width: auto;
-      font-size: 1.5em;
-      margin-right:0.25em;
-      align-self: flex-start;
-      cursor: pointer;
-      &:hover {
-        opacity: 0.9;
-      }
-    }
-}
 </style>
--- a/src/presentation/components/Code/TheCodeArea.vue
+++ b/src/presentation/components/Code/TheCodeArea.vue
@@ -1,10 +1,15 @@
 <template>
-    <div :id="editorId" class="code-area" ></div>
+  <Responsive v-on:sizeChanged="sizeChanged()">
+    <div
+      :id="editorId"
+      class="code-area"
+    ></div>
+  </Responsive>
 </template>

 <script lang="ts">
 import { Component, Prop } from 'vue-property-decorator';
-import { StatefulVue } from './StatefulVue';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
 import ace from 'ace-builds';
 import 'ace-builds/webpack-resolver';
 import { ICodeChangedEvent } from '@/application/Context/State/Code/Event/ICodeChangedEvent';
@@ -12,8 +17,13 @@ import { IScript } from '@/domain/IScript';
 import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
 import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
 import { CodeBuilderFactory } from '@/application/Context/State/Code/Generation/CodeBuilderFactory';
+import Responsive from '@/presentation/components/Shared/Responsive.vue';

-@Component
+@Component({
+  components: {
+    Responsive,
+  },
+})
 export default class TheCodeArea extends StatefulVue {
  public readonly editorId = 'codeEditor';

@@ -25,6 +35,11 @@ export default class TheCodeArea extends StatefulVue {
  public destroyed() {
    this.destroyEditor();
  }
+  public sizeChanged() {
+    if (this.editor) {
+      this.editor.resize();
+    }
+  }

  protected handleCollectionState(newState: ICategoryCollectionState): void {
    this.destroyEditor();
@@ -44,7 +59,6 @@ export default class TheCodeArea extends StatefulVue {
      return;
    }
    this.editor.setValue(event.code, 1);
-
    if (event.addedScripts && event.addedScripts.length) {
      this.reactToChanges(event, event.addedScripts);
    } else if (event.changedScripts && event.changedScripts.length) {
@@ -83,6 +97,7 @@ export default class TheCodeArea extends StatefulVue {
  private destroyEditor() {
    if (this.editor) {
      this.editor.destroy();
+      this.editor = undefined;
    }
  }
 }
@@ -95,6 +110,7 @@ function initializeEditor(theme: string, editorId: string, language: ScriptingLa
  editor.setTheme(`ace/theme/${theme}`);
  editor.setReadOnly(true);
  editor.setAutoScrollEditorIntoView(true);
+  editor.setShowPrintMargin(false); // hides vertical line
  editor.getSession().setUseWrapMode(true); // So code is readable on mobile
  return editor;
 }
@@ -129,17 +145,17 @@ function getDefaultCode(language: ScriptingLanguage): string {

 </script>

-<style lang="scss">
+<style scoped lang="scss">
@import "@/presentation/styles/colors.scss";
-.code-area {
-    width: 100%;
-    max-height: 1000px;
-    min-height: 200px;
-    overflow: auto;
-    &__highlight {
-      background-color:$accent;
-      opacity: 0.2; // having procent fails in production (minified) build
-      position:absolute;
-    }
+::v-deep .code-area {
+  min-height: 200px;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  &__highlight {
+    background-color: $accent;
+    opacity: 0.2; // having procent fails in production (minified) build
+    position: absolute;
+  }
 }
 </style>
--- a/src/presentation/components/Scripts/Cards/CardList.vue
+++ b/src/presentation/components/Scripts/Cards/CardList.vue
@@ -1,8 +1,17 @@
 <template>
-  <div>
-    <div v-if="categoryIds != null && categoryIds.length > 0" class="cards">
+  <Responsive v-on:widthChanged="width = $event">
+    <!-- <div id="responsivity-debug">
+      Width: {{ width || 'undefined' }}
+      Size: <span v-if="width <= 500">small</span><span v-if="width > 500 && width < 750">medium</span><span v-if="width >= 750">big</span> 
+    </div> -->
+    <div v-if="categoryIds != null && categoryIds.length > 0"  class="cards">
      <CardListItem
        class="card"
+        v-bind:class="{ 
+          'small-screen': width <= 500,
+          'medium-screen': width > 500 && width < 750,
+          'big-screen': width >= 750         
+        }"
        v-for="categoryId of categoryIds"
        :data-category="categoryId"
        v-bind:key="categoryId"
@@ -12,13 +21,14 @@
      </CardListItem>
    </div>
    <div v-else class="error">Something went bad 😢</div>
-  </div>
+  </Responsive>
 </template>

 <script lang="ts">
-import { Component } from 'vue-property-decorator';
 import CardListItem from './CardListItem.vue';
-import { StatefulVue } from '@/presentation/StatefulVue';
+import Responsive from '@/presentation/components/Shared/Responsive.vue';
+import { Component } from 'vue-property-decorator';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
 import { ICategory } from '@/domain/ICategory';
 import { hasDirective } from './NonCollapsingDirective';
 import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
@@ -26,9 +36,11 @@ import { ICategoryCollectionState } from '@/application/Context/State/ICategoryC
@Component({
  components: {
    CardListItem,
+    Responsive,
  },
 })
 export default class CardList extends StatefulVue {
+  public width: number = 0;
  public categoryIds: number[] = [];
  public activeCategoryId?: number = null;

@@ -75,6 +87,7 @@ export default class CardList extends StatefulVue {
  flex-flow: row wrap;
  font-family: $main-font;
 }
+
 .error {
  width: 100%;
  text-align: center;
--- a/src/presentation/components/Scripts/Cards/CardListItem.vue
+++ b/src/presentation/components/Scripts/Cards/CardListItem.vue
@@ -33,8 +33,8 @@

 <script lang="ts">
 import { Component, Prop, Watch, Emit } from 'vue-property-decorator';
-import ScriptsTree from '@/presentation/Scripts/ScriptsTree/ScriptsTree.vue';
-import { StatefulVue } from '@/presentation/StatefulVue';
+import ScriptsTree from '@/presentation/components/Scripts/ScriptsTree/ScriptsTree.vue';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';

@Component({
  components: {
@@ -106,12 +106,7 @@ $expanded-margin-top: 30px;

 .card {
  margin: 15px; 
-  width: calc((100% / 3) - #{$card-line-break-width});
  transition: all 0.2s ease-in-out;
-  // Media queries for stacking cards
-  @media screen and (max-width: $big-screen-width) {  width: calc((100% / 2) - #{$card-line-break-width}); }
-  @media screen and (max-width: $medium-screen-width) {  width: 100%; }
-  @media screen and (max-width: $small-screen-width) {  width: 90%; }

  &__inner {  
    padding: $card-padding $card-padding 0 $card-padding;
@@ -241,31 +236,32 @@ $expanded-margin-top: 30px;
    }
  }
 }
-
-@media screen and (min-width: $big-screen-width) { // when 3 cards in a row
-  .card:nth-of-type(3n+2) .card__expander {
-    margin-left: calc(-100% - #{$card-line-break-width});
-  }
-  .card:nth-of-type(3n+3) .card__expander {
-    margin-left: calc(-200% - (#{$card-line-break-width} * 2));
-  }
-  .card:nth-of-type(3n+4) {
-    clear: left;
+@mixin adaptive-card($cards-in-row) {
+  &.card {
+    width: calc((100% / #{$cards-in-row}) - #{$card-line-break-width});
+    @for $nth-card from 2 through $cards-in-row {
+      &:nth-of-type(#{$cards-in-row}n+#{$nth-card}) {
+        .card__expander {
+          $card-left: -100% * ($nth-card - 1);
+          $additional-space: $card-line-break-width * ($nth-card - 1);
+          margin-left: calc(#{$card-left} - #{$additional-space});
+        }
+      }
+    }
+    // Ensure new line after last row
+    $card-after-last: $cards-in-row + 1;
+    &:nth-of-type(#{$cards-in-row}n+#{$card-after-last}) {
+      clear: left;
+    }
  }
  .card__expander {
-    width: calc(300% + (#{$card-line-break-width} * 2));
+    $all-cards-width: 100% * $cards-in-row;
+    $card-padding: $card-line-break-width * ($cards-in-row - 1);
+    width: calc(#{$all-cards-width} + #{$card-padding});
  }
 }

-@media screen and (min-width: $medium-screen-width) and (max-width: $big-screen-width) { // when 2 cards in a row
-  .card:nth-of-type(2n+2) .card__expander {
-    margin-left: calc(-100% - #{$card-line-break-width});
-  }
-  .card:nth-of-type(2n+3) {
-    clear: left;
-  }
-  .card__expander {
-    width: calc(200% + #{$card-line-break-width});
-  }
-}
+.big-screen     {   @include adaptive-card(3);  }
+.medium-screen  {   @include adaptive-card(2);  }
+.small-screen   {   @include adaptive-card(1);  }
 </style>
--- a/src/presentation/components/Scripts/Cards/NonCollapsingDirective.ts
+++ b/src/presentation/components/Scripts/Cards/NonCollapsingDirective.ts
--- a/src/presentation/components/Scripts/Menu/Grouping/Grouping.ts
+++ b/src/presentation/components/Scripts/Menu/Grouping/Grouping.ts
--- a/src/presentation/components/Scripts/Menu/Grouping/TheGrouper.vue
+++ b/src/presentation/components/Scripts/Menu/Grouping/TheGrouper.vue
--- a/src/presentation/components/Scripts/Menu/Selector/SelectableOption.vue
+++ b/src/presentation/components/Scripts/Menu/Selector/SelectableOption.vue
@@ -7,7 +7,7 @@

 <script lang="ts">
 import { Component, Prop, Emit, Vue } from 'vue-property-decorator';
-import { NonCollapsing } from '@/presentation/Scripts/Cards/NonCollapsingDirective';
+import { NonCollapsing } from '@/presentation/components/Scripts/Cards/NonCollapsingDirective';

@Component({
    directives: { NonCollapsing },
--- a/src/presentation/components/Scripts/Menu/Selector/TheSelector.vue
+++ b/src/presentation/components/Scripts/Menu/Selector/TheSelector.vue
@@ -1,6 +1,6 @@
 <template>
    <div class="container">
-        <div class="part select">Select:</div>
+        <div class="part">Select:</div>
        <div class="part">
            <div class="part">
                <SelectableOption
@@ -50,7 +50,7 @@

 <script lang="ts">
 import { Component } from 'vue-property-decorator';
-import { StatefulVue } from '@/presentation/StatefulVue';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
 import SelectableOption from './SelectableOption.vue';
 import { IScript } from '@/domain/IScript';
 import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript';
@@ -173,5 +173,4 @@ function areAllSelected(
    }
    font-family: $normal-font;
 }
-
 </style>
--- a/src/presentation/components/Scripts/Menu/TheOsChanger.vue
+++ b/src/presentation/components/Scripts/Menu/TheOsChanger.vue
@@ -1,12 +1,15 @@
 <template>
  <div class="container">
-    <div v-for="os in this.allOses" :key="os.name">
-      <span
-        class="name"
-        v-bind:class="{ 'current': currentOs === os.os }"
-        v-on:click="changeOsAsync(os.os)">
-        {{ os.name }}
-      </span>
+    <!-- <div>OS:</div> -->
+    <div class="os-list">
+      <div v-for="os in this.allOses" :key="os.name">
+        <span
+          class="os-name"
+          v-bind:class="{ 'current': currentOs === os.os }"
+          v-on:click="changeOsAsync(os.os)">
+          {{ os.name }}
+        </span>
+      </div>
    </div>
  </div>
 </template>
@@ -14,7 +17,7 @@
 <script lang="ts">
 import { Component } from 'vue-property-decorator';
 import { OperatingSystem } from '@/domain/OperatingSystem';
-import { StatefulVue } from '@/presentation/StatefulVue';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
 import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
 import { ApplicationFactory } from '@/application/ApplicationFactory';

@@ -42,7 +45,7 @@ export default class TheOsChanger extends StatefulVue {
 function renderOsName(os: OperatingSystem): string {
    switch (os) {
      case OperatingSystem.Windows: return 'Windows';
-      case OperatingSystem.macOS: return 'macOS (preview)';
+      case OperatingSystem.macOS: return 'macOS';
      default: throw new RangeError(`Cannot render os name: ${OperatingSystem[os]}`);
    }
 }
@@ -55,20 +58,24 @@ function renderOsName(os: OperatingSystem): string {
  font-family: $normal-font;
  display: flex;
  align-items: center;
-  div + div::before {
-      content: "|";
-      margin-left: 0.5rem;
-  }
-  .name {
-    &:not(.current) {
-      cursor: pointer;
-      &:hover {
-          font-weight: bold;
-          text-decoration: underline;
-      }
+  .os-list {
+    display: flex;
+    margin-left: 0.25rem;
+    div + div::before {
+        content: "|";
+        margin-left: 0.5rem;
    }
-    &.current {
-      color: $gray;
+    .os-name {
+      &:not(.current) {
+        cursor: pointer;
+        &:hover {
+            font-weight: bold;
+            text-decoration: underline;
+        }
+      }
+      &.current {
+        color: $gray;
+      }
    }
  }
 }
--- a/src/presentation/components/Scripts/Menu/TheScriptsMenu.vue
+++ b/src/presentation/components/Scripts/Menu/TheScriptsMenu.vue
@@ -0,0 +1,77 @@
+<template>
+    <div id="container">
+        <TheSelector class="item" />
+        <TheOsChanger class="item"  />
+        <TheGrouper
+            class="item"
+            v-on:groupingChanged="$emit('groupingChanged', $event)"
+            v-if="!this.isSearching" />
+    </div>
+</template>
+
+<script lang="ts">
+import { Component } from 'vue-property-decorator';
+import TheOsChanger from './TheOsChanger.vue';
+import TheSelector from './Selector/TheSelector.vue';
+import TheGrouper from './Grouping/TheGrouper.vue';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
+import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
+import { IEventSubscription } from '@/infrastructure/Events/IEventSource';
+
+@Component({
+  components: {
+    TheSelector,
+    TheOsChanger,
+    TheGrouper,
+  },
+})
+export default class TheScriptsMenu extends StatefulVue {
+  public isSearching = false;
+
+  private listeners = new Array<IEventSubscription>();
+
+  public destroyed() {
+    this.unsubscribeAll();
+  }
+
+  protected initialize(): void {
+    return;
+  }
+  protected handleCollectionState(newState: ICategoryCollectionState): void {
+    this.subscribe(newState);
+  }
+
+  private subscribe(state: ICategoryCollectionState) {
+      this.listeners.push(state.filter.filterRemoved.on(() => {
+          this.isSearching = false;
+      }));
+      state.filter.filtered.on(() => {
+          this.isSearching = true;
+      });
+  }
+  private unsubscribeAll() {
+      this.listeners.forEach((listener) => listener.unsubscribe());
+      this.listeners.splice(0, this.listeners.length);
+  }
+}
+</script>
+
+<style scoped lang="scss">
+#container {
+    display: flex;
+    flex-wrap: wrap;
+    .item {
+        flex: 1;
+        white-space: nowrap;
+        display: flex;
+        justify-content: center;
+        margin: 0 5px 0 5px;
+        &:first-child {
+            justify-content: flex-start;
+        }
+        &:last-child {
+            justify-content: flex-end;
+        }
+    }
+}
+</style>
--- a/src/presentation/components/Scripts/ScriptsTree/ScriptNodeParser.ts
+++ b/src/presentation/components/Scripts/ScriptsTree/ScriptNodeParser.ts
--- a/src/presentation/components/Scripts/ScriptsTree/ScriptsTree.vue
+++ b/src/presentation/components/Scripts/ScriptsTree/ScriptsTree.vue
@@ -16,7 +16,7 @@

 <script lang="ts">
 import { Component, Prop, Watch } from 'vue-property-decorator';
-import { StatefulVue } from '@/presentation/StatefulVue';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
 import { IScript } from '@/domain/IScript';
 import { ICategory } from '@/domain/ICategory';
 import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
--- a/src/presentation/components/Scripts/ScriptsTree/SelectableTree/INodeSelectedEvent.ts
+++ b/src/presentation/components/Scripts/ScriptsTree/SelectableTree/INodeSelectedEvent.ts
--- a/src/presentation/components/Scripts/ScriptsTree/SelectableTree/LiquorTree/LiquorTree.d.ts
+++ b/src/presentation/components/Scripts/ScriptsTree/SelectableTree/LiquorTree/LiquorTree.d.ts
--- a/src/presentation/components/Scripts/ScriptsTree/SelectableTree/LiquorTree/LiquorTreeOptions.ts
+++ b/src/presentation/components/Scripts/ScriptsTree/SelectableTree/LiquorTree/LiquorTreeOptions.ts
--- a/src/presentation/components/Scripts/ScriptsTree/SelectableTree/LiquorTree/NodeWrapper/NodePredicateFilter.ts
+++ b/src/presentation/components/Scripts/ScriptsTree/SelectableTree/LiquorTree/NodeWrapper/NodePredicateFilter.ts
--- a/src/presentation/components/Scripts/ScriptsTree/SelectableTree/LiquorTree/NodeWrapper/NodeStateUpdater.ts
+++ b/src/presentation/components/Scripts/ScriptsTree/SelectableTree/LiquorTree/NodeWrapper/NodeStateUpdater.ts
--- a/src/presentation/components/Scripts/ScriptsTree/SelectableTree/LiquorTree/NodeWrapper/NodeTranslator.ts
+++ b/src/presentation/components/Scripts/ScriptsTree/SelectableTree/LiquorTree/NodeWrapper/NodeTranslator.ts
--- a/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/DocumentationUrls.vue
+++ b/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/DocumentationUrls.vue
--- a/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/INode.ts
+++ b/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/INode.ts
--- a/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/Node.vue
+++ b/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/Node.vue
--- a/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/RevertToggle.vue
+++ b/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/RevertToggle.vue
@@ -15,7 +15,7 @@
 <script lang="ts">
 import { Component, Prop, Watch } from 'vue-property-decorator';
 import { IReverter } from './Reverter/IReverter';
-import { StatefulVue } from '@/presentation/StatefulVue';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
 import { INode } from './INode';
 import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript';
 import { getReverter } from './Reverter/ReverterFactory';
--- a/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/Reverter/CategoryReverter.ts
+++ b/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/Reverter/CategoryReverter.ts
--- a/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/Reverter/IReverter.ts
+++ b/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/Reverter/IReverter.ts
--- a/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/Reverter/ReverterFactory.ts
+++ b/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/Reverter/ReverterFactory.ts
--- a/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/Reverter/ScriptReverter.ts
+++ b/src/presentation/components/Scripts/ScriptsTree/SelectableTree/Node/Reverter/ScriptReverter.ts
--- a/src/presentation/components/Scripts/ScriptsTree/SelectableTree/SelectableTree.vue
+++ b/src/presentation/components/Scripts/ScriptsTree/SelectableTree/SelectableTree.vue
--- a/src/presentation/components/Scripts/Slider/Handle.vue
+++ b/src/presentation/components/Scripts/Slider/Handle.vue
@@ -0,0 +1,71 @@
+<template>
+    <div
+        class="handle"
+        :style="{ cursor: cursorCssValue }"
+        @mousedown="startResize">
+        <div class="line"></div>
+        <font-awesome-icon
+            class="image"
+            :icon="['fas', 'arrows-alt-h']" 
+        /> <!-- exchange-alt arrows-alt-h-->
+        <div class="line"></div>
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator';
+
+@Component
+export default class Handle extends Vue {
+    public readonly cursorCssValue = 'ew-resize';
+    private initialX: number = undefined;
+
+    public startResize(event: MouseEvent): void {
+        this.initialX = event.clientX;
+        document.body.style.setProperty('cursor', this.cursorCssValue);
+        document.addEventListener('mousemove', this.resize);
+        window.addEventListener('mouseup', this.stopResize);
+        event.stopPropagation();
+        event.preventDefault();
+    }
+    public resize(event: MouseEvent): void {
+        const displacementX = event.clientX - this.initialX;
+        this.$emit('resized', displacementX);
+        this.initialX = event.clientX;
+    }
+    public stopResize(): void {
+        document.body.style.removeProperty('cursor');
+        document.removeEventListener('mousemove', this.resize);
+        window.removeEventListener('mouseup', this.stopResize);
+    }
+}
+
+</script>
+
+<style lang="scss" scoped>
+@import "@/presentation/styles/colors.scss";
+
+.handle {
+    user-select: none;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    &:hover {
+        .line {
+            background: $gray;
+        }
+        .image {
+            color: $gray;
+        }
+    }
+    .line {
+        flex: 1;
+        background: $dark-gray;
+        width: 3px;
+    }
+    .image {
+        color: $dark-gray;
+    }
+    margin-right: 10px;
+}
+</style>
--- a/src/presentation/components/Scripts/Slider/HorizontalResizeSlider.vue
+++ b/src/presentation/components/Scripts/Slider/HorizontalResizeSlider.vue
@@ -0,0 +1,53 @@
+<template>
+    <div class="slider">
+        <div class="left" ref="leftElement">
+            <slot name="left"></slot>
+        </div>
+        <Handle class="handle" @resized="onResize($event)" />
+        <div class="right">
+            <slot name="right"></slot>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator';
+import Handle from './Handle.vue';
+
+@Component({
+  components: {
+    Handle,
+  },
+})
+export default class HorizontalResizeSlider extends Vue {
+    private get left(): HTMLElement { return this.$refs.leftElement as HTMLElement; }
+
+    public onResize(displacementX: number): void {
+        const leftWidth = this.left.offsetWidth + displacementX;
+        this.left.style.width = `${leftWidth}px`;
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/presentation/styles/media.scss";
+
+.slider {
+    display: flex;
+    flex-direction: row;
+    .right {
+        flex: 1;
+    }
+}
+@media screen and (max-width: $vertical-view-breakpoint) {
+    .slider {
+        flex-direction: column;
+        .left {
+            width: auto !important;
+        }
+        .handle {
+            display: none;
+        }
+    }
+}
+</style>
--- a/src/presentation/components/Scripts/TheScriptArea.vue
+++ b/src/presentation/components/Scripts/TheScriptArea.vue
@@ -0,0 +1,49 @@
+<template>
+<div class="scripts">
+    <TheScriptsMenu v-on:groupingChanged="grouping = $event" />
+    <HorizontalResizeSlider class="row">
+        <template v-slot:left>
+            <TheScriptsList :grouping="grouping" />
+        </template>
+        <template v-slot:right>
+            <TheCodeArea theme="xcode" />
+        </template>
+    </HorizontalResizeSlider>
+</div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator';
+import TheCodeArea from '@/presentation/components/Code/TheCodeArea.vue';
+import TheScriptsList from '@/presentation/components/Scripts/TheScriptsList.vue';
+import TheScriptsMenu from '@/presentation/components/Scripts/Menu/TheScriptsMenu.vue';
+import HorizontalResizeSlider from '@/presentation/components/Scripts/Slider/HorizontalResizeSlider.vue';
+import { Grouping } from '@/presentation/components/Scripts/Menu/Grouping/Grouping';
+
+@Component({
+  components: {
+    TheCodeArea,
+    TheScriptsList,
+    TheScriptsMenu,
+    HorizontalResizeSlider,
+  },
+})
+export default class TheScriptArea extends Vue {
+    public grouping = Grouping.Cards;
+}
+</script>
+
+<style scoped lang="scss">
+.scripts {
+    > * + * {
+        margin-top: 15px;
+    }
+}
+::v-deep .left {
+    width: 55%; // initial width
+    min-width: 20%;
+}
+::v-deep .right {
+    min-width: 20%;
+}
+</style>
--- a/src/presentation/components/Scripts/TheScriptsList.vue
+++ b/src/presentation/components/Scripts/TheScriptsList.vue
@@ -1,52 +1,40 @@
 <template>
-    <div>
-        <div class="heading">
-            <TheSelector class="item"/>
-            <TheOsChanger class="item"/>
-            <TheGrouper
-                class="item"
-                v-on:groupingChanged="onGroupingChanged($event)"
-                v-if="!this.isSearching" />
+    <div class="scripts">
+        <div v-if="!isSearching">
+            <CardList v-if="grouping === Grouping.Cards"/>
+            <div class="tree" v-if="grouping === Grouping.None">
+                <ScriptsTree />
+            </div>
        </div>
-        <div class="scripts">
-            <div v-if="!isSearching">
-                <CardList v-if="currentGrouping === Grouping.Cards"/>
-                <div class="tree" v-if="currentGrouping === Grouping.None">
-                    <ScriptsTree />
+        <div v-else> <!-- Searching -->
+            <div class="search">
+                <div class="search__query">
+                    <div>Searching for "{{this.searchQuery | threeDotsTrim}}"</div>
+                    <div class="search__query__close-button">
+                        <font-awesome-icon
+                            :icon="['fas', 'times']" 
+                            v-on:click="clearSearchQueryAsync()"/>
+                    </div>
+                </div>
+                <div v-if="!searchHasMatches" class="search-no-matches">
+                    <div>Sorry, no matches for "{{this.searchQuery | threeDotsTrim}}" 😞</div>
+                    <div>Feel free to extend the scripts <a :href="repositoryUrl" target="_blank" class="child github" >here</a> ✨</div>
                </div>
            </div>
-            <div v-else> <!-- Searching -->
-                <div class="search">
-                    <div class="search__query">
-                        <div>Searching for "{{this.searchQuery | threeDotsTrim}}"</div>
-                        <div class="search__query__close-button">
-                            <font-awesome-icon
-                                :icon="['fas', 'times']" 
-                                v-on:click="clearSearchQueryAsync()"/>
-                        </div>
-                    </div>
-                    <div v-if="!searchHasMatches" class="search-no-matches">
-                        <div>Sorry, no matches for "{{this.searchQuery | threeDotsTrim}}" 😞</div>
-                        <div>Feel free to extend the scripts <a :href="repositoryUrl" target="_blank" class="child github" >here</a> ✨</div>
-                    </div>
-                </div>
-                <div v-if="searchHasMatches" class="tree tree--searching">
-                    <ScriptsTree />
-                </div>
+            <div v-if="searchHasMatches" class="tree tree--searching">
+                <ScriptsTree />
            </div>
        </div>
    </div>
 </template>

 <script lang="ts">
-import TheGrouper from '@/presentation/Scripts/Grouping/TheGrouper.vue';
-import TheOsChanger from '@/presentation/Scripts/TheOsChanger.vue';
-import TheSelector from '@/presentation/Scripts/Selector/TheSelector.vue';
-import ScriptsTree from '@/presentation/Scripts/ScriptsTree/ScriptsTree.vue';
-import CardList from '@/presentation/Scripts/Cards/CardList.vue';
-import { Component } from 'vue-property-decorator';
-import { StatefulVue } from '@/presentation/StatefulVue';
-import { Grouping } from './Grouping/Grouping';
+import TheGrouper from '@/presentation/components/Scripts/Menu/Grouping/TheGrouper.vue';
+import ScriptsTree from '@/presentation/components/Scripts/ScriptsTree/ScriptsTree.vue';
+import CardList from '@/presentation/components/Scripts/Cards/CardList.vue';
+import { Component, Prop } from 'vue-property-decorator';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
+import { Grouping } from '@/presentation/components/Scripts/Menu/Grouping/Grouping';
 import { IFilterResult } from '@/application/Context/State/Filter/IFilterResult';
 import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
 import { ApplicationFactory } from '@/application/ApplicationFactory';
@@ -55,10 +43,8 @@ import { ApplicationFactory } from '@/application/ApplicationFactory';
@Component({
 components: {
    TheGrouper,
-    TheSelector,
    ScriptsTree,
    CardList,
-    TheOsChanger,
 },
 filters: {
    threeDotsTrim(query: string) {
@@ -70,10 +56,11 @@ filters: {
    },
 },
 })
-export default class TheScripts extends StatefulVue {
+export default class TheScriptsList extends StatefulVue {
+    @Prop() public grouping: Grouping;
+
    public repositoryUrl = '';
-    public Grouping = Grouping; // Make it accessible from view
-    public currentGrouping = Grouping.Cards;
+    public Grouping = Grouping; // Make it accessible from the view
    public searchQuery = '';
    public isSearching = false;
    public searchHasMatches = false;
@@ -87,9 +74,6 @@ export default class TheScripts extends StatefulVue {
        const filter = context.state.filter;
        filter.removeFilter();
    }
-    public onGroupingChanged(group: Grouping) {
-        this.currentGrouping = group;
-    }

    protected handleCollectionState(newState: ICategoryCollectionState): void {
        this.events.unsubscribeAll();
@@ -114,11 +98,16 @@ export default class TheScripts extends StatefulVue {
 <style scoped lang="scss">
@import "@/presentation/styles/colors.scss";
@import "@/presentation/styles/fonts.scss";
+@import "@/presentation/styles/media.scss";

 $inner-margin: 4px;

 .scripts {
    margin-top: $inner-margin;
+    @media screen and (min-width: $vertical-view-breakpoint) { // so the current code is always visible
+        overflow: auto;
+        max-height: 70vh;
+    }
    .tree {
        padding-left: 3%;
        padding-top: 15px;
@@ -167,22 +156,4 @@ $inner-margin: 4px;
    }
 }

-.heading {
-    margin-top: $inner-margin;
-    display: flex;
-    flex-wrap: wrap;
-    .item {
-        flex: 1;
-        white-space: nowrap;
-        display: flex;
-        justify-content: center;
-        margin: 0 5px 0 5px;
-        &:first-child {
-            justify-content: flex-start;
-        }
-        &:last-child {
-            justify-content: flex-end;
-        }
-    }
-}
 </style>
--- a/src/presentation/components/Shared/Dialog.vue
+++ b/src/presentation/components/Shared/Dialog.vue
@@ -0,0 +1,58 @@
+<template>
+    <modal
+        :name="name"
+        :scrollable="true"
+        :adaptive="true"
+        height="auto">
+    <div class="dialog">
+      <div class="dialog__content">
+          <slot></slot>
+      </div>
+      <div class="dialog__close-button">
+        <font-awesome-icon :icon="['fas', 'times']"  @click="$modal.hide(name)"/>
+      </div>
+    </div>
+  </modal>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator';
+
+@Component
+export default class Dialog extends Vue {
+  private static idCounter = 0;
+
+  public name = (++Dialog.idCounter).toString();
+
+  public show(): void {
+    this.$modal.show(this.name);
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/presentation/styles/fonts.scss";
+
+.dialog {
+  font-family: $normal-font;
+  margin-bottom: 10px;
+  display: flex;
+  flex-direction: row;
+
+  &__content {
+    width: 100%;
+    margin: 5%;
+  }
+
+  &__close-button {
+    width: auto;
+    font-size: 1.5em;
+    margin-right: 0.25em;
+    align-self: flex-start;
+    cursor: pointer;
+    &:hover {
+      opacity: 0.9;
+    }
+  }
+}
+</style>
--- a/src/presentation/components/Shared/Responsive.vue
+++ b/src/presentation/components/Shared/Responsive.vue
@@ -0,0 +1,80 @@
+<template>
+  <div ref="containerElement" class="container">
+    <slot ref="containerElement"></slot>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Emit } from 'vue-property-decorator';
+import { throttle } from './Throttle';
+
+@Component
+export default class Responsive extends Vue {
+  private width: number;
+  private height: number;
+  private observer: ResizeObserver;
+  private get container(): HTMLElement { return this.$refs.containerElement as HTMLElement; }
+
+  public async mounted() {
+    this.width = this.container.offsetWidth;
+    this.height = this.container.offsetHeight;
+    const resizeCallback = throttle(() => this.updateSize(), 200);
+
+    if ('ResizeObserver' in window === false) {
+      const module = await import('@juggle/resize-observer');
+      window.ResizeObserver = module.ResizeObserver;
+    }
+
+    this.observer = new window.ResizeObserver(resizeCallback);
+    this.observer.observe(this.container);
+    this.fireChangeEvents();
+  }
+  public updateSize() {
+    let sizeChanged = false;
+    if (this.isWidthChanged()) {
+      this.updateWidth(this.container.offsetWidth);
+      sizeChanged = true;
+    }
+    if (this.isHeightChanged()) {
+      this.updateHeight(this.container.offsetHeight);
+      sizeChanged = true;
+    }
+    if (sizeChanged) {
+      this.$emit('sizeChanged');
+    }
+  }
+  @Emit('widthChanged') public updateWidth(width: number) {
+    this.width = width;
+  }
+  @Emit('heightChanged') public updateHeight(height: number) {
+    this.height = height;
+  }
+  public destroyed() {
+    if (this.observer) {
+      this.observer.disconnect();
+    }
+  }
+
+  private fireChangeEvents() {
+    this.updateWidth(this.container.offsetWidth);
+    this.updateHeight(this.container.offsetHeight);
+    this.$emit('sizeChanged');
+  }
+  private isWidthChanged(): boolean {
+    return this.width !== this.container.offsetWidth;
+  }
+  private isHeightChanged(): boolean {
+    return this.height !== this.container.offsetHeight;
+  }
+}
+
+</script>
+
+<style scoped lang="scss">
+.container {
+  width: 100%;
+  height: 100%;
+  display: inline-block; // if inline then it has no height or weight
+}
+</style>
+
--- a/src/presentation/components/Shared/StatefulVue.ts
+++ b/src/presentation/components/Shared/StatefulVue.ts
@@ -4,7 +4,7 @@ import { IApplicationContext } from '@/application/Context/IApplicationContext';
 import { buildContextAsync } from '@/application/Context/ApplicationContextFactory';
 import { IApplicationContextChangedEvent } from '@/application/Context/IApplicationContext';
 import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
-import { EventSubscriptionCollection } from '../infrastructure/Events/EventSubscriptionCollection';
+import { EventSubscriptionCollection } from '@/infrastructure/Events/EventSubscriptionCollection';

 // @ts-ignore because https://github.com/vuejs/vue-class-component/issues/91
@Component
--- a/src/presentation/components/Shared/Throttle.ts
+++ b/src/presentation/components/Shared/Throttle.ts
@@ -0,0 +1,52 @@
+export type CallbackType = (..._: any[]) => void;
+
+export function throttle(
+    callback: CallbackType, waitInMs: number,
+    timer: ITimer = NodeTimer): CallbackType {
+    const throttler = new Throttler(timer, waitInMs, callback);
+    return (...args: any[]) => throttler.invoke(...args);
+}
+
+export interface ITimer {
+    setTimeout: (callback: () => void, ms: number) => ReturnType<typeof setTimeout>;
+    clearTimeout: (timeoutId: ReturnType<typeof setTimeout>) => void;
+    dateNow(): number;
+}
+
+const NodeTimer: ITimer = {
+    setTimeout: (callback, ms) => setTimeout(callback, ms),
+    clearTimeout: (timeoutId) => clearTimeout(timeoutId),
+    dateNow: () => Date.now(),
+};
+
+interface IThrottler {
+    invoke: CallbackType;
+}
+
+class Throttler implements IThrottler {
+    private queuedToRun: ReturnType<typeof setTimeout>;
+    private previouslyRun: number;
+    constructor(
+        private readonly timer: ITimer,
+        private readonly waitInMs: number,
+        private readonly callback: CallbackType) {
+        if (!timer) { throw new Error('undefined timer'); }
+        if (!waitInMs) { throw new Error('no delay to throttle'); }
+        if (waitInMs < 0) { throw new Error('negative delay'); }
+        if (!callback) { throw new Error('undefined callback'); }
+    }
+    public invoke(...args: any[]): void {
+        const now = this.timer.dateNow();
+        if (this.queuedToRun) {
+            this.queuedToRun = this.timer.clearTimeout(this.queuedToRun) as undefined;
+        }
+        if (!this.previouslyRun || (now - this.previouslyRun >= this.waitInMs)) {
+            this.callback(...args);
+            this.previouslyRun = now;
+        } else {
+            const nextCall = () => this.invoke(...args);
+            const nextCallDelayInMs = this.waitInMs - (now - this.previouslyRun);
+            this.queuedToRun = this.timer.setTimeout(nextCall, nextCallDelayInMs);
+        }
+    }
+}
--- a/src/presentation/components/TheFooter/DownloadUrlList.vue
+++ b/src/presentation/components/TheFooter/DownloadUrlList.vue
--- a/src/presentation/components/TheFooter/DownloadUrlListItem.vue
+++ b/src/presentation/components/TheFooter/DownloadUrlListItem.vue
--- a/src/presentation/components/TheFooter/PrivacyPolicy.vue
+++ b/src/presentation/components/TheFooter/PrivacyPolicy.vue
--- a/src/presentation/components/TheFooter/TheFooter.vue
+++ b/src/presentation/components/TheFooter/TheFooter.vue
@@ -31,18 +31,13 @@
        </div>
        <div class="footer__section__item">
          <font-awesome-icon class="icon" :icon="['fas', 'user-secret']"  />
-          <a @click="$modal.show(modalName)">Privacy</a>
+          <a @click="$refs.privacyDialog.show()">Privacy</a>
        </div>
      </div>
    </div>
-    <modal :name="modalName" height="auto" :scrollable="true" :adaptive="true">
-      <div class="modal">
-        <PrivacyPolicy class="modal__content"/>
-        <div class="modal__close-button">
-          <font-awesome-icon :icon="['fas', 'times']"  @click="$modal.hide(modalName)"/>
-        </div>
-      </div>
-    </modal>
+    <Dialog ref="privacyDialog">
+        <PrivacyPolicy />
+    </Dialog>
  </div>
 </template>

@@ -50,17 +45,17 @@
 import { Component, Vue } from 'vue-property-decorator';
 import { Environment } from '@/application/Environment/Environment';
 import PrivacyPolicy from './PrivacyPolicy.vue';
+import Dialog from '@/presentation/components/Shared/Dialog.vue';
 import DownloadUrlList from './DownloadUrlList.vue';
 import { IApplication } from '@/domain/IApplication';
 import { ApplicationFactory } from '@/application/ApplicationFactory';

@Component({
  components: {
-    PrivacyPolicy, DownloadUrlList,
+    Dialog, PrivacyPolicy, DownloadUrlList,
  },
 })
 export default class TheFooter extends Vue {
-  public readonly modalName = 'privacy-policy';
  public readonly isDesktop = Environment.CurrentEnvironment.isDesktop;

  public version: string = '';
@@ -99,13 +94,13 @@ export default class TheFooter extends Vue {
 .footer {
  display: flex;
  justify-content: space-between;
-  @media (max-width: $big-screen-width) {  
+  @media screen and (max-width: $big-screen-width) {  
    flex-direction: column;
    align-items: center;
  }
  &__section {
    display: flex;
-    @media (max-width: $big-screen-width) {  
+    @media screen and (max-width: $big-screen-width) {  
      justify-content: space-around;
      width:100%;  
      &:not(:first-child) {
@@ -129,7 +124,7 @@ export default class TheFooter extends Vue {
        content: "|";
        padding: 0 5px;
      }
-      @media (max-width: $big-screen-width) {  
+      @media screen and (max-width: $big-screen-width) {  
        margin-top: 3px;
        &::before {
          content: "";
--- a/src/presentation/components/TheHeader.vue
+++ b/src/presentation/components/TheHeader.vue
--- a/src/presentation/components/TheSearchBar.vue
+++ b/src/presentation/components/TheSearchBar.vue
@@ -11,8 +11,8 @@

 <script lang="ts">
 import { Component, Watch } from 'vue-property-decorator';
-import { StatefulVue } from './StatefulVue';
-import { NonCollapsing } from '@/presentation/Scripts/Cards/NonCollapsingDirective';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
+import { NonCollapsing } from '@/presentation/components/Scripts/Cards/NonCollapsingDirective';
 import { IUserFilter } from '@/application/Context/State/Filter/IUserFilter';
 import { IFilterResult } from '@/application/Context/State/Filter/IFilterResult';
 import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
--- a/src/presentation/main.ts
+++ b/src/presentation/main.ts
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import App from './App.vue';
-import { ApplicationBootstrapper } from './presentation/Bootstrapping/ApplicationBootstrapper';
+import App from './components/App.vue';
+import { ApplicationBootstrapper } from './bootstrapping/ApplicationBootstrapper';

 new ApplicationBootstrapper()
    .bootstrap(Vue);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
undergroundwires	448e378dc4	increase performance by polyfilling ResizeObserver only if required	2021-03-25 13:24:19 +01:00
undergroundwires	ac2249f256	refactor features to use shared functions #41	2021-03-24 15:29:39 +01:00
undergroundwires	05932c5a36	fix safari cleanup scripts that are not working on modern versions	2021-03-23 19:06:20 +01:00
undergroundwires	6f46cdb4ed	refactor all modals to use same dialog component	2021-03-20 16:13:25 +01:00
undergroundwires	5f527a00cf	fix fs module hanging not allowing code to run Run button on Windows stopped working as CodeRunner was hanging when executing fs.promises.mkdir as described in electron/electron#20951 It started happening after electron update to v12 in `1f515e7`. This commit adds the workaround suggested in electron/electron#19554 that fixes the issue.	2021-03-14 17:26:56 +01:00
undergroundwires	1935db1019	fix throttle function not being able to run with argument(s)	2021-03-13 12:54:13 +01:00
undergroundwires	1f515e7be5	bump dependencies to latest - fix npm vulnerabilities #62 - change ResizeObserver polyfill dependency que-etc/resize-observer-polyfill#80 - bump typescript to 4.2.x and add tslib for importing helpers - update electron to v12.x and set contextIsolation to false (nklayman/vue-cli-plugin-electron-builder#1285, electron/electron#11608) to reach node APIs as it's now disabled by default (electron/electron#27949)	2021-03-11 14:50:35 +01:00
undergroundwires	1a5f92021f	fix a test where "it" is not used inside "describe"	2021-03-08 17:21:11 +01:00
undergroundwires	f3c7413f52	restructure presentation layer - Move most GUI related code to /presentation - Move components to /components (separate from bootstrap and style) - Move shared components helpers to /components/shared - Rename Bootstrapping to bootstrapping to enforce same naming convention in /presentation	2021-03-07 19:37:54 +01:00
undergroundwires	646db90585	refactor script compilation to make it easy to add new expressions #41 #53	2021-03-05 15:52:49 +01:00
undergroundwires-bot	1f8a0cf9ab	⬆️ bump everywhere to 0.10.0	2021-03-02 16:08:31 +00:00
undergroundwires	bd41af466f	update screenshot	2021-03-02 16:28:07 +01:00
undergroundwires	970221b996	remove "preview" disclaimer from macOS	2021-03-01 17:01:34 +01:00
undergroundwires	15004ff1f1	remove windows scripts for removing non-bloating system apps #55	2021-02-28 13:43:42 +01:00
undergroundwires	65226f3984	add better error messages to setting vscode settings	2021-02-27 14:40:14 +01:00
undergroundwires	b0a7d0b53b	add more macos scripts for privacy cleanup	2021-02-26 14:27:12 +01:00
undergroundwires	ee43fd92a0	more scripts to disable speech recognition and Cortana	2021-02-25 16:37:57 +01:00
undergroundwires	cf39e6d254	move code area to right on bigger screens	2021-02-22 16:46:06 +01:00
undergroundwires	1260eea690	escape printed characters to prevent command injection #45	2021-02-21 12:34:33 +01:00
undergroundwires	45a3669443	refactor disabling application experience and document better	2021-02-20 12:13:08 +01:00
undergroundwires	c9b91f6d8f	add script to automatically kill devicecensus process	2021-02-19 11:12:28 +01:00
undergroundwires	9a6b903b92	add option to run script directly in desktop app	2021-02-18 09:39:24 +01:00
undergroundwires	7661575573	allow functions to call other functions #53	2021-02-14 11:18:31 +01:00
undergroundwires-bot	f1abd7682f	⬆️ bump everywhere to 0.9.2	2021-02-13 11:08:41 +00:00