diff --git a/src/apps/activitymonitor/ActivityWindow.cpp b/src/apps/activitymonitor/ActivityWindow.cpp
index 8522c87369..30ada8caf7 100644
--- a/src/apps/activitymonitor/ActivityWindow.cpp
+++ b/src/apps/activitymonitor/ActivityWindow.cpp
@@ -8,6 +8,7 @@
 
 #include <stdio.h>
 
+#include <AboutMenuItem.h>
 #include <Application.h>
 #include <Catalog.h>
 #include <File.h>
@@ -124,9 +125,7 @@ ActivityWindow::ActivityWindow()
 		new BMessage(kMsgAddView)));
 	menu->AddSeparatorItem();
 
-	menu->AddItem(item = new BMenuItem(
-		B_TRANSLATE("About ActivityMonitor" B_UTF8_ELLIPSIS),
-		new BMessage(B_ABOUT_REQUESTED)));
+	menu->AddItem(item = new BAboutMenuItem());
 	menu->AddSeparatorItem();
 
 	menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"),
diff --git a/src/apps/bootmanager/BootManager.cpp b/src/apps/bootmanager/BootManager.cpp
index abf9625b8e..a9eb7fbe54 100644
--- a/src/apps/bootmanager/BootManager.cpp
+++ b/src/apps/bootmanager/BootManager.cpp
@@ -10,6 +10,7 @@
 
 #include "BootManagerWindow.h"
 
+#include <AboutWindow.h>
 #include <Alert.h>
 #include <Application.h>
 #include <Catalog.h>
@@ -51,30 +52,14 @@ BootManager::ReadyToRun()
 void
 BootManager::AboutRequested()
 {
-	BString aboutText;
-	const char* title = B_TRANSLATE_COMMENT("BootManager", "Application name");
-	aboutText << title << "\n\n"
-		<< B_TRANSLATE("written by")
-		<< "\n"
-			"\tDavid Dengg\n"
-			"\tMichael Pfeiffer\n"
-			"\n"
-		<< B_TRANSLATE_COMMENT("Copyright %year, Haiku Inc.\n",
-			"Leave %year untranslated");
-	aboutText.ReplaceLast("%year", "2008-2010");
-	BAlert *alert = new BAlert("about",
-		aboutText.String(), B_TRANSLATE("OK"));
-	BTextView *view = alert->TextView();
-	BFont font;
-
-	view->SetStylable(true);
-
-	view->GetFont(&font);
-	font.SetSize(18);
-	font.SetFace(B_BOLD_FACE);
-	view->SetFontAndColor(0, strlen(title), &font);
-
-	alert->Go();
+	const char* authors[] = {
+		"David Dengg",
+		"Michael Pfeiffer",
+		NULL
+	};
+	
+	BAboutWindow about(B_TRANSLATE_APP_NAME("BootManager"), 2008, authors);
+	about.Show();
 }
 
 
diff --git a/src/apps/bootmanager/Jamfile b/src/apps/bootmanager/Jamfile
index a141789323..8d015e34cf 100644
--- a/src/apps/bootmanager/Jamfile
+++ b/src/apps/bootmanager/Jamfile
@@ -22,7 +22,7 @@ Application BootManager :
 	WizardController.cpp
 	WizardPageView.cpp
 
-	: be textencoding tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
+	: be libshared.a textencoding tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
 	: BootManager.rdef
 ;
 
diff --git a/src/apps/charactermap/CharacterMap.cpp b/src/apps/charactermap/CharacterMap.cpp
index d680f5cdea..06d46c6851 100644
--- a/src/apps/charactermap/CharacterMap.cpp
+++ b/src/apps/charactermap/CharacterMap.cpp
@@ -8,6 +8,7 @@
 
 #include <stdlib.h>
 
+#include <AboutWindow.h>
 #include <Alert.h>
 #include <Application.h>
 #include <Catalog.h>
@@ -57,21 +58,13 @@ CharacterMap::MessageReceived(BMessage* message)
 void
 CharacterMap::AboutRequested()
 {
-	BAlert *alert = new BAlert("about", B_TRANSLATE(
-		"CharacterMap\n"
-		"\twritten by Axel Dörfler\n"
-		"\tCopyright 2009, Haiku, Inc.\n"), B_TRANSLATE("OK"));
-	BTextView *view = alert->TextView();
-	BFont font;
-
-	view->SetStylable(true);
-
-	view->GetFont(&font);
-	font.SetSize(18);
-	font.SetFace(B_BOLD_FACE);
-	view->SetFontAndColor(0, 12, &font);
-
-	alert->Go();
+	const char* authors[] = {
+		"Axel Dörfler",
+		NULL
+	};
+	
+	BAboutWindow about(B_TRANSLATE_APP_NAME("CharacterMap"), 2009, authors);
+	about.Show();
 }
 
 
diff --git a/src/apps/charactermap/CharacterWindow.cpp b/src/apps/charactermap/CharacterWindow.cpp
index 7f15c30431..36edd77111 100644
--- a/src/apps/charactermap/CharacterWindow.cpp
+++ b/src/apps/charactermap/CharacterWindow.cpp
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <AboutMenuItem.h>
 #include <Application.h>
 #include <Button.h>
 #include <Catalog.h>
@@ -227,8 +228,7 @@ CharacterWindow::CharacterWindow()
 	BMenu* menu = new BMenu(B_TRANSLATE("File"));
 	BMenuItem* item;
 
-	menu->AddItem(item = new BMenuItem(B_TRANSLATE("About CharacterMap"
-		 B_UTF8_ELLIPSIS), new BMessage(B_ABOUT_REQUESTED)));
+	menu->AddItem(item = new BAboutMenuItem());
 
 	menu->AddSeparatorItem();
 
diff --git a/src/apps/charactermap/Jamfile b/src/apps/charactermap/Jamfile
index 70dd91e310..c27ddb6e98 100644
--- a/src/apps/charactermap/Jamfile
+++ b/src/apps/charactermap/Jamfile
@@ -11,7 +11,7 @@ Application CharacterMap :
 	UnicodeBlocks.cpp
 	UnicodeBlockView.cpp
 
