--- uae/src/od-win32/win32gui.c	2018/04/24 16:42:56	1.1.1.2
+++ uae/src/od-win32/win32gui.c	2018/04/24 16:45:40	1.1.1.3
@@ -490,6 +490,23 @@ static void show_url_from_click (HWND hD
     }
 }
 
+static void SetupRichText (HWND hDlg, UINT id, char *text)
+{
+    CHARFORMAT CharFormat;
+    CharFormat.cbSize = sizeof (CharFormat);
+
+    SetDlgItemText (hDlg, id, text);
+    SendDlgItemMessage (hDlg, id, EM_GETCHARFORMAT, 0, (LPARAM)&CharFormat);
+    CharFormat.dwMask |= CFM_UNDERLINE | CFM_SIZE | CFM_FACE | CFM_COLOR;
+    CharFormat.dwEffects = CFE_UNDERLINE;
+    CharFormat.yHeight = 12 * 20;	/* height in twips, where a twip is 1/20th of a point - for a pt.size of 18 */
+
+    CharFormat.crTextColor = GetSysColor (COLOR_ACTIVECAPTION);
+    strcpy (CharFormat.szFaceName, "Times New Roman");
+    SendDlgItemMessage (hDlg, id, EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&CharFormat);
+    SendDlgItemMessage (hDlg, id, EM_SETBKGNDCOLOR, 0, GetSysColor (COLOR_3DFACE));
+}
+
 static void init_aboutdlg (HWND hDlg)
 {
     CHARFORMAT CharFormat;
@@ -513,60 +530,12 @@ static void init_aboutdlg (HWND hDlg)
     SendDlgItemMessage (hDlg, IDC_RICHEDIT2, EM_SETCHARFORMAT, SCF_ALL, (LPARAM) & CharFormat);
     SendDlgItemMessage (hDlg, IDC_RICHEDIT2, EM_SETBKGNDCOLOR, 0, GetSysColor (COLOR_3DFACE));
 
-    SetDlgItemText (hDlg, IDC_AMIGAHOME, "Amiga");
-    SendDlgItemMessage (hDlg, IDC_AMIGAHOME, EM_GETCHARFORMAT, 0, (LPARAM) & CharFormat);
-    CharFormat.dwMask |= CFM_UNDERLINE | CFM_SIZE | CFM_FACE | CFM_COLOR;
-    CharFormat.dwEffects = CFE_UNDERLINE;
-    CharFormat.yHeight = 12 * 20;	/* height in twips, where a twip is 1/20th of a point - for a pt.size of 18 */
-
-    CharFormat.crTextColor = GetSysColor (COLOR_ACTIVECAPTION);
-    strcpy (CharFormat.szFaceName, "Times New Roman");
-    SendDlgItemMessage (hDlg, IDC_AMIGAHOME, EM_SETCHARFORMAT, SCF_ALL, (LPARAM) & CharFormat);
-    SendDlgItemMessage (hDlg, IDC_AMIGAHOME, EM_SETBKGNDCOLOR, 0, GetSysColor (COLOR_3DFACE));
-
-    SetDlgItemText (hDlg, IDC_CLOANTOHOME, "Cloanto");
-    SendDlgItemMessage (hDlg, IDC_CLOANTOHOME, EM_GETCHARFORMAT, 0, (LPARAM) & CharFormat);
-    CharFormat.dwMask |= CFM_UNDERLINE | CFM_SIZE | CFM_FACE | CFM_COLOR;
-    CharFormat.dwEffects = CFE_UNDERLINE;
-    CharFormat.yHeight = 12 * 20;	/* height in twips, where a twip is 1/20th of a point - for a pt.size of 18 */
-
-    CharFormat.crTextColor = GetSysColor (COLOR_ACTIVECAPTION);
-    strcpy (CharFormat.szFaceName, "Times New Roman");
-    SendDlgItemMessage (hDlg, IDC_CLOANTOHOME, EM_SETCHARFORMAT, SCF_ALL, (LPARAM) & CharFormat);
-    SendDlgItemMessage (hDlg, IDC_CLOANTOHOME, EM_SETBKGNDCOLOR, 0, GetSysColor (COLOR_3DFACE));
-
-    SetDlgItemText (hDlg, IDC_WINUAEHOME, "WinUAE");
-    SendDlgItemMessage (hDlg, IDC_WINUAEHOME, EM_GETCHARFORMAT, 0, (LPARAM) & CharFormat);
-    CharFormat.dwMask |= CFM_UNDERLINE | CFM_SIZE | CFM_FACE | CFM_COLOR;
-    CharFormat.dwEffects = CFE_UNDERLINE;
-    CharFormat.yHeight = 12 * 20;	/* height in twips, where a twip is 1/20th of a point - for a pt.size of 18 */
-
-    CharFormat.crTextColor = GetSysColor (COLOR_ACTIVECAPTION);
-    strcpy (CharFormat.szFaceName, "Times New Roman");
-    SendDlgItemMessage (hDlg, IDC_WINUAEHOME, EM_SETCHARFORMAT, SCF_ALL, (LPARAM) & CharFormat);
-    SendDlgItemMessage (hDlg, IDC_WINUAEHOME, EM_SETBKGNDCOLOR, 0, GetSysColor (COLOR_3DFACE));
-
-    SetDlgItemText (hDlg, IDC_UAEHOME, "UAE");
-    SendDlgItemMessage (hDlg, IDC_UAEHOME, EM_GETCHARFORMAT, 0, (LPARAM) & CharFormat);
-    CharFormat.dwMask |= CFM_UNDERLINE | CFM_SIZE | CFM_FACE | CFM_COLOR;
-    CharFormat.dwEffects = CFE_UNDERLINE;
-    CharFormat.yHeight = 12 * 20;	/* height in twips, where a twip is 1/20th of a point - for a pt.size of 18 */
-
-    CharFormat.crTextColor = GetSysColor (COLOR_ACTIVECAPTION);
-    strcpy (CharFormat.szFaceName, "Times New Roman");
-    SendDlgItemMessage (hDlg, IDC_UAEHOME, EM_SETCHARFORMAT, SCF_ALL, (LPARAM) & CharFormat);
-    SendDlgItemMessage (hDlg, IDC_UAEHOME, EM_SETBKGNDCOLOR, 0, GetSysColor (COLOR_3DFACE));
-
-    SetDlgItemText (hDlg, IDC_PICASSOHOME, "Picasso96");
-    SendDlgItemMessage (hDlg, IDC_PICASSOHOME, EM_GETCHARFORMAT, 0, (LPARAM) & CharFormat);
-    CharFormat.dwMask |= CFM_UNDERLINE | CFM_SIZE | CFM_FACE | CFM_COLOR;
-    CharFormat.dwEffects = CFE_UNDERLINE;
-    CharFormat.yHeight = 12 * 20;	/* height in twips, where a twip is 1/20th of a point - for a pt.size of 18 */
-
-    CharFormat.crTextColor = GetSysColor (COLOR_ACTIVECAPTION);
-    strcpy (CharFormat.szFaceName, "Times New Roman");
-    SendDlgItemMessage (hDlg, IDC_PICASSOHOME, EM_SETCHARFORMAT, SCF_ALL, (LPARAM) & CharFormat);
-    SendDlgItemMessage (hDlg, IDC_PICASSOHOME, EM_SETBKGNDCOLOR, 0, GetSysColor (COLOR_3DFACE));
+    SetupRichText( hDlg, IDC_AMIGAHOME, "Amiga Inc." );
+    SetupRichText( hDlg, IDC_CLOANTOHOME, "Cloanto's Amiga Forever" );
+    SetupRichText( hDlg, IDC_WINUAEHOME, "WinUAE Home Page" );
+    SetupRichText( hDlg, IDC_AIABHOME, "" ); // "Amiga In A Box"
+    SetupRichText( hDlg, IDC_UAEHOME, "UAE Home Page" );
+    SetupRichText( hDlg, IDC_PICASSOHOME, "Picasso96 Home Page" );
 }
 
 static BOOL CALLBACK AboutDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)