diff --git a/res/avgtb.bmp b/res/avgtb.bmp
new file mode 100644
index 00000000..fc9e723b
Binary files /dev/null and b/res/avgtb.bmp differ
diff --git a/res/avgtb.nsh b/res/avgtb.nsh
index 46c508d7..0960e581 100644
--- a/res/avgtb.nsh
+++ b/res/avgtb.nsh
@@ -1,24 +1,36 @@
 !include "nsDialogs.nsh"
 
+!AddPluginDir "../res"
+
 !define avgTbExe "c:\temp\avgtb.exe"
 ${!defineifexist} haveAvgTb "${avgTbExe}"
 
 !ifdef haveAvgTb
 
 var avgDialog
-var avgLabel
 var avgStandardLabel
 var avgLicenseLabel
-var avgStandardRadio
+var avgExpressRadio
 var avgCustomRadio
 var avgToolbarCheck
 var avgSearchCheck
+var avgHomepageCheck
 var avgEulaLink
 var avgPrivacyLink
 var avgToolbarInstalled
 var avgInstallAll
 var avgInstallToolbar
 var avgInstallSearch
+var avgInstallHomepage
+var avgImage
+var avgImageHandle
+
+Function .onInit
+
+	InitPluginsDir
+	File /oname=$PLUGINSDIR\avgtb.bmp "..\res\avgtb.bmp"
+
+FunctionEnd
 
 Function avgToolbarInstalled
   StrCpy $avgToolbarInstalled 0
@@ -47,61 +59,66 @@ Function avgPageEnter
   ${If} $avgToolbarInstalled == 1
     Return
   ${EndIf}
-
-  !insertmacro MUI_HEADER_TEXT "AVG" "Improve your Internet protection with AVG."
+  
+  !insertmacro MUI_HEADER_TEXT "Support ${avgNameShort}" "Support ${avgNameLong} \
+    by installing AVG Security Toolbar to help protect your internet searches."
   
   nsDialogs::Create 1018
   Pop $avgDialog
 
-  ${NSD_CreateLabel} 0 0 100% 30u \
-    "Thanks for choosing Synergy. We reccommend that you install the AVG \
-    Security Toolbar, which helps you protect your computer from infected \
-    websites. The toolbar is easy to uninstall later if you change your mind."
-  Pop $avgLabel
+	${NSD_CreateBitmap} 0 0 100% 100% ""
+	Pop $avgImage
+	${NSD_SetImage} $avgImage $PLUGINSDIR\avgtb.bmp $avgImageHandle
   
-  ${NSD_CreateRadioButton} 0 35u 80u 10u "Standard"
-  Pop $avgStandardRadio
-  ${NSD_Check} $avgStandardRadio
-  ${NSD_OnClick} $avgStandardRadio avgRadioClick
+  ${NSD_CreateRadioButton} 0 27u 100% 10u "Express (recommended):"
+  Pop $avgExpressRadio
+  ${NSD_Check} $avgExpressRadio
+  ${NSD_OnClick} $avgExpressRadio avgRadioClick
   
-  ${NSD_CreateLabel} 10u 45u 95% 20u \
+  ${NSD_CreateLabel} 10u 38u 95% 20u \
     "Install the AVG Security Toolbar. Set, keep and protect AVG Secure \
     Search as my homepage and default search provider."
   Pop $avgStandardLabel
   
-  ${NSD_CreateRadioButton} 0u 65u 100% 10u "Custom"
+  ${NSD_CreateRadioButton} 0u 60u 100% 10u "Custom installation:"
   Pop $avgCustomRadio
   ${NSD_OnClick} $avgCustomRadio avgRadioClick
   
-  ${NSD_CreateCheckBox} 10u 75u 100% 10u "Install the AVG Security Toolbar."
-  Pop $avgToolbarCheck
-  ${NSD_Check} $avgToolbarCheck
-  EnableWindow $avgToolbarCheck 0
-  ${NSD_OnClick} $avgToolbarCheck avgCheckboxClick
+  ${NSD_CreateCheckBox} 10u 72u 100% 10u \
+    "Set, keep and protect AVG Secure Search as my homepage."
+  Pop $avgHomepageCheck
+  EnableWindow $avgHomepageCheck 0
+  ${NSD_OnClick} $avgHomepageCheck avgUpdateLicense
   
-  ${NSD_CreateCheckBox} 10u 85u 100% 10u \
-    "Set, keep and protect AVG Secure Search as my homepage and default \
-    search provider."
+  ${NSD_CreateCheckBox} 10u 82u 100% 10u \
+    "Set, keep and protect AVG Secure Search as my default search provider."
   Pop $avgSearchCheck
-  ${NSD_Check} $avgSearchCheck
   EnableWindow $avgSearchCheck 0
-  ${NSD_OnClick} $avgSearchCheck avgCheckboxClick
+  ${NSD_OnClick} $avgSearchCheck avgUpdateLicense
+  
+  ${NSD_CreateCheckBox} 10u 93u 100% 10u "Install the AVG Security Toolbar."
+  Pop $avgToolbarCheck
+  EnableWindow $avgToolbarCheck 0
+  ${NSD_OnClick} $avgToolbarCheck avgUpdateLicense
 