-	: be locale $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS)
+	: be libshared.a locale $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS)
 	: CharacterMap.rdef
 	;
 
diff --git a/src/apps/codycam/CodyCam.cpp b/src/apps/codycam/CodyCam.cpp
index db18942bf7..651ce39583 100644
--- a/src/apps/codycam/CodyCam.cpp
+++ b/src/apps/codycam/CodyCam.cpp
@@ -4,6 +4,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <AboutMenuItem.h>
+#include <AboutWindow.h>
 #include <Alert.h>
 #include <Button.h>
 #include <LayoutBuilder.h>
@@ -255,11 +257,6 @@ CodyCam::MessageReceived(BMessage *message)
 			break;
 		}
 
-		case msg_about:
-			(new BAlert(B_TRANSLATE("About CodyCam"), B_TRANSLATE("CodyCam\n\n"
-				"The Original BeOS webcam"), B_TRANSLATE("Close")))->Go();
-			break;
-
 		case msg_control_win:
 			// our control window is being asked to go away
 			// set our pointer to NULL
@@ -273,6 +270,21 @@ CodyCam::MessageReceived(BMessage *message)
 }
 
 
+void
+CodyCam::AboutRequested()
+{
+	const char* authors[] = {
+		"Be, Incorporated",
+		NULL
+	};
+	
+	BAboutWindow about(B_TRANSLATE_APP_NAME("CodyCam"), 2003, authors,
+		"The Original BeOS webcam.\n"
+		B_UTF8_COPYRIGHT " 1998-1999 Be, Incorporated.");
+	about.Show();
+}
+
+
 status_t
 CodyCam::_SetUpNodes()
 {
@@ -510,8 +522,7 @@ VideoWindow::VideoWindow(BRect frame, const char* title, window_type type,
 
 	menu->AddSeparatorItem();
 
-	menuItem = new BMenuItem(B_TRANSLATE("About Codycam" B_UTF8_ELLIPSIS),
-		new BMessage(msg_about), 'B');
+	menuItem = new BAboutMenuItem();
 	menuItem->SetTarget(be_app);
 	menu->AddItem(menuItem);
 
diff --git a/src/apps/codycam/CodyCam.h b/src/apps/codycam/CodyCam.h
index 66749e11c5..8f1595396a 100644
--- a/src/apps/codycam/CodyCam.h
+++ b/src/apps/codycam/CodyCam.h
@@ -40,7 +40,6 @@ enum {
 	msg_start		= 'strt',
 	msg_stop		= 'stop',
 
-	msg_about		= 'abut',
 	msg_setup		= 'setp',
 	msg_video		= 'vdeo',
 
@@ -94,6 +93,7 @@ public:
 			void			ReadyToRun();
 	virtual	bool			QuitRequested();
 	virtual	void			MessageReceived(BMessage* message);
+	virtual	void			AboutRequested();
 
 private:
 			status_t		_SetUpNodes();
diff --git a/src/apps/codycam/Jamfile b/src/apps/codycam/Jamfile
index 0e2207a9b9..0f4c4c9e4b 100644
--- a/src/apps/codycam/Jamfile
+++ b/src/apps/codycam/Jamfile
@@ -2,6 +2,8 @@ SubDir HAIKU_TOP src apps codycam ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+UsePrivateHeaders shared ;
+
 Application CodyCam :
 	CodyCam.cpp
 	FileUploadClient.cpp
@@ -11,7 +13,7 @@ Application CodyCam :
 	Settings.cpp
 	SettingsHandler.cpp
 	VideoConsumer.cpp
-	: be $(HAIKU_LOCALE_LIBS) media translation $(TARGET_NETAPI_LIB)
+	: be $(HAIKU_LOCALE_LIBS) libshared.a media translation $(TARGET_NETAPI_LIB)
 		$(TARGET_LIBSTDC++)
 	: CodyCam.rdef
 ;
diff --git a/src/apps/deskbar/BeMenu.cpp b/src/apps/deskbar/BeMenu.cpp
index 005fb07909..f28a3aabd4 100644
--- a/src/apps/deskbar/BeMenu.cpp
+++ b/src/apps/deskbar/BeMenu.cpp
@@ -246,10 +246,10 @@ TBeMenu::AddStandardBeMenuItems()
 
 #ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
 	static const char* kAboutHaikuMenuItemStr = B_TRANSLATE_MARK(
-		"About Haiku" B_UTF8_ELLIPSIS);
+		"About Haiku");
 #else
 	static const char* kAboutThisSystemMenuItemStr = B_TRANSLATE_MARK(
-		"About this system" B_UTF8_ELLIPSIS);
+		"About this system");
 #endif
 
 	item = new BMenuItem(
diff --git a/src/apps/deskcalc/CalcView.cpp b/src/apps/deskcalc/CalcView.cpp
index 81e0772dfd..8d5ae2f0d0 100644
--- a/src/apps/deskcalc/CalcView.cpp
+++ b/src/apps/deskcalc/CalcView.cpp
@@ -17,6 +17,8 @@
 #include <ctype.h>
 #include <assert.h>
 
+#include <AboutMenuItem.h>
+#include <AboutWindow.h>
 #include <Alert.h>
 #include <Application.h>
 #include <AppFileInfo.h>
@@ -686,13 +688,15 @@ CalcView::FrameResized(float width, float height)
 void
 CalcView::AboutRequested()
 {
-	BAlert* alert = new BAlert(B_TRANSLATE("about"),B_TRANSLATE(
-		"DeskCalc v2.1.0\n\n"
-		"written by Timothy Wayper,\nStephan Aßmus and Ingo Weinhold\n\n"
-		B_UTF8_COPYRIGHT "1997, 1998 R3 Software Ltd.\n"
-		B_UTF8_COPYRIGHT "2006-2009 Haiku, Inc.\n\n"
-		"All Rights Reserved."), "OK");
-	alert->Go(NULL);
+	const char* authors[] = {
+		"Timothy Wayper",
+		"nStephan Aßmus",
+		"Ingo Weinhold",
+		NULL
+	};
+	BAboutWindow about(B_TRANSLATE_APP_NAME("DeskCalc"), 2006, authors,
+		B_UTF8_COPYRIGHT "1997, 1998 R3 Software Ltd.");
+	about.Show();
 }
 
 
@@ -1108,8 +1112,7 @@ CalcView::_CreatePopUpMenu()
 		new BMessage(MSG_OPTIONS_AUDIO_FEEDBACK));
 	fShowKeypadItem = new BMenuItem(B_TRANSLATE("Show keypad"),
 		new BMessage(MSG_OPTIONS_SHOW_KEYPAD));
-	fAboutItem = new BMenuItem(B_TRANSLATE("About DeskCalc" B_UTF8_ELLIPSIS),
-		new BMessage(B_ABOUT_REQUESTED));
+	fAboutItem = new BAboutMenuItem();
 
 	// apply current settings
 	fAutoNumlockItem->SetMarked(fOptions->auto_num_lock);
diff --git a/src/apps/deskcalc/Jamfile b/src/apps/deskcalc/Jamfile
index 83145211ab..62b0e6408b 100644
--- a/src/apps/deskcalc/Jamfile
+++ b/src/apps/deskcalc/Jamfile
@@ -13,7 +13,7 @@ Application DeskCalc :
 	ExpressionTextView.cpp
 	InputTextView.cpp
 	: be $(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS) media libexpression_parser.a
-		libmapm.a
+		libmapm.a libshared.a
 	: DeskCalc.rdef
 ;
 
diff --git a/src/apps/devices/DevicesApplication.cpp b/src/apps/devices/DevicesApplication.cpp
index d727d5a984..02b23abc21 100644
--- a/src/apps/devices/DevicesApplication.cpp
+++ b/src/apps/devices/DevicesApplication.cpp
@@ -6,6 +6,7 @@
  *		Pieter Panman
  */
 
+#include <AboutWindow.h>
 #include <Alert.h>
 #include <Application.h>
 #include <Catalog.h>
@@ -53,24 +54,14 @@ DevicesApplication::AboutRequested()
 void
 DevicesApplication::ShowAbout()
 {
-	BAlert* alert = new BAlert(B_TRANSLATE("About"), B_TRANSLATE("Devices\n"
-		"\twritten by Pieter Panman\n"
-		"\n"
-		"\tBased on listdev by Jérôme Duval\n"
-		"\tand the previous Devices preference\n"
-		"\tby Jérôme Duval and Sikosis\n"
-		"\tCopyright 2009, Haiku, Inc.\n"), B_TRANSLATE("OK"));
-	BTextView* view = alert->TextView();
-	BFont font;
-
-	view->SetStylable(true);
-
-	view->GetFont(&font);
-	font.SetSize(18);
-	font.SetFace(B_BOLD_FACE);
-	view->SetFontAndColor(0, 7, &font);
-
-	alert->Go();
+	const char* authors[] = {
+		"Pieter Panman",
+		NULL
+	};
+	BAboutWindow about(B_TRANSLATE_APP_NAME("Devices"), 2009, authors,
+		"Based on listdev by Jérôme Duval and the previous Devices "
+		"preference by Jérôme Duval and Sikosis.");
+	about.Show();
 }
 
 
diff --git a/src/apps/devices/DevicesView.cpp b/src/apps/devices/DevicesView.cpp
index cbffc7be18..dad2a5002c 100644
--- a/src/apps/devices/DevicesView.cpp
+++ b/src/apps/devices/DevicesView.cpp
@@ -7,6 +7,7 @@
  */
 
 
+#include <AboutMenuItem.h>
 #include <Application.h>
 #include <Catalog.h>
 #include <MenuBar.h>
@@ -44,8 +45,7 @@ DevicesView::CreateLayout()
 		"Generate system information"), new BMessage(kMsgGenerateSysInfo)));
 	item->SetEnabled(false);
 	menu->AddSeparatorItem();
