diff --git a/MAC/Navigator/config/progs.nav b/MAC/Navigator/config/progs.nav
new file mode 100644
index 0000000000000000000000000000000000000000..5196ae7e0b25f93ce092e23b15b70e09cff62afa
--- /dev/null
+++ b/MAC/Navigator/config/progs.nav
@@ -0,0 +1,15 @@
+version 1
+
+auth "" ""
+#Manager         | Start  | SecKill | Restart# | ResetMin | Options
+PVSS00pmon       | manual |      30 |        3 |        1 |
+PVSS00data       | always |      30 |        3 |        1 |
+PVSS00valarch    | always |      30 |        3 |        1 |-num 0
+PVSS00valarch    | manual |      30 |        3 |        1 |-num 1
+PVSS00valarch    | manual |      30 |        3 |        1 |-num 2
+PVSS00valarch    | manual |      30 |        3 |        1 |-num 3
+PVSS00valarch    | manual |      30 |        3 |        1 |-num 4
+PVSS00valarch    | manual |      30 |        3 |        1 |-num 5
+PVSS00event      | always |      30 |        3 |        1 |
+PVSS00ctrl       | always |      30 |        3 |        1 |-f pvss_scripts.lst
+PVSS00sim        | always |      30 |        3 |        1 |
diff --git a/MAC/Navigator/panels/nav_fw/tools/EnablePropertySets.pnl b/MAC/Navigator/panels/nav_fw/tools/EnablePropertySets.pnl
index ac088613d141173c6bc6ba6e2c9759ee79d5c1bf..14d930268e4b47bf07a76b288cd8daded4d78d1c 100644
--- a/MAC/Navigator/panels/nav_fw/tools/EnablePropertySets.pnl
+++ b/MAC/Navigator/panels/nav_fw/tools/EnablePropertySets.pnl
@@ -1,7 +1,7 @@
 V 10
 1
-LANG:1 8 (NoName)
-PANEL,28 141 554 344 N "_3DFace" 0
+LANG:1 11 Enable Tool
+PANEL,482 325 460 120 N "_3DFace" 0
 EEE E E 1 -1 -1 0  10 10
 "" 0 1
 EE 2
@@ -35,7 +35,7 @@ LANG:1 14 __enabled Tool
 2 8
 "Text2"
 ""
-1 19 62 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 170 75 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
  E E
 8 0 0 0 0 0
 EE E
@@ -44,18 +44,18 @@ EE E
 LANG:1 0 
 1
 "dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 21 64 117 80
-0 2 0 "s" 0 0 0 66 0 0  21 64
+E E 0 1 1 0 1 E U  0 E 172 77 228 93
+0 2 0 "s" 0 0 0 66 0 0  172 77
  1
 1
 LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
 0 ""
 1
-LANG:1 7 current
+LANG:1 8 Created:
 2 9
 "Text3"
 ""
-1 19 32 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 317 75 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
  E E
 9 0 0 0 0 0
 EE E
@@ -64,18 +64,18 @@ EE E
 LANG:1 0 
 1
 "dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 21 34 117 50
-0 2 0 "s" 0 0 0 66 0 0  21 34
+E E 0 1 1 0 1 E U  0 E 319 77 365 93
+0 2 0 "s" 0 0 0 66 0 0  319 77
  1
 1
 LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
 0 ""
 1
-LANG:1 5 Total
+LANG:1 10  of total:
 2 12
 "Text4"
 ""
-1 19 152 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 20 42 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
  E E
 11 0 0 0 0 0
 EE E
@@ -84,8 +84,8 @@ EE E
 LANG:1 0 
 1
 "dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 21 154 148 168
-0 2 0 "s" 0 0 0 66 0 0  21 154
+E E 0 1 1 0 1 E U  0 E 22 44 149 58
+0 2 0 "s" 0 0 0 66 0 0  22 44
  1
 1
 LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -95,7 +95,7 @@ LANG:1 19 Add enabled DP for:
 13 1
 "Button2"
 ""
