diff --git a/pype/settings/defaults/system_settings/environments/avalon.json b/pype/settings/defaults/environments/avalon.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/avalon.json
rename to pype/settings/defaults/environments/avalon.json
diff --git a/pype/settings/defaults/system_settings/environments/blender.json b/pype/settings/defaults/environments/blender.json
similarity index 82%
rename from pype/settings/defaults/system_settings/environments/blender.json
rename to pype/settings/defaults/environments/blender.json
index 6f4f6a012d..00a4070b8e 100644
--- a/pype/settings/defaults/system_settings/environments/blender.json
+++ b/pype/settings/defaults/environments/blender.json
@@ -3,5 +3,6 @@
     "PYTHONPATH": [
         "{PYPE_SETUP_PATH}/repos/avalon-core/setup/blender",
         "{PYTHONPATH}"
-      ]
+    ],
+    "CREATE_NEW_CONSOLE": "yes"
 }
diff --git a/pype/settings/defaults/system_settings/environments/celaction.json b/pype/settings/defaults/environments/celaction.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/celaction.json
rename to pype/settings/defaults/environments/celaction.json
diff --git a/pype/settings/defaults/system_settings/environments/deadline.json b/pype/settings/defaults/environments/deadline.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/deadline.json
rename to pype/settings/defaults/environments/deadline.json
diff --git a/pype/settings/defaults/system_settings/environments/ftrack.json b/pype/settings/defaults/environments/ftrack.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/ftrack.json
rename to pype/settings/defaults/environments/ftrack.json
diff --git a/pype/settings/defaults/system_settings/environments/global.json b/pype/settings/defaults/environments/global.json
similarity index 91%
rename from pype/settings/defaults/system_settings/environments/global.json
rename to pype/settings/defaults/environments/global.json
index ef528e6857..ba467d2f5d 100644
--- a/pype/settings/defaults/system_settings/environments/global.json
+++ b/pype/settings/defaults/environments/global.json
@@ -6,9 +6,9 @@
     "PYPE_PROJECT_PLUGINS": "",
     "STUDIO_SOFT": "{PYP_SETUP_ROOT}/soft",
     "FFMPEG_PATH": {
-        "windows": "{VIRTUAL_ENV}/localized/ffmpeg_exec/windows/bin;{PYPE_SETUP_PATH}/vendor/ffmpeg_exec/windows/bin",
-        "darwin": "{VIRTUAL_ENV}/localized/ffmpeg_exec/darwin/bin:{PYPE_SETUP_PATH}/vendor/ffmpeg_exec/darwin/bin",
-        "linux": "{VIRTUAL_ENV}/localized/ffmpeg_exec/linux:{PYPE_SETUP_PATH}/vendor/ffmpeg_exec/linux"
+        "windows": "{VIRTUAL_ENV}/localized/ffmpeg_exec/windows/bin;{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/windows/bin",
+        "darwin": "{VIRTUAL_ENV}/localized/ffmpeg_exec/darwin/bin:{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/darwin/bin",
+        "linux": "{VIRTUAL_ENV}/localized/ffmpeg_exec/linux:{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/linux"
     },
     "DJV_PATH": {
         "windows": [
diff --git a/pype/settings/defaults/system_settings/environments/harmony.json b/pype/settings/defaults/environments/harmony.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/harmony.json
rename to pype/settings/defaults/environments/harmony.json
diff --git a/pype/settings/defaults/system_settings/environments/houdini.json b/pype/settings/defaults/environments/houdini.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/houdini.json
rename to pype/settings/defaults/environments/houdini.json
diff --git a/pype/settings/defaults/system_settings/environments/maya.json b/pype/settings/defaults/environments/maya.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/maya.json
rename to pype/settings/defaults/environments/maya.json
diff --git a/pype/settings/defaults/system_settings/environments/maya_2018.json b/pype/settings/defaults/environments/maya_2018.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/maya_2018.json
rename to pype/settings/defaults/environments/maya_2018.json
diff --git a/pype/settings/defaults/system_settings/environments/maya_2020.json b/pype/settings/defaults/environments/maya_2020.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/maya_2020.json
rename to pype/settings/defaults/environments/maya_2020.json
diff --git a/pype/settings/defaults/system_settings/environments/mayabatch.json b/pype/settings/defaults/environments/mayabatch.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/mayabatch.json
rename to pype/settings/defaults/environments/mayabatch.json
diff --git a/pype/settings/defaults/system_settings/environments/mayabatch_2019.json b/pype/settings/defaults/environments/mayabatch_2019.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/mayabatch_2019.json
rename to pype/settings/defaults/environments/mayabatch_2019.json
diff --git a/pype/settings/defaults/system_settings/environments/mtoa_3.1.1.json b/pype/settings/defaults/environments/mtoa_3.1.1.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/mtoa_3.1.1.json
rename to pype/settings/defaults/environments/mtoa_3.1.1.json
diff --git a/pype/settings/defaults/system_settings/environments/muster.json b/pype/settings/defaults/environments/muster.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/muster.json
rename to pype/settings/defaults/environments/muster.json
diff --git a/pype/settings/defaults/system_settings/environments/nuke.json b/pype/settings/defaults/environments/nuke.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/nuke.json
rename to pype/settings/defaults/environments/nuke.json
diff --git a/pype/settings/defaults/system_settings/environments/nukestudio.json b/pype/settings/defaults/environments/nukestudio.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/nukestudio.json
rename to pype/settings/defaults/environments/nukestudio.json
diff --git a/pype/settings/defaults/system_settings/environments/nukestudio_10.0.json b/pype/settings/defaults/environments/nukestudio_10.0.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/nukestudio_10.0.json
rename to pype/settings/defaults/environments/nukestudio_10.0.json
diff --git a/pype/settings/defaults/system_settings/environments/nukex.json b/pype/settings/defaults/environments/nukex.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/nukex.json
rename to pype/settings/defaults/environments/nukex.json
diff --git a/pype/settings/defaults/system_settings/environments/nukex_10.0.json b/pype/settings/defaults/environments/nukex_10.0.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/nukex_10.0.json
rename to pype/settings/defaults/environments/nukex_10.0.json
diff --git a/pype/settings/defaults/environments/photoshop.json b/pype/settings/defaults/environments/photoshop.json
new file mode 100644
index 0000000000..d39634ce20
--- /dev/null
+++ b/pype/settings/defaults/environments/photoshop.json
@@ -0,0 +1,7 @@
+{
+  "AVALON_PHOTOSHOP_WORKFILES_ON_LAUNCH": "1",
+  "PYTHONPATH": "{PYTHONPATH}",
+  "PYPE_LOG_NO_COLORS": "Yes",
+  "WEBSOCKET_URL": "ws://localhost:8099/ws/",
+  "WORKFILES_SAVE_AS": "Yes"
+}
diff --git a/pype/settings/defaults/system_settings/environments/premiere.json b/pype/settings/defaults/environments/premiere.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/premiere.json
rename to pype/settings/defaults/environments/premiere.json
diff --git a/pype/settings/defaults/system_settings/environments/resolve.json b/pype/settings/defaults/environments/resolve.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/resolve.json
rename to pype/settings/defaults/environments/resolve.json
diff --git a/pype/settings/defaults/system_settings/environments/storyboardpro.json b/pype/settings/defaults/environments/storyboardpro.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/storyboardpro.json
rename to pype/settings/defaults/environments/storyboardpro.json
diff --git a/pype/settings/defaults/system_settings/environments/unreal_4.24.json b/pype/settings/defaults/environments/unreal_4.24.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/unreal_4.24.json
rename to pype/settings/defaults/environments/unreal_4.24.json
diff --git a/pype/settings/defaults/system_settings/environments/vray_4300.json b/pype/settings/defaults/environments/vray_4300.json
similarity index 100%
rename from pype/settings/defaults/system_settings/environments/vray_4300.json
rename to pype/settings/defaults/environments/vray_4300.json
diff --git a/pype/settings/defaults/system_settings/environments/photoshop.json b/pype/settings/defaults/system_settings/environments/photoshop.json
deleted file mode 100644
index 2208a88665..0000000000
--- a/pype/settings/defaults/system_settings/environments/photoshop.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "AVALON_PHOTOSHOP_WORKFILES_ON_LAUNCH": "1",
-  "PYTHONPATH": "{PYTHONPATH}"
-}