-	menu->AddItem(item = new BMenuItem(B_TRANSLATE("About Devices"
-		 B_UTF8_ELLIPSIS), new BMessage(B_ABOUT_REQUESTED)));
+	menu->AddItem(item = new BAboutMenuItem());
 	menu->AddSeparatorItem();
 	menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"),
 		new BMessage(B_QUIT_REQUESTED), 'Q'));
diff --git a/src/apps/devices/Jamfile b/src/apps/devices/Jamfile
index 188950e1b0..c849f4c933 100644
--- a/src/apps/devices/Jamfile
+++ b/src/apps/devices/Jamfile
@@ -72,7 +72,8 @@ Application Devices :
 	Device.cpp
 	PropertyList.cpp
 	PropertyListPlain.cpp
-	: be libcolumnlistview.a tracker $(TARGET_LIBSUPC++) $(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS)
+	: be libcolumnlistview.a libshared.a tracker $(TARGET_LIBSUPC++)
+		$(TARGET_LIBSTDC++)	$(HAIKU_LOCALE_LIBS) 
 	: Devices.rdef
 ;
 
diff --git a/src/apps/expander/ExpanderApp.cpp b/src/apps/expander/ExpanderApp.cpp
index d954cb6805..ff4295120c 100644
--- a/src/apps/expander/ExpanderApp.cpp
+++ b/src/apps/expander/ExpanderApp.cpp
@@ -5,15 +5,19 @@
 
 
 #include "ExpanderApp.h"
-#include "ExpanderWindow.h"
 
+#include <AboutWindow.h>
 #include <Alert.h>
 #include <Catalog.h>
 #include <Locale.h>
 #include <TextView.h>
 
+#include "ExpanderWindow.h"
+
+
 ExpanderApp::ExpanderApp()