-1 130 90 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+1 30 70 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
  E E
 2 0 0 0 0 0
 EE E
@@ -106,7 +106,7 @@ LANG:1 0
 1
 LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
 0 ""
-128 88 232 122
+28 68 132 102
 T 
 1
 LANG:1 12 query+create
@@ -157,7 +157,7 @@ LANG:1 12 query+create
 14 3
 "txt"
 ""
-1 150 150 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 151 40 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
  E E
 4 0 0 0 0 0
 EE E
@@ -168,7 +168,7 @@ LANG:1 0
 1
 LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
 0 ""
-148 148 442 175
+149 38 443 65
 3 "s" 0 0 0 0 0 0 
 E
 "main()
@@ -180,7 +180,7 @@ E
 14 7
 "txt_current"
 ""
-1 130 60 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 240 75 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
  E E
 7 0 0 0 0 0
 EE E
@@ -191,7 +191,7 @@ LANG:1 0
 1
 LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
 0 ""
-128 58 232 85
+238 73 312 100
 3 "s" 0 0 0 0 0 0 
 E
 E
@@ -199,7 +199,7 @@ E
 14 10
 "txt_total"
 ""
-1 130 30 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 370 75 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
  E E
 10 0 0 0 0 0
 EE E
@@ -210,7 +210,7 @@ LANG:1 0
 1
 LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
 0 ""
-128 28 232 55
+368 73 442 100
 3 "s" 0 0 0 0 0 0 
 E
 E
diff --git a/MAC/Navigator/panels/nav_fw/tools/EnableTool.pnl b/MAC/Navigator/panels/nav_fw/tools/EnableTool.pnl
index ac088613d141173c6bc6ba6e2c9759ee79d5c1bf..14d930268e4b47bf07a76b288cd8daded4d78d1c 100644
--- a/MAC/Navigator/panels/nav_fw/tools/EnableTool.pnl
+++ b/MAC/Navigator/panels/nav_fw/tools/EnableTool.pnl
@@ -1,7 +1,7 @@
 V 10
 1
-LANG:1 8 (NoName)
-PANEL,28 141 554 344 N "_3DFace" 0
+LANG:1 11 Enable Tool
+PANEL,482 325 460 120 N "_3DFace" 0
 EEE E E 1 -1 -1 0  10 10
 "" 0 1
 EE 2
@@ -35,7 +35,7 @@ LANG:1 14 __enabled Tool
 2 8
 "Text2"
 ""
-1 19 62 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 170 75 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
  E E
 8 0 0 0 0 0
 EE E
@@ -44,18 +44,18 @@ EE E
 LANG:1 0 
 1
 "dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 21 64 117 80
-0 2 0 "s" 0 0 0 66 0 0  21 64
+E E 0 1 1 0 1 E U  0 E 172 77 228 93
+0 2 0 "s" 0 0 0 66 0 0  172 77
  1
 1
 LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
 0 ""
 1
-LANG:1 7 current
+LANG:1 8 Created:
 2 9
 "Text3"
 ""
-1 19 32 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 317 75 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
  E E
 9 0 0 0 0 0
 EE E
@@ -64,18 +64,18 @@ EE E
 LANG:1 0 
 1
 "dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 21 34 117 50
-0 2 0 "s" 0 0 0 66 0 0  21 34
+E E 0 1 1 0 1 E U  0 E 319 77 365 93
+0 2 0 "s" 0 0 0 66 0 0  319 77
  1
 1
 LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
 0 ""
 1
-LANG:1 5 Total
+LANG:1 10  of total:
 2 12
 "Text4"
 ""
-1 19 152 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 20 42 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
  E E
 11 0 0 0 0 0
 EE E
@@ -84,8 +84,8 @@ EE E
 LANG:1 0 
 1
 "dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 21 154 148 168
