diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua
index 188e982..0998fae 100644
--- a/PHI-CL/data.lua
+++ b/PHI-CL/data.lua
@@ -3,7 +3,7 @@ local main = require 'main'
 local file_stage = 1
 
 if settings.startup['PHI-EN'].value and settings.startup['PHI-EN-SOLAR-TIER'].value and settings.startup['PHI-EN-POWER-TIER'].value and settings.startup['PHI-EN-POWER-TIER'].value then
-    local ml = math.max(settings.startup['PHI-EN-SOLAR-TIER'].value, settings.startup['PHI-EN-POWER-TIER'].value, settings.startup['PHI-EN-POWER-TIER'].value)
+    local ml = math.max(settings.startup['PHI-EN-SOLAR-TIER'].value, settings.startup['PHI-EN-POWER-TIER'].value)
 
     for i=1, 7 do
         local tn = 'compound-energy-' .. i
@@ -284,6 +284,12 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-ENERGY'].value
     table.insert(data.raw.technology['electric-energy-accumulators'].effects, {type='unlock-recipe', recipe='passive-energy-void'})
 end
 
+if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-EFFCY'].value then
+    data.raw['module']['efficiency-module'].effect = {consumption = {bonus = -0.5}, pollution = {bonus = -0.1}}
+    data.raw['module']['efficiency-module-2'].effect = {consumption = {bonus = -1.0}, pollution = {bonus = -0.15}}
+    data.raw['module']['efficiency-module-3'].effect = {consumption = {bonus = -1.5}, pollution = {bonus = -0.2}}
+end
+
 if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-BOILER'].value then
     local item = table.deepcopy(data.raw['item']['boiler'])
     item.name = 'electric-boiler'
@@ -596,6 +602,7 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-FLUID'].value t
                 main_product = v.name,
                 hide_from_player_crafting = true,
                 allow_productivity = false,
+                crafting_machine_tint = v.flow_color,
                 localised_name = v.localised_name,
                 localised_description = nil
             }})
diff --git a/PHI-CL/note.lua b/PHI-CL/note.lua
index 1c1c346..ba0080f 100644
--- a/PHI-CL/note.lua
+++ b/PHI-CL/note.lua
@@ -979,12 +979,6 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-REPAIR'].value
     end
 end
 
-if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-EFFCY'].value then
-    data.raw['module']['efficiency-module'].effect = {consumption = {bonus = -0.5}, pollution = {bonus = -0.1}}
-    data.raw['module']['efficiency-module-2'].effect = {consumption = {bonus = -1.0}, pollution = {bonus = -0.15}}
-    data.raw['module']['efficiency-module-3'].effect = {consumption = {bonus = -1.5}, pollution = {bonus = -0.2}}
-end
-
 if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value then
     local s = (1 + settings.startup['PHI-MI-PIPE'].value) / 2
 
@@ -1126,6 +1120,13 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TILE'].value th
 end
 
 ** SETTING
+{
+    type = 'bool-setting',
+    name = 'PHI-EQ',
+    setting_type = 'startup',
+    default_value = false,
+    order = 'D00'
+  }, 
 , {
     type = 'int-setting',
     name = 'PHI-EQ-SOLAR-TIER',
@@ -1224,13 +1225,6 @@ end
     default_value = true,
     order = 'E10'
   }, 
-  , {
-    type = 'bool-setting',
-    name = 'PHI-MI-EFFCY',
-    setting_type = 'startup',
-    default_value = false,
-    order = 'E02'
-  }, 
   
         "? aai-industry >= 0.5.0",
         "? Krastorio2 >= 1.3.0",
diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua
index 379d64f..d6e4c21 100644
--- a/PHI-CL/settings.lua
+++ b/PHI-CL/settings.lua
@@ -52,12 +52,6 @@ data:extend({
     default_value = 3,
     allowed_values = {1, 2, 3},
     order = 'C02'
-  }, {
-    type = 'bool-setting',
-    name = 'PHI-EQ',
-    setting_type = 'startup',
-    default_value = false,
-    order = 'D00'
   }, {
     type = 'bool-setting',
     name = 'PHI-MI',
@@ -72,6 +66,12 @@ data:extend({
     minimum_value = 1,
     maximum_value = 100,
     order = 'E01'
+  }, {
+    type = 'bool-setting',
+    name = 'PHI-MI-EFFCY',
+    setting_type = 'startup',
+    default_value = false,
+    order = 'E02'
   }, {
     type = 'bool-setting',
     name = 'PHI-MI-NUCLEAR',