-	: BApplication("application/x-vnd.Haiku-Expander")
+	:
+	BApplication("application/x-vnd.Haiku-Expander")
 {
 	BPoint windowPosition = fSettings.Message().FindPoint("window_position");
 	BRect windowFrame(0, 0, 450, 120);
@@ -29,24 +33,13 @@ ExpanderApp::ExpanderApp()
 void
 ExpanderApp::AboutRequested()
 {
-	BString appName = B_TRANSLATE_APP_NAME("Expander");
-	int nameLength = appName.CountChars();
-	BAlert* alert = new BAlert("about",
-		appName.Append(B_TRANSLATE("\n\twritten by Jérôme Duval\n"
-			"\tCopyright 2004-2006, Haiku Inc.\n\noriginal Be version by \n"
-			"Dominic, Hiroshi, Peter, Pavel and Robert\n")),
-		B_TRANSLATE("OK"));
-	BTextView* view = alert->TextView();
-	BFont font;
-
-	view->SetStylable(true);
-
-	view->GetFont(&font);
-	font.SetSize(18);
-	font.SetFace(B_BOLD_FACE);
-	view->SetFontAndColor(0, nameLength, &font);
-
-	alert->Go();
+	const char* authors[] = {
+		"Jérôme Duval",
+		NULL
+	};
+	BAboutWindow about(B_TRANSLATE_APP_NAME("Expander"), 2004, authors,
+		"Original Be version by Dominic, Hiroshi, Peter, Pavel and Robert.");
+	about.Show();
 }
 
 
diff --git a/src/apps/expander/Jamfile b/src/apps/expander/Jamfile
index c0290ae3bb..1ae430ed7b 100644
--- a/src/apps/expander/Jamfile
+++ b/src/apps/expander/Jamfile
@@ -1,5 +1,7 @@
 SubDir HAIKU_TOP src apps expander ;
 
+UsePrivateHeaders shared ;
+
 Application Expander :
 	ExpanderApp.cpp
 	ExpanderWindow.cpp
@@ -10,7 +12,7 @@ Application Expander :
 	DirectoryFilePanel.cpp
 	ExpanderRules.cpp
 	PasswordAlert.cpp
-	: be tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
+	: be libshared.a tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
 	: Expander.rdef
 ;
 
diff --git a/src/apps/installedpackages/UninstallWindow.cpp b/src/apps/installedpackages/UninstallWindow.cpp
index 29b44995be..91da0a3a72 100644
--- a/src/apps/installedpackages/UninstallWindow.cpp
+++ b/src/apps/installedpackages/UninstallWindow.cpp
@@ -20,9 +20,9 @@
 
 UninstallWindow::UninstallWindow()
 	:
-	BWindow(BRect(100, 100, 600, 300), B_TRANSLATE("Installed packages"),
-		B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_QUIT_ON_WINDOW_CLOSE
-			| B_AUTO_UPDATE_SIZE_LIMITS)
+	BWindow(BRect(100, 100, 600, 300),
+		B_TRANSLATE_APP_NAME("InstalledPackages"), B_TITLED_WINDOW,
+		B_NOT_ZOOMABLE | B_QUIT_ON_WINDOW_CLOSE | B_AUTO_UPDATE_SIZE_LIMITS)
 {
 	SetLayout(new BGroupLayout(B_HORIZONTAL));
 	AddChild(new UninstallView());
diff --git a/src/apps/launchbox/App.cpp b/src/apps/launchbox/App.cpp
index fbd71446d8..7261fdfc3b 100644
--- a/src/apps/launchbox/App.cpp
+++ b/src/apps/launchbox/App.cpp
@@ -110,7 +110,7 @@ App::AboutRequested()
 	const char* authors[2];
 	authors[0] = B_TRANSLATE("Stephan Aßmus (aka stippi)");
 	authors[1] = NULL;
-	BString appName = B_TRANSLATE("LaunchBox");
+	BString appName = B_TRANSLATE_APP_NAME("LaunchBox");
 	BAboutWindow(appName, 2004, authors).Show();
 }
 
diff --git a/src/apps/launchbox/PadView.cpp b/src/apps/launchbox/PadView.cpp
index 68409dd8db..6b0c11f01e 100644
--- a/src/apps/launchbox/PadView.cpp
+++ b/src/apps/launchbox/PadView.cpp
@@ -423,7 +423,7 @@ PadView::DisplayMenu(BPoint where, LaunchButton* button) const
 	padM->AddItem(item);
 	menu->AddItem(padM);
 	// app commands
-	BMenu* appM = new BMenu(B_TRANSLATE("LaunchBox"));
+	BMenu* appM = new BMenu(B_TRANSLATE_APP_NAME("LaunchBox"));
 	appM->SetFont(be_plain_font);
 	// about
 	item = new BMenuItem(B_TRANSLATE("About"), new BMessage(B_ABOUT_REQUESTED));
diff --git a/src/apps/magnify/Jamfile b/src/apps/magnify/Jamfile
index 0005f7abdb..a4df1c62de 100644
--- a/src/apps/magnify/Jamfile
+++ b/src/apps/magnify/Jamfile
@@ -4,14 +4,16 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 
 AddSubDirSupportedPlatforms libbe_test ;
 
+UsePrivateHeaders shared ;
+
 Application Magnify : 
 	Magnify.cpp 
-	: be tracker game $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS)
+	: be game $(HAIKU_LOCALE_LIBS) libshared.a $(TARGET_LIBSUPC++) tracker
 	: Magnify.rdef
 ;
 
 DoCatalogs Magnify : 
-	x-vnd.Haiku-Magnify 
+	x-vnd.Haiku-Magnify
 	: 
 	Magnify.cpp
 ;
diff --git a/src/apps/magnify/Magnify.cpp b/src/apps/magnify/Magnify.cpp
index b280904967..f104b57ef6 100644
--- a/src/apps/magnify/Magnify.cpp
+++ b/src/apps/magnify/Magnify.cpp
@@ -10,6 +10,7 @@
 
 #include "Magnify.h"
 
+#include <AboutMenuItem.h>
 #include <Alert.h>
 #include <Bitmap.h>
 #include <Catalog.h>