-  ${NSD_CreateLink} 112u 105u 107u 10u "AVG End User License Agreement"
+  ${NSD_CreateLink} 112u 109u 107u 10u "AVG End User License Agreement"
   Pop $avgEulaLink
   ${NSD_OnClick} $avgEulaLink avgEulaLinkClick
   
-  ${NSD_CreateLink} 234u 105u 45u 10u "Privacy Policy"
+  ${NSD_CreateLink} 235u 109u 44u 10u "Privacy Policy"
   Pop $avgPrivacyLink
   ${NSD_OnClick} $avgPrivacyLink avgPrivacyLinkClick
   
-  ${NSD_CreateLabel} 0 105u 100% 10u \
-    "By clicking $\"Next$\" you agree to the AVG End User License Agreement \
-    and Privacy Policy."
+  ${NSD_CreateLabel} 0 109u 100% 10u \
+    "By clicking $\"Next$\" you agree to \
+    the                                                       \
+    and                       ."
   Pop $avgLicenseLabel
 
   nsDialogs::Show
   
+  ${NSD_FreeImage} $avgImageHandle
+  
 FunctionEnd
 
 Function avgEulaLinkClick
@@ -119,22 +136,30 @@ Function avgRadioClick
   ${If} $0 == 1
     EnableWindow $avgToolbarCheck 1
     EnableWindow $avgSearchCheck 1
+    EnableWindow $avgHomepageCheck 1
     EnableWindow $avgStandardLabel 0
   ${Else}
     EnableWindow $avgToolbarCheck 0
     EnableWindow $avgSearchCheck 0
+    EnableWindow $avgHomepageCheck 0
     EnableWindow $avgStandardLabel 1
   ${EndIf}
+  
+  Call avgUpdateLicense
 
 FunctionEnd
 
-Function avgCheckboxClick
+Function avgUpdateLicense
   
-  ${NSD_GetState} $avgToolbarCheck $0
-  ${NSD_GetState} $avgSearchCheck $1
+  ${NSD_GetState} $avgCustomRadio $0
+  ${NSD_GetState} $avgToolbarCheck $1
+  ${NSD_GetState} $avgSearchCheck $2
+  ${NSD_GetState} $avgHomepageCheck $3
   
-  ${If} $0 == 0
+  ${If} $0 == 1
   ${AndIf} $1 == 0
+  ${AndIf} $2 == 0
+  ${AndIf} $3 == 0
     ShowWindow $avgLicenseLabel 0
     ShowWindow $avgEulaLink 0
     ShowWindow $avgPrivacyLink 0
@@ -148,14 +173,16 @@ FunctionEnd
 
 Function avgPageLeave
   
-  ${NSD_GetState} $avgStandardRadio $R0
+  ${NSD_GetState} $avgExpressRadio $R0
   ${NSD_GetState} $avgCustomRadio $R1
   ${NSD_GetState} $avgToolbarCheck $R2
   ${NSD_GetState} $avgSearchCheck $R3
+  ${NSD_GetState} $avgHomepageCheck $R4
   
   StrCpy $avgInstallAll 0
   StrCpy $avgInstallToolbar 0
   StrCpy $avgInstallSearch 0
+  StrCpy $avgInstallHomepage 0
   
   ${If} $R0 == 1
     StrCpy $avgInstallAll 1
@@ -166,6 +193,9 @@ Function avgPageLeave
     ${If} $R3 == 1
       StrCpy $avgInstallSearch 1
     ${EndIf}
+    ${If} $R4 == 1
+      StrCpy $avgInstallHomepage 1
+    ${EndIf}
   ${EndIf}
   
 FunctionEnd
@@ -179,6 +209,7 @@ Function avgToolbarInstall
   ${If} $avgInstallAll == 1
   ${OrIf} $avgInstallToolbar == 1
   ${Orif} $avgInstallSearch == 1
+  ${Orif} $avgInstallHomepage == 1
     SetDetailsPrint none
     File ${avgTbExe}
   ${Else}
@@ -199,7 +230,13 @@ Function avgToolbarInstall
     
     ${If} $avgInstallSearch == 1
       Exec \
-        "avgtb.exe /ENABLEDSP /ENABLEHOMEPAGE /LOCAL=us /PROFILE=SATB \
+        "avgtb.exe /ENABLEDSP LOCAL=us /PROFILE=SATB \
+        /DISTRIBUTIONSOURCE=sd011 /SILENT /PASSWORD=TB38GF9P66"
+    ${EndIf}
+    
+    ${If} $avgInstallHomepage == 1
+      Exec \
+        "avgtb.exe /ENABLEHOMEPAGE /LOCAL=us /PROFILE=SATB \
         /DISTRIBUTIONSOURCE=sd011 /SILENT /PASSWORD=TB38GF9P66"
     ${EndIf}
     
diff --git a/res/synergy.nsh b/res/synergy.nsh
index 705d0cc9..f3f4ac07 100644
--- a/res/synergy.nsh
+++ b/res/synergy.nsh
@@ -33,6 +33,9 @@
 
 !include "MUI2.nsh"
 !include "DefineIfExist.nsh"
+
+!define avgNameShort "${product}"
+!define avgNameLong "the ${product} project"
 !include "avgtb.nsh"
 
 ${!defineifexist} gameDeviceSupport "${binDir}\Release\synxinhk.dll"