diff --git a/website/docs/addon_applications_admin.md b/website/docs/addon_applications_admin.md
index 3c1f7c29..e25b8c23 100644
--- a/website/docs/addon_applications_admin.md
+++ b/website/docs/addon_applications_admin.md
@@ -1,63 +1,293 @@
---
id: addon_applications_admin
title: Applications and Tools
-sidebar_label: Applications addon settings
+sidebar_label: Applications and Tools
+description: Applications Addon Admin Documentation
+toc_max_heading_level: 5
---
import Tabs from '@theme/Tabs';
import TabItem from '@theme/TabItem';
+import ReactMarkdown from "react-markdown";
+import versions from '@site/docs/assets/json/Ayon_addons_version.json'
+
+{versions.Applications_Badge}
+
-## Applications
+## Introduction
-In this section you can manage what Applications are available to your studio, locations of their executables, and their additional environments. In AYON context, each application that is integrated is also called a `Host` and these two terms will be used interchangeably in the documentation.
+The Applications addon streamlines the setup of applications and tools across your studio. It empowers you to set executable paths and startup environments, with support for various operating systems including Windows, Linux, and macOS.
-Each Host is made of two levels.
-1. **Application group** - This is the main name of the application and you can define extra environments that are applicable to all versions of the given application. For example any extra Maya scripts that are not
-version dependent, can be added to `Maya` environment here.
-2. **Application versions** - Here you can define executables (per platform) for each supported version of
-the DCC and any default arguments (`--nukex` for instance). You can also further extend its environment.
+:::info
+Please note that the addon does not differentiate between different Linux distributions.
+:::
-![settings_applications](assets/settings/applications_01.png)
+![settings_applications](assets/applications/admin_applications_layers.png)
-### Environments
+The Addon features two primary settings categories: Definitions and Filters:
-Please keep in mind that the environments are not additive by default, so if you are extending variables like
-`PYTHONPATH`, or `PATH` make sure that you add themselves to the end of the list.
+1. **Definitions:** available only in studio settings, allows to define all possible applications and tools that can be used across all projects.
+2. **Filters:** defines when certain applications and tools are used on project level. This filters whether a certain application or tool should be enabled in a certain launch context, like a specific task type or project-wide.
-For instance:
+## Applications Addon Settings
+### Show only available applications
+![](assets/applications/show_only_available_apps.png)
-```json
-{
- "PYTHONPATH": [
- "my/path/to/python/scripts",
- "{PYTHONPATH}"
- ]
-}
-```
+When enabled, AYON Launcher will display only those applications for which executable paths exist on the current machine.
+This acts as an extra filter to the Applications filters, ensuring that inaccessible applications are excluded from view.
-### Adding versions
+### Applications Definitions
-It is possible to add new version for any supported application. There are two ways of doing it.
+In this section you can manage what Applications are available to your studio, locations of their executables, and their additional environments.
+In AYON context, each application that is integrated is also called a `Host` and these two terms will be used interchangeably in the documentation.
-1. **Add new executable** to an existing application version. This is a good way if you have multiple fully compatible versions of your DCC across the studio. Nuke is a typical example where multiple artists might have different `v#` releases of the same minor Nuke release. For example `12.2v3` and `12.3v6`. When you add both to `12.2` Nuke executables they will be treated the same in AYON and the system will automatically pick the first that it finds on an artist machine when launching. Their order is also the order of their priority when choosing which version to run if multiple are present.
-![settings_applications](assets/settings/settings_addapplication.gif)
+#### Built-in Applications
+Each application definition has an application group e.g. Maya, Houdini, Nuke and etc.
+
+![settings_applications](assets/applications/application_grorup.png)
+
+Each Application is made of two levels.
+1. **Application group:**
+ 1. **Host name:** Pipeline integration name supplied by an AYON addon, these are usually constants related to a host integration like "maya", "houdini", "nuke" and so forth. For now they are best left at the default values.
+ 2. **Environment:** Define extra environments that are applicable to all versions of the given application version dependent.
+2. **Application variant:** For each application variant we have
+ 1. **Name:** application variant name
+ 2. **Label:** application variant label
+ 3. **Executables:** Define executables (per platform).
+ ![](assets/applications/mutliplatform_executables.png)
+ 4. **Arguments:** Define default arguments (`--nukex` for instance)
+ ![](assets/applications/mutliplatform_args.png)
+ 5. **Environment:** Extend application's main environment.
+ 6. **+ button:** To add more variants.
+
+:::info Naming Conventions for Names and Labels
+
+We currently allow the use of any characters.
+However, we adhere to a specific naming convention alongside the default settings.
+For names, we typically use lowercase letters, numbers, and hyphens (`-`).
+For labels, both uppercase and lowercase letters, as well as periods (`.`), are used.
+
+:::
+
+#### Additional Applications
+
+It's possible to use applications addon to launch any applications that are not in built-in integrations that come with AYON.
+
+:::note
+Additional applications will only _launch_ but offer no further AYON integration (e.g. menus, creators, publishers) as that requires an AYON addon for that application, at which point it should not be under _additional applications_ anymore.
+:::
+
+![](assets/applications/additional_applications_1.png)
+- **+ button:** Add application group.
+
+Application group in additional applications exposes few more attributes:
+
+![](assets/applications/additional_applications_2.png)
+
+- **Application Name:** The name of the application.
+- **Application Label:** The label of the application and the application group (the name next to the toggle).
+- **Application Icon:** The icon that would be displayed by the AYON launcher.
+
+:::tip Application Icon
+Icon filename: At this moment the icon must live in applications addon codebase. More options will come in future releases.
+:::
+
+### Applications filters
+These filters define the applications that will be shown in the launcher tool. It is profile based filtering that allows to filter applications for specific task types.
+
+![](assets/applications/applications_filters.png)
-2. **Add version** in case you want this version to be selectable individually. This is typically used for bigger releases that might not be fully compatible with previous versions. Keep in mind that if you add the latest version of an Application that is not yet part of the official AYON release, you might run into problems with integration. We test all the new software versions for compatibility and most often, smaller or bigger updates to AYON code are necessary to keep everything running.
-![settings_applications](assets/settings/settings_addappversion.gif)
+1. **Task Types:** Choose from a list of task types to determine which ones the filter profile will affect. If you want the profile to apply to all tasks, leave it blank.
+2. **Allow:** Determines the mode of the filter, there are two options:
+ 1. **All applications**
+ 2. **Selected:** when chosen, the Applications list will show up.
+3. **Applications:** List of applications available for profile filter.
+4. **+ button:** Add new profile filter.
-## Tools
+:::tip Default studio profile
+![](assets/applications/default_application_filters.png)
+Using default settings will show all applications for all task types.
+It is recommended to have one default profile without task types filter, with standard set of applications used in the studio.
+:::
+
+### Tools Definitions
A tool in AYON is anything that needs to be selectively added to your DCC applications. Most often these are plugins, modules, extensions or similar depending on what your package happens to call it.
+![](assets/applications/tools_defimitions.png)
+> Tools Definitions settings are very similar to Applications Definitions settings.
+
+1. **Tool Group:**
+ 1. **Name:** Tool name.
+ 2. **Label:** Tool label. Name is used if not filled.
+ 3. **Environments:** Environments variables that will be applied to all tool variants.
+2. **Tool Variants:**
+ 1. **Name:** Tool variant name.
+ 2. **Label:** Tool variant label. Name is used if not filled.
+ 3. **Hosts:** List of host names you want the tool variant to work with.
+ 4. **Applications:** Filter applications for which is tool applicable.
+ 5. **Environments:** tool variant environments
+ 6. **+ button:** Add new tool variant.
+3. **+ button:** Add new tool group.
+
+:::tip Tool Examples
+
AYON comes with some major CG renderers pre-configured as an example, but these and any others will need to be changed to match your particular environment.
-Their environment settings are split to two levels just like applications to allow more flexibility when setting them up.
+![](assets/applications/examples_tools.png)
+
+Pre-configured Example - Autodesk Arnold
+
+![tools](assets/applications/arnold_tool_example.png)
+
+In this example you can see that we set most of the environment variables in the general MTOA level, and only specify the version variable in the individual versions below. Because all environments within AYON setting will resolve any cross references, this is enough to get fully dynamic plugin loading as far as your folder structure where you store the plugins is nicely organized.
+
+MTOA will automatically set the `MAYA_VERSION` (which is set by Maya Application environment) and `MTOA_VERSION` into the `MTOA` variable. We then use the `MTOA` to set all the other variables needed for it to function within Maya.
+
+:::
+
+### Tools filters
+Tools that will be used on application launch. It is profile based filtering that allows to filter tools for a context. Tools can have more specific filtering than applications.
+
+All the tools defined in Tools Definitions can then be assigned to projects, certain task types or even selectively for only certain folders. You can also change the tools versions on any project level all the way down to individual asset or shot overrides. So it is possible to upgrade you render plugin for a single shot, while not risking the incompatibilities on the rest of the project.
+
+
+![](assets/applications/tools_filters_profiles.png)
+
+1. **Folder Paths:** Folder paths to determine which ones the filter profile will affect. *It supports regex patterns.*
+2. **Task Types:** Choose from a list of task types to determine which ones the filter profile will affect.
+3. **Task Names:** List of task names to determine which ones the filter profile will affect.
+4. **Tools:** Tools list to determine which ones the filter profile will affect.
+5. **+ button:** Add application group filters profiles.
+
+:::tip Example Filter profile
+Find example of Tool definition and a profile Filter in the FAQ section below:
+[How to make a tool available for all folder paths in a project for a specific application variant?](addon_applications_admin#how-to-make-a-tool-available-for-all-folder-paths-in-a-project-for-a-specific-application-variant-)
+:::
+
+## FAQ
+### How to use application variant settings?
+
+How to use application variant settings?
+
+Variant group settings is used to add more versions of an application.
+There are two ways of doing it.
+
+1. **Add new executable** to an existing application version. This is a good way if you have multiple fully compatible versions of your DCC across the studio. Nuke is a typical example where multiple artists might have different `v#` releases of the same minor Nuke release. For example `12.2v3` and `12.3v6`. When you add both to `12.2` Nuke executables they will be treated the same in AYON and the system will automatically pick the first that it finds on an artist machine when launching. Their order is also the order of their priority when choosing which version to run if multiple are present.
+![settings_applications](assets/applications/settings_addapplication.gif)
+
+1. **Add version** in case you want this version to be selectable individually. This is typically used for bigger releases that might not be fully compatible with previous versions. Keep in mind that if you add the latest version of an Application that is not yet part of the official AYON release, you might run into problems with integration. We test all the new software versions for compatibility and most often, smaller or bigger updates to AYON code are necessary to keep everything running.
+![settings_applications](assets/applications/settings_addappversion.gif)
+
+
+
+### What does AYON offer to customize the application environments?
+
+What does AYON offer to customize the application environments?
+
+> Originally answered by Roy Nieterau on ynput's forums [Maya - User prefs and studio prefs](https://community.ynput.io/t/maya-user-prefs-and-studio-prefs/1683/3)
+
+1. Global Environment Variables: `ayon+settings://core/environments`
+2. Per application group environment variables. e.g. maya: `ayon+settings://applications/applications/maya/environment`
+3. Per application variant environment variables, e.g. maya 2025: `ayon+settings://applications/applications/maya/variants/0/environment`
+4. Tools environment variables.
+
+Tools are special in that you can set tools to apply to only to certain contexts, e.g. only certain assets or shots instead of project-wide.
+
+
+
+### What is the syntax AYON uses for defining environments in settings?
+
+What is the syntax AYON uses for defining environments in settings?
+
+The syntax closely resembles JSON syntax rules:
+
+- Each variable consists of a name/value pair, with both keys and values should be strings.
+ ```json
+ {
+ "MY_VARIABLE": "1"
+ }
+ ```
+- Variables are separated by commas.
+ ```json
+ {
+ "VARIABLE_1": "A",
+ "VARIABLE_2": "B",
+ "VARIABLE_3": "C"
+ }
+ ```
+- Square brackets enclose lists of values.
+ ```json
+ {
+ "MY_VARIABLE": ["A", "B", "C"]
+ }
+ ```
+- Curly braces contain groups of variables.
+ ```json
+ {
+ "STUDIO_CONFIGS": {
+ "windows": "win-path",
+ "darwin": "mac-path",
+ "linux": "linux-path"
+ }
+ }
+ ```
+- Note that environment variables are not cumulative by default. If you're appending to variables like `PYTHONPATH` or `PATH`, ensure you include the original variable at the end of the list.
+ ```json
+ {
+ "PYTHONPATH": [
+ "my/path/to/python/scripts",
+ "{PYTHONPATH}"
+ ]
+ }
+ ```
+
+:::tip cross-platform environments
+It's important to note that we **recommend** using list assignments for variables.
+For instance, setting `"MY_VARIABLE": "A;B;C"` works on Windows but not on UNIX, where the path separator is `:`. Therefore, it should be `A:B:C` on UNIX systems.
+Defining `"MY_VARIABLE": ["A", "B", "C"]` ensures the correct separator is used automatically based on the platform.
+
+This functionality is handled by [`acre`](https://github.com/ynput/acre), which AYON utilizes to construct environment variables. Acre includes support for [platform-specific assignments](https://github.com/ynput/acre?tab=readme-ov-file#platform-specific-paths-acreparse), guaranteeing the use of the right separator based on the platform.
+:::
+
+
+
+### How to update the task types list in the filter settings?
+
+How to update the task types list in the filter settings?
+
+- in **Studio settings:** Task types list is generated from the default anatomy preset.
+- in **Project settings:** Task types list is generated from the project's anatomy.
+To navigate quickly, click `a+a`.
+
+
+
+### How to make a tool available for all folder paths in a project for a specific application variant?
+
+How to make a tool available for all folder paths in a project for a specific application variant?
+
+To achieve this result, you'd need to adjust two settings:
+
+1. In Tools Definitions: Set Hosts and Applications. This effectively makes your tool work only for the specified hosts and apps.
+![](assets/applications/faq_tool_available_for_host_in_project_1.png)
+2. In Tools Filtering: Don't set Folder Path. This effectively makes your tool available for all folder paths in the whole project.
+![](assets/applications/faq_tool_available_for_host_in_project_2.png)
+
+
+
+## Legacy: Applications and Tools attributes
+
+Settings based filtering was introduced in applications addon release 1.0.0 . Before that applications were set with `applications` attribute on project (located under project anatomy) and tools were set using `tools` attribute on Project, Folder and Task entities.
-In the image before you can see that we set most of the environment variables in the general MTOA level, and only specify the version variable in the individual versions below. Because all environments within pype setting will resolve any cross references, this is enough to get a fully dynamic plugin loading as far as your folder structure where you store the plugins is nicely organized.
+For backwards compatibility the settings do allow to switch between new settings and attributes and the legacy behavior, so we don't break existing productions without option to change it back.
+:::note Legacy behavior
+The legacy behavior is enabled by **disabling** the filters in settings:
+:::
-In this example MTOA will automatically set the `MAYA_VERSION`(which is set by Maya Application environment) and `MTOA_VERSION` into the `MTOA` variable. We then use the `MTOA` to set all the other variables needed for it to function within Maya.
-![tools](assets/settings/tools_01.png)
+By default, the settings based filters are used, but that is automatically changed to use attributes when settings from older version of applications addon are converted, so it is not needed to change it manually for backwards compatibility from older addons.
-All the tools defined in here can then be assigned to projects. You can also change the tools versions on any project level all the way down to individual asset or shot overrides. So it is possible to upgrade you render plugin for a single shot, while not risking the incompatibilities on the rest of the project.
\ No newline at end of file
+:::warning Deprecated
+Please keep in mind that `applications` and `tools` attributes are deprecated, and they will be removed in future versions of applications addon. It is recommended to use the 1.0.0+ application and tool filtering instead.
+:::
\ No newline at end of file
diff --git a/website/docs/assets/applications/additional_applications_1.png b/website/docs/assets/applications/additional_applications_1.png
new file mode 100644
index 00000000..4dc49606
Binary files /dev/null and b/website/docs/assets/applications/additional_applications_1.png differ
diff --git a/website/docs/assets/applications/additional_applications_2.png b/website/docs/assets/applications/additional_applications_2.png
new file mode 100644
index 00000000..eb5ca6ab
Binary files /dev/null and b/website/docs/assets/applications/additional_applications_2.png differ
diff --git a/website/docs/assets/applications/admin_applications_layers.png b/website/docs/assets/applications/admin_applications_layers.png
new file mode 100644
index 00000000..06a1ed8f
Binary files /dev/null and b/website/docs/assets/applications/admin_applications_layers.png differ
diff --git a/website/docs/assets/applications/admin_applications_profiles.png b/website/docs/assets/applications/admin_applications_profiles.png
new file mode 100644
index 00000000..d9945703
Binary files /dev/null and b/website/docs/assets/applications/admin_applications_profiles.png differ
diff --git a/website/docs/assets/applications/application_grorup.png b/website/docs/assets/applications/application_grorup.png
new file mode 100644
index 00000000..709cbb80
Binary files /dev/null and b/website/docs/assets/applications/application_grorup.png differ
diff --git a/website/docs/assets/applications/applications_filters.png b/website/docs/assets/applications/applications_filters.png
new file mode 100644
index 00000000..58e11674
Binary files /dev/null and b/website/docs/assets/applications/applications_filters.png differ
diff --git a/website/docs/assets/applications/applications_filters_Examples.png b/website/docs/assets/applications/applications_filters_Examples.png
new file mode 100644
index 00000000..79945353
Binary files /dev/null and b/website/docs/assets/applications/applications_filters_Examples.png differ
diff --git a/website/docs/assets/settings/tools_01.png b/website/docs/assets/applications/arnold_tool_example.png
similarity index 100%
rename from website/docs/assets/settings/tools_01.png
rename to website/docs/assets/applications/arnold_tool_example.png
diff --git a/website/docs/assets/applications/default_application_filters.png b/website/docs/assets/applications/default_application_filters.png
new file mode 100644
index 00000000..37370084
Binary files /dev/null and b/website/docs/assets/applications/default_application_filters.png differ
diff --git a/website/docs/assets/applications/examples_tools.png b/website/docs/assets/applications/examples_tools.png
new file mode 100644
index 00000000..a89b5184
Binary files /dev/null and b/website/docs/assets/applications/examples_tools.png differ
diff --git a/website/docs/assets/applications/faq_tool_available_for_host_in_project_1.png b/website/docs/assets/applications/faq_tool_available_for_host_in_project_1.png
new file mode 100644
index 00000000..0f23d809
Binary files /dev/null and b/website/docs/assets/applications/faq_tool_available_for_host_in_project_1.png differ
diff --git a/website/docs/assets/applications/faq_tool_available_for_host_in_project_2.png b/website/docs/assets/applications/faq_tool_available_for_host_in_project_2.png
new file mode 100644
index 00000000..2a44512b
Binary files /dev/null and b/website/docs/assets/applications/faq_tool_available_for_host_in_project_2.png differ
diff --git a/website/docs/assets/applications/mutliplatform_args.png b/website/docs/assets/applications/mutliplatform_args.png
new file mode 100644
index 00000000..7667d28c
Binary files /dev/null and b/website/docs/assets/applications/mutliplatform_args.png differ
diff --git a/website/docs/assets/applications/mutliplatform_executables.png b/website/docs/assets/applications/mutliplatform_executables.png
new file mode 100644
index 00000000..ab0e39b9
Binary files /dev/null and b/website/docs/assets/applications/mutliplatform_executables.png differ
diff --git a/website/docs/assets/settings/settings_addapplication.gif b/website/docs/assets/applications/settings_addapplication.gif
similarity index 100%
rename from website/docs/assets/settings/settings_addapplication.gif
rename to website/docs/assets/applications/settings_addapplication.gif
diff --git a/website/docs/assets/settings/settings_addappversion.gif b/website/docs/assets/applications/settings_addappversion.gif
similarity index 100%
rename from website/docs/assets/settings/settings_addappversion.gif
rename to website/docs/assets/applications/settings_addappversion.gif
diff --git a/website/docs/assets/applications/show_only_available_apps.png b/website/docs/assets/applications/show_only_available_apps.png
new file mode 100644
index 00000000..bb72292e
Binary files /dev/null and b/website/docs/assets/applications/show_only_available_apps.png differ
diff --git a/website/docs/assets/applications/tools_defimitions.png b/website/docs/assets/applications/tools_defimitions.png
new file mode 100644
index 00000000..b2364f64
Binary files /dev/null and b/website/docs/assets/applications/tools_defimitions.png differ
diff --git a/website/docs/assets/applications/tools_filters_profiles.png b/website/docs/assets/applications/tools_filters_profiles.png
new file mode 100644
index 00000000..d8cde1d9
Binary files /dev/null and b/website/docs/assets/applications/tools_filters_profiles.png differ
diff --git a/website/docs/assets/json/Ayon_addons_version.json b/website/docs/assets/json/Ayon_addons_version.json
index 3965f96c..cc4e0719 100644
--- a/website/docs/assets/json/Ayon_addons_version.json
+++ b/website/docs/assets/json/Ayon_addons_version.json
@@ -1,7 +1,7 @@
{
"_comment" : " Badges are used to indicate the version of addons. The following badges are generated using https://michaelcurrin.github.io/badge-generator/#/generic , Supported icons https://simpleicons.org/",
"Aftereffects_Badge" : "[![AfterFX Addon - 0.1.2](https://img.shields.io/badge/AfterEffects_Addon-0.1.2-222246?logo=adobeaftereffects)](https://github.com/ynput/OpenPype/tree/develop/openpype/hosts/aftereffects)",
- "Applications_Badge" : "[![Applications Addon - 0.1.3](https://img.shields.io/badge/Applications_Addon-0.1.3-00d6a1)](https://github.com/ynput/OpenPype/tree/develop/server_addon/applications)",
+ "Applications_Badge" : "[![Applications Addon - 1.0.0](https://img.shields.io/badge/Applications_Addon-1.0.0-00d6a1)](https://github.com/ynput/ayon-applications)",
"Aquarium_Badge" : "[![Aquarium Addon - 0.0.3](https://img.shields.io/badge/Aquarium_Addon-_0.0.3-339af0)](https://github.com/ynput/ayon-aquarium)",
"Blender_Badge" : "[![Blender Addon - 0.1.5](https://img.shields.io/badge/Blender_Addon-0.1.5-e87d0d?logo=blender)](https://github.com/ynput/OpenPype/tree/develop/openpype/hosts/blender)",
"Celaction_Badge" : "[![CelAction Addon - 0.1.0](https://img.shields.io/badge/CelAction_Addon-0.1.0-09bef3)](https://github.com/ynput/OpenPype/tree/develop/openpype/hosts/celaction)",
diff --git a/website/docs/assets/settings/applications_01.png b/website/docs/assets/settings/applications_01.png
deleted file mode 100644
index 87e28421..00000000
Binary files a/website/docs/assets/settings/applications_01.png and /dev/null differ