@@ -131,11 +132,9 @@ static void
 BuildInfoMenu(BMenu *menu)
 {
 	BMenuItem* menuItem;
-
-	menuItem = new BMenuItem(B_TRANSLATE("About Magnify" B_UTF8_ELLIPSIS),
-		new BMessage(B_ABOUT_REQUESTED));
+	menuItem = new BAboutMenuItem();
 	menu->AddItem(menuItem);
-	menuItem = new BMenuItem(B_TRANSLATE("Help" B_UTF8_ELLIPSIS),
+	menuItem = new BMenuItem(B_TRANSLATE("Help"),
 		new BMessage(msg_help));
 	menu->AddItem(menuItem);
 	menu->AddSeparatorItem();
@@ -239,7 +238,7 @@ TApp::AboutRequested()
 
 TWindow::TWindow(int32 pixelCount)
 	:
-	BWindow(BRect(0, 0, 0, 0), B_TRANSLATE("Magnify"),
+	BWindow(BRect(0, 0, 0, 0), B_TRANSLATE_APP_NAME("Magnify"),
 		B_TITLED_WINDOW, B_OUTLINE_RESIZE)
 {
 	GetPrefs(pixelCount);
diff --git a/src/apps/mail/MailApp.cpp b/src/apps/mail/MailApp.cpp
index 0f75f0a62e..685d567727 100644
--- a/src/apps/mail/MailApp.cpp
+++ b/src/apps/mail/MailApp.cpp
@@ -1123,7 +1123,7 @@ TMailApp::NewWindow(const entry_ref* ref, const char* to, bool resend,
 		}
 	}
 	if (title == "")
-		title = B_TRANSLATE("Mail");
+		title = B_TRANSLATE_APP_NAME("Mail");
 
 	TMailWindow* window = new TMailWindow(r, title.String(), this, ref, to,
 		&fContentFont, resend, trackerMessenger);
diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp
index 4df23757c2..24672e8ebd 100644
--- a/src/apps/mail/MailWindow.cpp
+++ b/src/apps/mail/MailWindow.cpp
@@ -976,7 +976,7 @@ TMailWindow::MessageReceived(BMessage *msg)
 			if (!fIncoming && fieldMask & FIELD_SUBJECT) {
 				// If no subject, set to "Mail"
 				if (!fHeaderView->fSubject->TextView()->TextLength())
-					SetTitle("Mail");
+					SetTitle(B_TRANSLATE_APP_NAME("Mail"));
 				else
 					SetTitle(fHeaderView->fSubject->Text());
 			}
@@ -2741,7 +2741,7 @@ TMailWindow::SetTitleForMessage()
 	//
 	//	Figure out the title of this message and set the title bar
 	//
-	BString title = "Mail";
+	BString title = B_TRANSLATE_APP_NAME("Mail");
 
 	if (fIncoming) {
 		if (fMail->GetName(&title) == B_OK)
diff --git a/src/apps/mediaconverter/Jamfile b/src/apps/mediaconverter/Jamfile
index 9caba92502..541a37316b 100644
--- a/src/apps/mediaconverter/Jamfile
+++ b/src/apps/mediaconverter/Jamfile
@@ -2,6 +2,8 @@ SubDir HAIKU_TOP src apps mediaconverter ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+UsePrivateHeaders shared ;
+
 Application MediaConverter :
 	MediaConverterApp.cpp
 	MediaConverterWindow.cpp
@@ -10,7 +12,7 @@ Application MediaConverter :
 	MediaFileInfoView.cpp
 	MediaFileListView.cpp
 
-	: be media tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSTDC++)
+	: be libshared.a media tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSTDC++)
 	: MediaConverter.rdef
 ;
 
diff --git a/src/apps/mediaconverter/MediaConverterWindow.cpp b/src/apps/mediaconverter/MediaConverterWindow.cpp
index 026d6d2c3f..8633d20071 100644
--- a/src/apps/mediaconverter/MediaConverterWindow.cpp
+++ b/src/apps/mediaconverter/MediaConverterWindow.cpp
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <AboutMenuItem.h>
 #include <Alert.h>
 #include <Application.h>
 #include <Box.h>
@@ -110,7 +111,7 @@ CodecMenuItem::~CodecMenuItem()
 
 MediaConverterWindow::MediaConverterWindow(BRect frame)
 	:
-	BWindow(frame, B_TRANSLATE("MediaConverter"), B_TITLED_WINDOW_LOOK, 
+	BWindow(frame, B_TRANSLATE_APP_NAME("MediaConverter"), B_TITLED_WINDOW_LOOK,
 		B_NORMAL_WINDOW_FEEL, B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS | 
 		B_AUTO_UPDATE_SIZE_LIMITS),
 	fVideoQuality(75),
@@ -383,7 +384,7 @@ MediaConverterWindow::MessageReceived(BMessage* msg)
 		case B_CANCEL:
 			break;
 
-		case DISP_ABOUT_MESSAGE:
+		case B_ABOUT_REQUESTED:
 		{
 			BString title(B_TRANSLATE("About" B_UTF8_ELLIPSIS));
 			(new BAlert(title,
@@ -932,10 +933,7 @@ MediaConverterWindow::_CreateMenu()
 		new BMessage(OPEN_FILE_MESSAGE), 'O');
 	menu->AddItem(item);
 	menu->AddSeparatorItem();
-
-	item = new BMenuItem(B_TRANSLATE_WITH_CONTEXT(
-		"About MediaConverter" B_UTF8_ELLIPSIS, "Menu"),
-		new BMessage(DISP_ABOUT_MESSAGE));
+	item = new BAboutMenuItem(),
 	menu->AddItem(item);
 	menu->AddSeparatorItem();
 	item = new BMenuItem(B_TRANSLATE_WITH_CONTEXT("Quit", "Menu"), 
diff --git a/src/apps/mediaconverter/MessageConstants.h b/src/apps/mediaconverter/MessageConstants.h
index d492b94aec..5ab81c8d26 100644
--- a/src/apps/mediaconverter/MessageConstants.h
+++ b/src/apps/mediaconverter/MessageConstants.h
@@ -17,7 +17,6 @@
 #define OUTPUT_FOLDER_MESSAGE			'oUTF'
 #define FOLDER_SELECT_MESSAGE			'sLFO'
 #define OPEN_FILE_MESSAGE			    'oFIL'
-#define DISP_ABOUT_MESSAGE			    'aBUT'
 #define QUIT_MESSAGE			 		'qUIT'
 #define PREVIEW_MESSAGE					'pVEW'
 #define PRIORITY_CHANGED_MESSAGE		'cPRI'
diff --git a/src/apps/mediaplayer/MainApp.cpp b/src/apps/mediaplayer/MainApp.cpp
index 9680b91ce2..788fe337cd 100644
--- a/src/apps/mediaplayer/MainApp.cpp
+++ b/src/apps/mediaplayer/MainApp.cpp
@@ -410,9 +410,11 @@ MainApp::MessageReceived(BMessage* message)
 void
 MainApp::AboutRequested()
 {
-	BAlert* alert = new BAlert("about", B_TRANSLATE(
-		NAME"\n\nWritten by Marcus Overhagen, "
-		"Stephan Aßmus and Frederik Modéen"), 
+	const char* appName = B_TRANSLATE_APP_NAME("MediaPlayer");
+	BString message = B_TRANSLATE("%app%\n\nWritten by Marcus Overhagen, "
+		"Stephan Aßmus and Frederik Modéen");
+	message.ReplaceFirst("%app%", appName);
+	BAlert* alert = new BAlert(appName, message.String(),
 		B_TRANSLATE("Thanks"));
 	alert->SetFeel(B_FLOATING_ALL_WINDOW_FEEL);
 		// Make sure it is on top of any player windows that may have the
diff --git a/src/apps/mediaplayer/MainWin.cpp b/src/apps/mediaplayer/MainWin.cpp
index ef90f15743..4d215656be 100644
--- a/src/apps/mediaplayer/MainWin.cpp
+++ b/src/apps/mediaplayer/MainWin.cpp
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <AboutMenuItem.h>
 #include <Alert.h>
 #include <Application.h>
 #include <Autolock.h>
@@ -166,7 +167,7 @@ static const char* kRatingAttrName = "Media:Rating";
 
 static const char* kDisabledSeekMessage = B_TRANSLATE("Drop files to play");
 
-static const char* kApplicationName = B_TRANSLATE(NAME);
+static const char* kApplicationName = B_TRANSLATE_APP_NAME(NAME);
 
 
 //#define printf(a...)
@@ -1084,9 +1085,11 @@ MainWin::OpenPlaylistItem(const PlaylistItemRef& item)
 	if (ret != B_OK) {
 		fprintf(stderr, "MainWin::OpenPlaylistItem() - Failed to send message "
 			"to Controller.\n");
-		(new BAlert(B_TRANSLATE("error"), 
-			B_TRANSLATE(NAME" encountered an internal error. "
-			"The file could not be opened."), B_TRANSLATE("OK")))->Go();
+		BString message = B_TRANSLATE("%app% encountered an internal error. "
+			"The file could not be opened.");
+		message.ReplaceFirst("%app%", kApplicationName);
+		(new BAlert(kApplicationName, message.String(),
+			B_TRANSLATE("OK")))->Go();
 		_PlaylistItemOpened(item, ret);
 	} else {
 		BString string;
@@ -1473,8 +1476,7 @@ MainWin::_CreateMenu()
 
 	fFileMenu->AddSeparatorItem();
 
-	item = new BMenuItem(B_TRANSLATE("About " NAME B_UTF8_ELLIPSIS),
-		new BMessage(B_ABOUT_REQUESTED));
+	item = new BAboutMenuItem();
 	fFileMenu->AddItem(item);
 	item->SetTarget(be_app);
 
diff --git a/src/apps/midiplayer/MidiPlayerWindow.cpp b/src/apps/midiplayer/MidiPlayerWindow.cpp
index 6769aa63cf..4a5b45ad7f 100644
--- a/src/apps/midiplayer/MidiPlayerWindow.cpp
+++ b/src/apps/midiplayer/MidiPlayerWindow.cpp
@@ -44,8 +44,10 @@
 //------------------------------------------------------------------------------
 
 MidiPlayerWindow::MidiPlayerWindow()
-	: BWindow(BRect(0, 0, 1, 1), B_TRANSLATE("MidiPlayer"), B_TITLED_WINDOW,
-	          B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS)
+	:
+	BWindow(BRect(0, 0, 1, 1), B_TRANSLATE_APP_NAME("MidiPlayer"),
+		B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE
+		| B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS)
 {
 	playing = false;
 	scopeEnabled = true;
diff --git a/src/apps/networkstatus/NetworkStatusWindow.cpp b/src/apps/networkstatus/NetworkStatusWindow.cpp
index 6864f3d04e..5a8119f3e2 100644
--- a/src/apps/networkstatus/NetworkStatusWindow.cpp
+++ b/src/apps/networkstatus/NetworkStatusWindow.cpp
@@ -19,7 +19,8 @@
 
 
 NetworkStatusWindow::NetworkStatusWindow()
-	: BWindow(BRect(150, 150, 249, 249), B_TRANSLATE("NetworkStatus"), 
+	:
+	BWindow(BRect(150, 150, 249, 249), B_TRANSLATE_APP_NAME("NetworkStatus"), 
 		B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS)
 {
 	BView* topView = new BView(Bounds(), NULL, B_FOLLOW_ALL, B_WILL_DRAW);
diff --git a/src/apps/overlayimage/Jamfile b/src/apps/overlayimage/Jamfile
index f4fd2fa9ef..def9cb8703 100644
--- a/src/apps/overlayimage/Jamfile
+++ b/src/apps/overlayimage/Jamfile
@@ -13,4 +13,5 @@ DoCatalogs OverlayImage :
 	x-vnd.Haiku-OverlayImage
 	:
 	OverlayView.cpp
+	OverlayWindow.cpp
 ;
diff --git a/src/apps/overlayimage/OverlayWindow.cpp b/src/apps/overlayimage/OverlayWindow.cpp
index 7b94527988..30695c6d07 100644
--- a/src/apps/overlayimage/OverlayWindow.cpp
+++ b/src/apps/overlayimage/OverlayWindow.cpp
@@ -25,7 +25,7 @@
 
 OverlayWindow::OverlayWindow() 
 	:
-	BWindow(BRect(50, 50, 500, 200), "OverlayImage", 
+	BWindow(BRect(50, 50, 500, 200), B_TRANSLATE_APP_NAME("OverlayImage"),
 		B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE)
 {
 	OverlayView *replView = new OverlayView(Bounds());
diff --git a/src/apps/packageinstaller/Jamfile b/src/apps/packageinstaller/Jamfile
index f311818147..41370706b7 100644
--- a/src/apps/packageinstaller/Jamfile
+++ b/src/apps/packageinstaller/Jamfile
@@ -20,3 +20,16 @@ Application PackageInstaller :
 	: PackageInstaller.rdef
 ;
 
+DoCatalogs PackageInstaller :
+	x-vnd.Haiku-PackageInstaller
+	:
+	main.cpp
+	PackageImageViewer.cpp
+	PackageInfo.cpp
+	PackageInstall.cpp
+	PackageItem.cpp
+	PackageStatus.cpp
+	PackageTextViewer.cpp
+	PackageView.cpp
+	PackageWindow.cpp
+;
diff --git a/src/apps/packageinstaller/PackageWindow.cpp b/src/apps/packageinstaller/PackageWindow.cpp
index afcddf03ee..75e25fda18 100644
--- a/src/apps/packageinstaller/PackageWindow.cpp
+++ b/src/apps/packageinstaller/PackageWindow.cpp
@@ -21,7 +21,7 @@
 
 PackageWindow::PackageWindow(const entry_ref *ref)
 	:
-	BWindow(BRect(100, 100, 600, 300), B_TRANSLATE("PackageInstaller"),
+	BWindow(BRect(100, 100, 600, 300), B_TRANSLATE_APP_NAME("PackageInstaller"),
 		B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
 {
 	//SetLayout(new BGroupLayout(B_HORIZONTAL));
diff --git a/src/apps/packagemanager/ApplicationWindow.cpp b/src/apps/packagemanager/ApplicationWindow.cpp
index d9a1f155a5..f10ef5945d 100644
--- a/src/apps/packagemanager/ApplicationWindow.cpp
+++ b/src/apps/packagemanager/ApplicationWindow.cpp
@@ -11,6 +11,7 @@
 
 #include <Alert.h>
 #include <Button.h>
+#include <Catalog.h>
 #include <ControlLook.h>
 #include <Entry.h>
 #include <File.h>
@@ -99,7 +100,8 @@ protected:
 
 
 ApplicationWindow::ApplicationWindow(BRect frame, bool visible)
-	: BWindow(frame, "Package Manager",
+	:
+	BWindow(frame, B_TRANSLATE_APP_NAME("PackageManager"),
 		B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
 		B_AUTO_UPDATE_SIZE_LIMITS | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE),
 	fMinimizeOnClose(false)
diff --git a/src/apps/packagemanager/Jamfile b/src/apps/packagemanager/Jamfile
index a099d6aace..412949b987 100644
--- a/src/apps/packagemanager/Jamfile
+++ b/src/apps/packagemanager/Jamfile
@@ -1,15 +1,18 @@
 SubDir HAIKU_TOP src apps packagemanager ;
 
-# UsePrivateHeaders shared interface ;
-# SubDirHdrs $(HAIKU_TOP) headers libs zlib ;
-
-#SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits interface ] ;
+UsePrivateHeaders shared ;
 
 Application PackageManager :
 	ApplicationView.cpp
 	ApplicationWindow.cpp
 	PackageManager.cpp
-	: be $(HAIKU_LOCALE_LIBS) translation $(TARGET_LIBSUPC++)
+	: be $(HAIKU_LOCALE_LIBS) libshared.a $(TARGET_LIBSUPC++) translation
 	: PackageManager.rdef
 ;
 
+DoCatalogs PackageManager :
+	x-vnd.Haiku-PackageManager
+	:
+	ApplicationWindow.cpp
+	PackageManager.cpp
+;
diff --git a/src/apps/packagemanager/PackageManager.cpp b/src/apps/packagemanager/PackageManager.cpp
index 242f10babc..c1219434cc 100644
--- a/src/apps/packagemanager/PackageManager.cpp
+++ b/src/apps/packagemanager/PackageManager.cpp
@@ -9,6 +9,7 @@
 
 #include "ApplicationWindow.h"
 
+#include <AboutWindow.h>
 #include <Alert.h>
 #include <Application.h>
 #include <Catalog.h>
@@ -115,21 +116,13 @@ PackageManager::MessageReceived(BMessage *msg)
 void
 PackageManager::AboutRequested()
 {
-	BAlert *about = new BAlert("about",
-		B_TRANSLATE("PackageManager\n"
-		"Written by Adrien Destugues\n"
-		"Copyright 2010 Haiku, Inc. \n"),
-		B_TRANSLATE("OK"));
-
-	BTextView *view = about->TextView();
-	BFont font;
-	view->SetStylable(true);
-	view->GetFont(&font);
-	font.SetFace(B_BOLD_FACE);
-	font.SetSize(font.Size() * 1.5);
-	view->SetFontAndColor(0, 17, &font);
-
-	about->Go();
+	const char* authors[] = {
+		"Adrien Destugues",
+		NULL
+	};
+	
+	BAboutWindow about(B_TRANSLATE_APP_NAME("PackageManager"), 2010, authors);
+	about.Show();
 }
 
 
diff --git a/src/apps/pairs/PairsWindow.cpp b/src/apps/pairs/PairsWindow.cpp
index c569dde1a9..4602e28475 100644
--- a/src/apps/pairs/PairsWindow.cpp
+++ b/src/apps/pairs/PairsWindow.cpp
@@ -39,9 +39,9 @@ const uint32 MENU_QUIT					= 'MGqu';
 
 PairsWindow::PairsWindow()
 	:
-	BWindow(BRect(100, 100, 405, 423), B_TRANSLATE("Pairs"), B_TITLED_WINDOW,
-		B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE
-			| B_NOT_RESIZABLE | B_NOT_ZOOMABLE),
+	BWindow(BRect(100, 100, 405, 423), B_TRANSLATE_APP_NAME("Pairs"),
+		B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE
+		| B_NOT_RESIZABLE | B_NOT_ZOOMABLE),
 	fPairComparing(NULL),
 	fIsFirstClick(true),
 	fIsPairsActive(true),
diff --git a/src/apps/poorman/Jamfile b/src/apps/poorman/Jamfile
index 3e94b31d35..838651080d 100644
--- a/src/apps/poorman/Jamfile
+++ b/src/apps/poorman/Jamfile
@@ -29,6 +29,8 @@ actions THTTPMakeHeader1
 THTTPMakeHeader mime_encodings.h : mime_encodings.txt ;
 THTTPMakeHeader mime_types.h : mime_types.txt ;
 
+UsePrivateHeaders shared ;
+
 AddResources PoorMan : PoorMan.rdef ;
 
 Application PoorMan : PoorMan.cpp
@@ -49,7 +51,7 @@ Application PoorMan : PoorMan.cpp
 	match.c
 	tdate_parse.c
 	
-	: be network tracker $(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS)
+	: be libshared.a network tracker $(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS)
 	;
 
 
diff --git a/src/apps/poorman/PoorManApplication.cpp b/src/apps/poorman/PoorManApplication.cpp
index 29ee2ec040..915af8f2e3 100644
--- a/src/apps/poorman/PoorManApplication.cpp
+++ b/src/apps/poorman/PoorManApplication.cpp
@@ -5,14 +5,19 @@
  *	Version: 0.1
  */
 
+
+#include "PoorManApplication.h"
+
+#include <AboutWindow.h>
 #include <Application.h>
 #include <Alert.h>
+#include <Catalog.h>
 #include <Directory.h>
 
 #include "constants.h"
-#include "PoorManApplication.h"
 #include "PoorManWindow.h"
 
+
 PoorManApplication::PoorManApplication()
 	: BApplication(STR_APP_SIG),
 	  mainWindow(NULL)
@@ -40,9 +45,14 @@ PoorManApplication::PoorManApplication()
 void 
 PoorManApplication::AboutRequested()
 {
-	BAlert* aboutBox = new BAlert(STR_ABOUT_TITLE,
-		STR_ABOUT_DESC, STR_ABOUT_BUTTON);
-	aboutBox->Go(); 
+	const char* authors[] = {
+		"Philip Harrison",
+		"Ma Jie",
+		NULL
+	};
+	BAboutWindow about(STR_APP_NAME, 2004, authors,
+		"Poor Man's web server.");
+	about.Show();
 }
 
 
diff --git a/src/apps/poorman/PoorManWindow.cpp b/src/apps/poorman/PoorManWindow.cpp
index 5e9c9d9f98..52179760d7 100644
--- a/src/apps/poorman/PoorManWindow.cpp
+++ b/src/apps/poorman/PoorManWindow.cpp
@@ -11,6 +11,7 @@
 #include <time.h>
 #include <arpa/inet.h>
 
+#include <AboutMenuItem.h>
 #include <Alert.h>
 #include <Box.h>
 #include <Catalog.h>
@@ -458,9 +459,7 @@ PoorManWindow::BuildFileMenu() const
 		
 	ptrFileMenu->AddSeparatorItem();
 	
-	// about box
-	BMenuItem * AboutItem = new BMenuItem(STR_MNU_FILE_ABOUT,
-		new BMessage(B_ABOUT_REQUESTED));
+	BAboutMenuItem * AboutItem = new BAboutMenuItem();
 	AboutItem->SetTarget(NULL, be_app);
 	ptrFileMenu->AddItem(AboutItem);
 
diff --git a/src/apps/poorman/constants.cpp b/src/apps/poorman/constants.cpp
index aef23d7167..356a855d93 100644
--- a/src/apps/poorman/constants.cpp
+++ b/src/apps/poorman/constants.cpp
@@ -13,8 +13,8 @@
 // PoorMan Window
 const char* STR_APP_SIG
 	= "application/x-vnd.Haiku.PoorMan";
-char* STR_APP_NAME
-	= (char*)"PoorMan";
+const char* STR_APP_NAME
+	= B_TRANSLATE_APP_NAME("PoorMan");
 const char* STR_ERR_WEB_DIR
 	= B_TRANSLATE(
 	  "Please choose the folder to publish on the web.\n\n"
@@ -129,17 +129,6 @@ const char CMD_EDIT_COPY
 const char CMD_EDIT_SELECT_ALL
 	= 'A';
 
-const char* STR_ABOUT_TITLE
-	= B_TRANSLATE("About PoorMan");
-const char* STR_ABOUT_BUTTON
-	= B_TRANSLATE("OK");
-const char* STR_ABOUT_DESC
-	= B_TRANSLATE(
-	"Poor Man's web server\n"
-	"Copyright " B_UTF8_COPYRIGHT " 2004-2009 Haiku\n"
-	"All rights reserved.\n\n"
-	"Written by: Philip Harrison, Ma Jie");
-
 // --------------------------------
 const rgb_color WHITE				= { 255, 255, 255, 255 };
 const rgb_color GRAY				= { 184, 184, 184, 255 };
diff --git a/src/apps/poorman/constants.h b/src/apps/poorman/constants.h
index b7d3daeb1c..99194c3374 100644
--- a/src/apps/poorman/constants.h
+++ b/src/apps/poorman/constants.h
@@ -43,7 +43,7 @@ const int32 MSG_LOG = 'logg';
 // ------------------------------------------------------
 // PoorMan Window
 extern const char* STR_APP_SIG;
-extern       char* STR_APP_NAME;
+extern const char* STR_APP_NAME;
 extern const char* STR_ERR_WEB_DIR; 	// Alert Box
 extern const char* STR_ERR_CANT_START;
 extern const char* STR_DIR_CREATED;
@@ -102,10 +102,6 @@ extern const char CMD_FILE_QUIT;
 extern const char CMD_EDIT_COPY;
 extern const char CMD_EDIT_SELECT_ALL;
 
-extern const char* STR_ABOUT_TITLE;
-extern const char* STR_ABOUT_DESC;
-extern const char* STR_ABOUT_BUTTON;
-
 
 /* Colors */
 extern const rgb_color WHITE;