-0 2 0 "s" 0 0 0 66 0 0  21 154
+E E 0 1 1 0 1 E U  0 E 22 44 149 58
+0 2 0 "s" 0 0 0 66 0 0  22 44
  1
 1
 LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -95,7 +95,7 @@ LANG:1 19 Add enabled DP for:
 13 1
 "Button2"
 ""
-1 130 90 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+1 30 70 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
  E E
 2 0 0 0 0 0
 EE E
@@ -106,7 +106,7 @@ LANG:1 0
 1
 LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
 0 ""
-128 88 232 122
+28 68 132 102
 T 
 1
 LANG:1 12 query+create
@@ -157,7 +157,7 @@ LANG:1 12 query+create
 14 3
 "txt"
 ""
-1 150 150 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 151 40 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
  E E
 4 0 0 0 0 0
 EE E
@@ -168,7 +168,7 @@ LANG:1 0
 1
 LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
 0 ""
-148 148 442 175
+149 38 443 65
 3 "s" 0 0 0 0 0 0 
 E
 "main()
@@ -180,7 +180,7 @@ E
 14 7
 "txt_current"
 ""
-1 130 60 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 240 75 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
  E E
 7 0 0 0 0 0
 EE E
@@ -191,7 +191,7 @@ LANG:1 0
 1
 LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
 0 ""
-128 58 232 85
+238 73 312 100
 3 "s" 0 0 0 0 0 0 
 E
 E
@@ -199,7 +199,7 @@ E
 14 10
 "txt_total"
 ""
-1 130 30 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 370 75 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
  E E
 10 0 0 0 0 0
 EE E
@@ -210,7 +210,7 @@ LANG:1 0
 1
 LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
 0 ""
-128 28 232 55
+368 73 442 100
 3 "s" 0 0 0 0 0 0 
 E
 E
diff --git a/MAC/Navigator/prepareNavigator b/MAC/Navigator/prepareNavigator
new file mode 100644
index 0000000000000000000000000000000000000000..7e94c514a751f80acb168a60ee9895fc5c51d28c
--- /dev/null
+++ b/MAC/Navigator/prepareNavigator
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+PVSStoolSyncTypes -system 1 CTU1 -project $1
+cp config/progs config/progs.orig
+cp config/progs.nav config/progs
+PVSS00pmon -proj $1 &
+echo -n "Importing Navigator specific DPT's and DP's..."
+PVSS00ascii -in dplist/nav_fw/XTU_Navigator_database.dpl -currentproj; echo "(done)"
+echo -n "Importing STSLCU specific DPT's..."
+PVSS00ascii -in dplist/nav_usr/STS/STSLCU_PIC_database_types.dpl -currentproj; echo "(done)"
+echo -n "Prepare project to enable use of GCF based MAC controllers..."
+PVSS00ctrl -script libs/nav_fw/gcfpa-prep.ctl -currentproj; echo "(done)"
+echo -n "Importing CaptureStats specific DPT's..."
+PVSS00ascii -in dplist/nav_usr/STS/PIC_CaptureStats.dpl -currentproj; echo "(done)"
+echo -n "Importing STSLCU specific DP's..."
+PVSS00ascii -in dplist/nav_usr/STS/STSLCU_PIC_database.dpl -currentproj; echo "(done)"
+PVSS00pmon -currentproj -stopWait
+
+echo "PVSS00NG         |   once |      30 |        3 |        1 |" >> config/progs
+echo "PVSS00NV         | always |      30 |        3 |        2 |-p vision/login.pnl -iconBar -menuBar" >> config/progs
+echo "PVSS00NV         | manual |      30 |        3 |        2 |-p nav_fw/EnableTool.pnl -iconBar -menuBar" >> config/progs
\ No newline at end of file
diff --git a/MAC/Navigator/readme.doc b/MAC/Navigator/readme.doc
index 92b485edcb3e5417fbabaa852a0ab9a567ef2823..9955961fa8f498ccb1c0262a9af1009e597d7048 100644
Binary files a/MAC/Navigator/readme.doc and b/MAC/Navigator/readme.doc differ