publish changes

2024-09-29 02:04:03 +00:00 · 2024-09-29 02:04:03 +00:00 · ac2c6ac843
commit ac2c6ac843
parent afc5064a7b
1605 changed files with 3354 additions and 3354 deletions
--- a/Src/Winamp/Config.cpp
+++ b/Src/Winamp/Config.cpp
@ -337,7 +337,7 @@ void config_write(int i)
 	WI(video_ratio1);
 	WI(video_ratio2);
 	WI(video_useratio);
-	WI(windowshade);
+	WI(archhade);
 	WI(preamp);
 	WI(pilp);
 	WI(randskin);
@ -520,7 +520,7 @@ void config_read(int i)
 	RI(video_ratio1);
 	RI(video_ratio2);
 	RI(video_useratio);
-	RI(windowshade);
+	RI(archhade);
 	RI(preamp);
 	RI(pilp);
 	RI(randskin);
@ -801,7 +801,7 @@ void config_register(wchar_t *ext, int reg)
 	const wchar_t *which_str = WINAMP_FILEW;
 	if (config_no_registry) return ;
 	if (!ext[0]) return ;
-	if (!allowed_extension(ext)) return ; //windows=gay
+	if (!allowed_extension(ext)) return ; //arch=gay

 	IFileTypeRegistrar *registrar=0;
 	if (GetRegistrar(&registrar, true) == 0 && registrar)
--- a/Src/Winamp/DOCK.cpp
+++ b/Src/Winamp/DOCK.cpp
@ -27,7 +27,7 @@ void EstMainWindowRect( RECT *r )
 	r->left   = config_wx;
 	r->top    = config_wy;
 	r->right  = config_wx + ( WINDOW_WIDTH << ( config_dsize ? 1 : 0 ) );
-	r->bottom = config_wy + ( ( config_windowshade ? 14 : WINDOW_HEIGHT ) << ( config_dsize ? 1 : 0 ) );
+	r->bottom = config_wy + ( ( config_archhade ? 14 : WINDOW_HEIGHT ) << ( config_dsize ? 1 : 0 ) );
 }

 void EstEQWindowRect( RECT *r )
--- a/Src/Winamp/Eq.cpp
+++ b/Src/Winamp/Eq.cpp
@ -1,4 +1,4 @@
-#include <windowsx.h>
+#include <archx.h>

 #include "Main.h"
 #include "api.h"
--- a/Src/Winamp/GEN.H
+++ b/Src/Winamp/GEN.H
@ -2,7 +2,7 @@
 #define NULLSOFT_WINAMP_GEN_H
 // General Purpose plugin interface

-#include <windows.h>
+#include <arch.h>

 typedef struct {
 	int version;
--- a/Src/Winamp/In.cpp
+++ b/Src/Winamp/In.cpp
@ -689,7 +689,7 @@ static void AddFilterStringW(wchar_t* p, size_t& size, const char* a, BOOL skip)
 		if ( !skip && lstrlenW(p) >= MAX_PATH )
 		{
 			// if we end with a . then need to fake things to act like a new 
-			// filter since windows will interpret the . as a *.* which is bad
+			// filter since arch will interpret the . as a *.* which is bad
 			if ( *(p + MAX_PATH) == L'.' )
 			{
 				*(p + MAX_PATH - 1) = 0;
--- a/Src/Winamp/Main.h
+++ b/Src/Winamp/Main.h
@ -6,8 +6,8 @@
 extern "C"
 {
 #endif
-#include <windows.h>
-//#include <windowsx.h>
+#include <arch.h>
+//#include <archx.h>
 #include "wasabicfg.h"
 #include "wa_ipc.h"
 #include "config.h"
@ -64,7 +64,7 @@ extern HINSTANCE language_pack_instance;
 #define BIGINT 1000000000

 #define MAINMENU_OPTIONS_BASE (11+g_mm_optionsbase_adj)
-#define WINDOWMENU_FFWINDOWS_BASE (3+g_mm_ffwindowsbase_adj)
+#define WINDOWMENU_FFWINDOWS_BASE (3+g_mm_ffarchbase_adj)

 #define HIDDEN_TRAP -33

@ -225,7 +225,7 @@ extern HINSTANCE language_pack_instance;
 	void draw_sa(unsigned char *values, int draw); // array of 12 bands, starting with leftmost, of 0..7
 	void draw_tbuttons(int b1, int b2, int b3, int b4);
 	void draw_setnoupdate(int);
-	void draw_tbar(int active, int windowshade, int egg);
+	void draw_tbar(int active, int archhade, int egg);
 	void draw_eject(int pressed);
 	void draw_clutterbar(int enable);
 	void update_volume_text(int songlen);
@ -466,7 +466,7 @@ extern HINSTANCE language_pack_instance;
 	extern int g_srate, g_brate, g_nch, g_srate_exact;

 	extern int g_mm_optionsbase_adj;
-	extern int g_mm_ffwindowsbase_adj;
+	extern int g_mm_ffarchbase_adj;
 	extern HWND g_dialog_box_parent;
 	extern int g_restartonquit;
 	extern char playlist_custom_font[128];
--- a/Src/Winamp/MergePlaylist.h
+++ b/Src/Winamp/MergePlaylist.h
@ -1,7 +1,7 @@
 #pragma once
 #include "../playlist/ifc_playlist.h"
 #include <vector>
-#include <windows.h> // for MAX_PATH
+#include <arch.h> // for MAX_PATH
 #include <bfc/multipatch.h>
 #include "../playlist/ifc_playlistloadercallback.h"

--- a/Src/Winamp/OUT.H
+++ b/Src/Winamp/OUT.H
@ -2,7 +2,7 @@
 #define NULLSOFT_OUTH
 // Output plugin interface

-#include <windows.h>
+#include <arch.h>
 #include <stddef.h>

 #define OUT_VER 0x10
--- a/Src/Winamp/Peui.cpp
+++ b/Src/Winamp/Peui.cpp
@ -741,7 +741,7 @@ static void do_vscroll(HWND hwnd)
 		{-15,20,-7,-38},
 		{-20,-20,-1,-1},
  }, 
-  b_windowshade[] = 
+  b_archhade[] = 
 	{
 		{-(275-254),3,-(275-262),12},//wshade
 		{-(275-264),3,-(275-272),12},//close
@ -763,8 +763,8 @@ void pe_ui_handlecursor(HWND hwnd)
 	mouse_y=p.y;
 	if (config_pe_height == 14)	
  {
-    b=b_windowshade;
-    b_len = sizeof(b_windowshade)/sizeof(b_windowshade[0]);
+    b=b_archhade;
+    b_len = sizeof(b_archhade)/sizeof(b_archhade[0]);
  }
 	else 
  {
--- a/Src/Winamp/Pledit.cpp
+++ b/Src/Winamp/Pledit.cpp
@ -1,4 +1,4 @@
-#include <windowsx.h>
+#include <archx.h>

 #include "Main.h"
 #include "ipc_pe.h"
--- a/Src/Winamp/SA.cpp
+++ b/Src/Winamp/SA.cpp
@ -236,7 +236,7 @@ static DWORD WINAPI bivis_thread(void *none)
 				{
 					int a = in_getouttime();
 					int t = config_sa;
-					//if ((config_windowshade&&config_mw_open) && t == 1) t=4;
+					//if ((config_archhade&&config_mw_open) && t == 1) t=4;
 					char *c = sa_get(a, t, data);

 					if (c)
--- a/Src/Winamp/SABuffer.cpp
+++ b/Src/Winamp/SABuffer.cpp
@ -1,7 +1,7 @@
 #include "SABuffer.h"
 #include "fft.h"
 #include "../nsutil/window.h"
-#include <windows.h>
+#include <arch.h>

 static const float const_1_div_128_ = 1.0f / 128.0f;  /* 8 bit multiplier */
 static const float const_1_div_32768_ = 1.0f / 32768.f; /* 16 bit multiplier */
--- a/Src/Winamp/Set.cpp
+++ b/Src/Winamp/Set.cpp
@ -111,7 +111,7 @@ static void doMyDirtyShitholeDockingShit(HWND myWnd, RECT newr, int sedge)  // -
 		else
 			diff = newr.right - oldr.right;

-		// move any windows docked to the bottom, bottom. recursively.
+		// move any arch docked to the bottom, bottom. recursively.
 		if (diff) for (int x = 0; ; x ++)
 		{
 			HWND dockwnd=NULL;
@ -243,7 +243,7 @@ static void doScreenDockMoveSubWindows(HWND myWnd, RECT newr, int whichedge)
 	if (myWnd == hMainWindow)
 		FixMainWindowRect(&oldr);

-	// move any windows docked to the bottom, bottom. recursively.
+	// move any arch docked to the bottom, bottom. recursively.
 	for (int x = 0; ; x ++)
 	{
 		HWND dockwnd=NULL;
@ -377,7 +377,7 @@ static void doScreenDock()
 	{
 		embedWindowState *p=embedwndlist;

-		// move any windows docked to the bottom, bottom. recursively.
+		// move any arch docked to the bottom, bottom. recursively.
 		for (int x = 0; ; x ++)
 		{
 			RECT vp;
@ -538,7 +538,7 @@ void set_eq_wnd_tooltip()
 						 {254,3,262,12},{264,3,272,12},
 						 // toggle eq, toggle auto, presets
 						 {14,18,39,30},{39,18,72,30},{217,18,261,30},
-						 // windowshade volume and pan
+						 // archhade volume and pan
 						 {61,3,162,11},{163,3,206,11}};
 			wchar_t buf[2048] = {0};
 			getStringW(IDS_TOOLTIPS,buf,2048);
@ -573,7 +573,7 @@ void set_eq_wnd_tooltip()
 				else if(x > 15){
 					if(config_eq_ws)
 					{
-						// re-use the main tooltip text and handle the 'toggle windowshade' and 'close' buttons as applicable
+						// re-use the main tooltip text and handle the 'toggle archhade' and 'close' buttons as applicable
 						wchar_t buf[2048], *p=buf;
 						getStringW(IDS_TOOLTIPS,buf,2048);
 						ti.lpszText=(wchar_t*)SendMessageW(hMainWindow,WM_WA_IPC,(x - 4),IPC_CB_GETTOOLTIPW);
@ -599,7 +599,7 @@ void set_eq_wnd_tooltip()
 					}
 				}
 				else if(x > 10){
-					// re-use the main tooltip text and handle the 'toggle windowshade' and 'close' buttons as applicable
+					// re-use the main tooltip text and handle the 'toggle archhade' and 'close' buttons as applicable
 					wchar_t buf[2048], *p=buf;
 					getStringW(IDS_TOOLTIPS,buf,2048);
 					ti.lpszText=(wchar_t*)SendMessageW(hMainWindow,WM_WA_IPC,x-11,IPC_CB_GETTOOLTIPW);
@ -671,7 +671,7 @@ void set_vid_wnd_tooltip()
 			{
 				if(!x)
 				{
-					// re-use the main tooltip text and handle the 'toggle windowshade' and 'close' buttons as applicable
+					// re-use the main tooltip text and handle the 'toggle archhade' and 'close' buttons as applicable
 					wchar_t buf2[2048], *p2=buf2;
 					getStringW(IDS_TOOLTIPS,buf2,2048);
 					for(int i = 0; i < 3; i++){
@ -721,7 +721,7 @@ void set_pl_wnd_tooltip()
 			RECT rs[]={{0,3,0,12},{0,3,0,12},
 					   // add, rem, sel, misc, list buttons
 					   {14,0,36,0},{43,0,65,0},{72,0,94,0},{101,0,123,0},{0},
-					   // windowshade mappings - order is out of kilt so it maps more easily to the string
+					   // archhade mappings - order is out of kilt so it maps more easily to the string
 					   // (open, previuos, play, pause, stop, next, time)
 					   {0},{0},{0},{0},{0},{0},{0},
 					   // up/down scroll buttons
@ -768,7 +768,7 @@ void set_pl_wnd_tooltip()
 			{
 				if(x < 2)
 				{
-					// re-use the main tooltip text and handle the 'toggle windowshade' and 'close' buttons as applicable
+					// re-use the main tooltip text and handle the 'toggle archhade' and 'close' buttons as applicable
 					wchar_t buf2[2048], *p2=buf2;
 					getStringW(IDS_TOOLTIPS,buf2,2048);
 					for(int i = 0; i < (x == 1 ? 1 : 3); i++){
@ -863,7 +863,7 @@ void set_main_wnd_tooltip()
 			{246+7,76+15,258+7,90+15},{132+7-4+1,60+14+15,132+7-4+22+1,60+14+15+16},
 			{7+8,15+72,7+31,15+91},{7+32,15+72,7+53,15+91},{7+54,15+72,7+77,15+91},{7+78,15+72,7+100,15+91},{7+101,15+72,7+123,15+91},
 			{36,26,96,39},{105,24,266,35},
-			// windowshade mappings - order is out of kilt so it maps more easily to the string
+			// archhade mappings - order is out of kilt so it maps more easily to the string
 			// (seeker, open, previuos, play, pause, stop, next, time)
 			{226,4,243,11},{216,2,224,11},{168,2,176,11},{177,2,186,11},{187,2,195,11},{196,2,204,11},{205,2,215,11},{125,4,157,10}};

@ -884,7 +884,7 @@ void set_main_wnd_tooltip()
 				}
 				else
 				{
-					if(config_windowshade)
+					if(config_archhade)
 					{
 						getStringW(IDS_TOOLTIPS,buf,2048);
 						p=buf;
@ -929,8 +929,8 @@ void set_aot(int dodockingstuff)
 		EstPLWindowRect(&newr);
 		doMyDirtyShitholeDockingShit(hPLWindow,newr,-1);

-		// check to see if any windows used to be docked to the right/bottom, and 
-		// if they did, move them to the bottom and any attached windows
+		// check to see if any arch used to be docked to the right/bottom, and 
+		// if they did, move them to the bottom and any attached arch

 		// this actually works OK!
 		if ((config_keeponscreen&1) && !g_fsapp) doScreenDock();
@ -1084,7 +1084,7 @@ void set_aot(int dodockingstuff)
 			hwdp=DeferWindowPos(hwdp,hMainWindow, HWND_NOTOPMOST, r.left, r.top, r.right-r.left, r.bottom-r.top, SWP_NOACTIVATE|(config_mw_open?0:SWP_NOMOVE|SWP_NOSIZE));
 		}

-		if (hEQWindow && !GetParent(hEQWindow)) // we check to see if the windows have no parent, for the gen_ff
+		if (hEQWindow && !GetParent(hEQWindow)) // we check to see if the arch have no parent, for the gen_ff
 		{
 			EstEQWindowRect(&r);
 			hwdp=DeferWindowPos(hwdp,hEQWindow, 0, r.left, r.top, r.right-r.left, r.bottom-r.top, SWP_NOACTIVATE|SWP_NOZORDER);
@ -1109,7 +1109,7 @@ void set_aot(int dodockingstuff)
 			hwdp=DeferWindowPos(hwdp,hVideoWindow, 0, r.left, r.top, r.right-r.left, r.bottom-r.top, SWP_NOCOPYBITS|SWP_NOACTIVATE|SWP_NOZORDER);
 		}

-		// traverse the embed windows
+		// traverse the embed arch
 		EnterCriticalSection(&embedcs);
 		{
 			embedWindowState *p=embedwndlist;
@ -1223,14 +1223,14 @@ void set_aot(int dodockingstuff)
 		else SetWindowRgn(hPLWindow,NULL,FALSE);
 	}*/

-	// refresh windows
+	// refresh arch
 	if (config_mw_open) InvalidateRect(hMainWindow,NULL,FALSE);
 	if (hEQWindow) InvalidateRect(hEQWindow,NULL,FALSE);
 	
 	if (hVisWindow)
 	{
 		int x,y,w,h;
-		if (config_windowshade)
+		if (config_archhade)
 		{
 			x=79;
 			y=5;
--- a/Src/Winamp/Skins.cpp
+++ b/Src/Winamp/Skins.cpp
@ -294,7 +294,7 @@ int Skin_GetRegionPointList( int eq, int **points, int **counts )
 {
 	if ( !eq )
 	{
-		if ( config_windowshade )
+		if ( config_archhade )
 		{
 			*points = skin_rgn_points_ws;
 			*counts = skin_rgn_numpoints_ws;
@ -432,7 +432,7 @@ static void Skin_LoadCursors( void )
 	}
 	cursor_loads[ N_CURSORS ] =
 	{
-		// main, non windowshade, start 0, end 8
+		// main, non archhade, start 0, end 8
 		{IDC_LRSCROLL,     L"VolBal.cur"},   // vol & bal
 		{IDC_LRSCROLL,     L"Posbar.cur"},   // pos
 		{IDC_NORMALCURSOR, L"WinBut.cur"},   //wshade
@ -442,7 +442,7 @@ static void Skin_LoadCursors( void )
 		{IDC_MOVEMAIN,     L"TitleBar.cur"}, // titelbar
 		{IDC_LRSCROLL,     L"SongName.cur"},
 		{IDC_NORMALCURSOR, L"Normal.cur"},
-		// main, windowshade, start 9, end 14
+		// main, archhade, start 9, end 14
 		{IDC_NORMALCURSOR, L"WinBut.cur"},   //wshade
 		{IDC_NORMALCURSOR, L"Min.cur"},      //min
 		{IDC_LRSCROLL,     L"WSPosbar.cur"}, // seeker
@ -456,7 +456,7 @@ static void Skin_LoadCursors( void )
 		{IDC_UDSCROLL,     L"PVScroll.cur"},
 		{IDC_RESIZE,       L"PSize.cur"},
 		{IDC_NORMALCURSOR, L"PNormal.cur"},
-		// playlist editor, windowshade, start 21 end 24
+		// playlist editor, archhade, start 21 end 24
 		{IDC_NORMALCURSOR, L"PWinBut.cur"},  //wshade
 		{IDC_DANGER,       L"PClose.cur"},   //close
 		{IDC_LRSCROLL,     L"PWSSize.cur"},  //size
--- a/Src/Winamp/TempFileCOM.h
+++ b/Src/Winamp/TempFileCOM.h
@ -1,6 +1,6 @@
 #pragma once
 #include <ocidl.h>
-#include <windows.h>
+#include <arch.h>

 class TempFileCOM : public IDispatch
 {
--- a/Src/Winamp/Ui.cpp
+++ b/Src/Winamp/Ui.cpp
@ -185,8 +185,8 @@ static int do_timedisplay()
 { 
 	if (mouse_type == -2)
 		return 0;
-	if (((!config_windowshade && inreg(36,26,96,39)) || 
-		(config_windowshade && inreg(129,3,129+28,3+6))
+	if (((!config_archhade && inreg(36,26,96,39)) || 
+		(config_archhade && inreg(129,3,129+28,3+6))
 		) && mouse_type == 1)
 	{
 		config_timeleftmode = !config_timeleftmode;
@ -211,7 +211,7 @@ static int do_timedisplay()
 		sa_setthread(config_sa);
 		return 1;
 	}
-	if (config_windowshade && inreg(78,4,116,11) && mouse_type == 1)
+	if (config_archhade && inreg(78,4,116,11) && mouse_type == 1)
 	{
 		config_sa++;
 		if (config_sa > 2) config_sa = 0;
@ -219,7 +219,7 @@ static int do_timedisplay()
 		sa_setthread(config_sa);
 		return 1;
 	}
-	if (config_windowshade && inreg(168,2,213+11,11) && mouse_type == 1)
+	if (config_archhade && inreg(168,2,213+11,11) && mouse_type == 1)
 	{
 		int which = 5 - (mouse_x < 215) - (mouse_x < 204) - (mouse_x < 195) - (mouse_x < 186) - (mouse_x < 176);
 		__do_buttons(which);
@ -340,7 +340,7 @@ static int do_titlebar()
 				omwr=mwr;
 				MoveRect(&mwr,mouse_x-clickx,mouse_y-clicky);

-				// snap to nondocked windows
+				// snap to nondocked arch
 				if ((!!config_snap) ^ (!!(mouse_stats & MK_SHIFT)))
 				{
 					embedWindowState *state=embedwndlist;
@ -359,7 +359,7 @@ static int do_titlebar()
 				}


-				// move docked windows the same amount the the main window has moved
+				// move docked arch the same amount the the main window has moved
 				{
 					embedWindowState *state=embedwndlist;
 					int movex=mwr.left-omwr.left;
@ -377,7 +377,7 @@ static int do_titlebar()

 				if ((!!config_snap) ^ (!!(mouse_stats & MK_SHIFT)))
 				{
-					// dock the attached windows to the screen
+					// dock the attached arch to the screen
 					if (config_keeponscreen&1) 
 					{
 						RECT omwr;
@ -444,7 +444,7 @@ static int do_titlebar()
 					} // kepponscreen&1


-					// dock the attached windows to the non attached windows
+					// dock the attached arch to the non attached arch
 					{
 						int x;
 						p = embedwndlist;
@ -519,7 +519,7 @@ static int do_titlebar()
 				} // if snapping

 				{
-					// calculate number of windows to move
+					// calculate number of arch to move
 					int deferred_move_count = 1;
 					if (do_titlebar_clicking&2 && !skip_eq) deferred_move_count ++;// final EQ positioning
 					if (do_titlebar_clicking&4 && !skip_pl) deferred_move_count ++;// final PE positioning
@ -578,7 +578,7 @@ static int do_titlebuttons()
 {
 	if (mouse_type == -2)
 		return 0;
-	if (inreg(254,3,262,12)) // windowshade button
+	if (inreg(254,3,262,12)) // archhade button
 	{
 		if (mouse_type == -1)
 		{
@ -947,7 +947,7 @@ static int do_posbar()
 	{
 		if (mouse_type == -1) 
 			do_posbar_active=0;
-		if (config_windowshade)
+		if (config_archhade)
 		{
 			a = mouse_x - 228;
 			a *= (257-29-10);
@ -973,10 +973,10 @@ static int do_posbar()
 		}
 	}
 	if (mouse_type == 1)
-		if ((inreg(11+7,58+15,256+7,66+15) && !config_windowshade) || (inreg(228,3,228+14,12) && config_windowshade) ) 
+		if ((inreg(11+7,58+15,256+7,66+15) && !config_archhade) || (inreg(228,3,228+14,12) && config_archhade) ) 
 		{
 			do_posbar_active=1;
-			if (!config_windowshade)
+			if (!config_archhade)
 			{
 				int curpos = 11 + 7 + 
 					((in_getouttime() * (257-10-29)) / in_getlength()) / 1000;
@ -988,7 +988,7 @@ static int do_posbar()

 		if (do_posbar_active) 
 		{
-			if (config_windowshade)
+			if (config_archhade)
 			{
 				a = mouse_x - 228;
 				a *= (257-29-10);
@ -1012,7 +1012,7 @@ static int do_posbar()
 				StringCchPrintfW(buf,256, L"%s: %02d:%02d/%02d:%02d (%d%%)",getStringW(IDS_SEEK_TO,seekStr,64),t/60,t%60,
 					a/60,a%60,(t*100)/(a?a:1)
 					);
-				if (config_windowshade) draw_time(t/60,t%60,0);
+				if (config_archhade) draw_time(t/60,t%60,0);
 				t=0;
 				draw_songname(buf,&t,-1);
 			}
@ -1032,7 +1032,7 @@ void ui_drawtime(int time_elapsed, int mode)
 	} 
 	else 
 	{
-		if (!do_posbar_active || !config_windowshade)
+		if (!do_posbar_active || !config_archhade)
 			draw_time(time_elapsed/60,time_elapsed%60,0);
 	}
 	if (playing) 
@ -1223,7 +1223,7 @@ void ui_handlecursor(void)
 		{5,3,17,13},//mainmenu
 		{0,0,275,13},// titelbar
 		{105,24,266,35},
-	}, b_windowshade[] = 
+	}, b_archhade[] = 
 	{
 		{254,3,262,12},//wshade
 		{244,3,253,12},//min
@ -1235,7 +1235,7 @@ void ui_handlecursor(void)
 		int x;

 		if (0 != (WS_DISABLED & GetWindowLongPtrW(hMainWindow, GWL_STYLE)))
-			x = (config_windowshade)	 ? 14 : 8;
+			x = (config_archhade)	 ? 14 : 8;
 		else
 		{
 			int b_len;
@ -1249,10 +1249,10 @@ void ui_handlecursor(void)
 			if (config_dsize) { mouse_x/=2; mouse_y/=2;}

 			RECT *b;
-			if (config_windowshade)	
+			if (config_archhade)	
 			{
-				b=b_windowshade;
-				b_len = sizeof(b_windowshade)/sizeof(b_windowshade[0]);
+				b=b_archhade;
+				b_len = sizeof(b_archhade)/sizeof(b_archhade[0]);
 			}
 			else 
 			{
@ -1262,7 +1262,7 @@ void ui_handlecursor(void)
 			for (x = 0; x < b_len; x ++) 
 				if (inreg(b[x].left,b[x].top,b[x].right,b[x].bottom)) break;

-			if (config_windowshade) x+=9;
+			if (config_archhade) x+=9;
 		}
 		

--- a/Src/Winamp/VIS.cpp
+++ b/Src/Winamp/VIS.cpp
@ -1,4 +1,4 @@
-#include <windowsx.h>
+#include <archx.h>

 #include "Main.h"
 #include "vis.h"
--- a/Src/Winamp/VideoAspectAdjuster.h
+++ b/Src/Winamp/VideoAspectAdjuster.h
@ -1,7 +1,7 @@
 #ifndef NULLSOFT_VIDEOASPECTADJUSTERH
 #define NULLSOFT_VIDEOASPECTADJUSTERH

-#include <windows.h>
+#include <arch.h>

 class VideoAspectAdjuster
 {
--- a/Src/Winamp/VideoOSD.cpp
+++ b/Src/Winamp/VideoOSD.cpp
@ -312,7 +312,7 @@ void IVideoOSD::Draw()

 		/*		ClientToScreen(parent, (LPPOINT)&fullr);
 				ClientToScreen(parent, ((LPPOINT)&fullr) + 1);
-				// transform coords from windows desktop coords (where 0,0==upper-left corner of the primary monitor)
+				// transform coords from arch desktop coords (where 0,0==upper-left corner of the primary monitor)
 				// to the coords for the monitor we're displaying on:
 				fullr.top -= m_mon_y;
 				fullr.left -= m_mon_x;
--- a/Src/Winamp/VideoOSD.h
+++ b/Src/Winamp/VideoOSD.h
@ -2,7 +2,7 @@
 #define NULLSOFT_VIDEOOSDH

 /* Video On Screen Display */
-#include <windows.h>
+#include <arch.h>

 #define NUM_WIDGETS 11

--- a/Src/Winamp/VideoOutput.cpp
+++ b/Src/Winamp/VideoOutput.cpp
@ -1,4 +1,4 @@
-#include <windowsx.h>
+#include <archx.h>

 #include "main.h"
 #include "VideoOutput.h"
--- a/Src/Winamp/VideoOutputChild.h
+++ b/Src/Winamp/VideoOutputChild.h
@ -3,7 +3,7 @@


 class SubsItem;
-#include <windows.h>
+#include <arch.h>
 #include "VideoAspectAdjuster.h"

 /*
--- a/Src/Winamp/WADrawDC.h
+++ b/Src/Winamp/WADrawDC.h
@ -1,5 +1,5 @@
 #pragma once
-#include <windows.h>
+#include <arch.h>

 class WADrawDC
 {
--- a/Src/Winamp/Winamp.rc
+++ b/Src/Winamp/Winamp.rc
@ -555,12 +555,12 @@ BEGIN
    GROUPBOX        "General Options",IDC_STATIC,4,3,256,79
    CONTROL         "Dim window titlebars when not in focus",IDC_HIGHLIGHT,
                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,15,138,10
-    CONTROL         "Dock skinned windows at",IDC_SNAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,28,95,10
+    CONTROL         "Dock skinned arch at",IDC_SNAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,28,95,10
    EDITTEXT        IDC_SNAPW,105,27,17,12,ES_AUTOHSCROLL | ES_NUMBER
    LTEXT           "pixels",IDC_STATIC,127,28,18,10,SS_CENTERIMAGE
-    CONTROL         "Enable smooth window resizing for resizeable skinned windows",IDC_CHECK2,
+    CONTROL         "Enable smooth window resizing for resizeable skinned arch",IDC_CHECK2,
                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,41,230,10
-    CONTROL         "Display tooltips in Winamp's windows",IDC_TTIPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,54,133,10
+    CONTROL         "Display tooltips in Winamp's arch",IDC_TTIPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,54,133,10
    CONTROL         "Use skinned mouse cursors",IDC_WA_CURSORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,67,103,10
    GROUPBOX        "Main Window Options",IDC_STATIC,4,85,256,86
    CONTROL         "Display playlist position in the song scroller",IDC_POS_IN_SONGTICKER,
@ -2493,7 +2493,7 @@ BEGIN
    IDS_P_SETUP_START2      "Removes Winamp items (added from the 'Add' button) from the Start Menu."
    IDS_P_SETUP_LANG        "This lets you change the current language pack for Winamp. The default is English."
    IDS_P_FT_DIRCONTEXT     "Checking this option makes Winamp add a 'play' and 'enqueue' option to directories in explorer."
-    IDS_P_DISP_SNAPW        "This value controls at what distance (in pixels) Winamp windows snap to each other and to the viewport."
+    IDS_P_DISP_SNAPW        "This value controls at what distance (in pixels) Winamp arch snap to each other and to the viewport."
    IDS_P_PLUG_VISDIR       "This button lets you select the directory for Winamp visualization plug-ins. The default is <yourwinampdirectory>\\Plugins"
    IDS_P_PLUG_DSPDIR       "This button lets you select the directory for Winamp DSP/effect plug-ins. The default is <yourwinampdirectory>\\Plugins"
    IDS_SELVISDIR           "Select visualization plug-in directory"
@ -2553,7 +2553,7 @@ BEGIN
    IDS_P_DISP_SYSTRAY      "Changes the icon that Winamp puts in the notification area."
    IDS_P_DISP_TASKBAR      "This check toggles whether Winamp is shown on the Windows Taskbar, like normal programs."
    IDS_P_DISP_SYSTRAYICON  "This check toggles whether Winamp has an icon in the notification area (near the clock)."
-    IDS_P_DISP_FREESIZE     "Allows Winamp Classic skinned resizable windows to be freely sized, instead of kept at 25x29 blocks"
+    IDS_P_DISP_FREESIZE     "Allows Winamp Classic skinned resizable arch to be freely sized, instead of kept at 25x29 blocks"
    IDS_P_CLASSICUI         "Classic Skin Options"
    IDS_P_DISP_HILITE       "If enabled this option lets Winamp dim its titlebar when inactive (normally enabled)"
    IDS_P_DISP_SNAP         "If enabled this option makes Winamp snap when you move it. You can temporarily toggle this option by holding down Shift while moving Winamp."
--- a/Src/Winamp/bm.cpp
+++ b/Src/Winamp/bm.cpp
@ -92,7 +92,7 @@ void Bookmark_WriteAsXML(const wchar_t *filename, int max)

 	if (fp && destFp)
 	{
-		//fprintf(destFp, "<?xml version=\"1.0\" encoding=\"windows-%u\"?>", GetACP());
+		//fprintf(destFp, "<?xml version=\"1.0\" encoding=\"arch-%u\"?>", GetACP());
 		fprintf(destFp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
 		fputs("<bookmarks>\n", destFp);
 		int x=0;
--- a/Src/Winamp/burn.cpp
+++ b/Src/Winamp/burn.cpp
@ -7,7 +7,7 @@
 **/
 #include "main.h"
 #include "resource.h"
-#include <windows.h>
+#include <arch.h>
 #include <strsafe.h>
 #include <time.h>
 #include <math.h>
--- a/Src/Winamp/commandLink.cpp
+++ b/Src/Winamp/commandLink.cpp
@ -3,7 +3,7 @@
 #include "./api.h"
 //#include "./guiObjects.h"

-#include <windows.h>
+#include <arch.h>
 #include <shlwapi.h>
 #include <commctrl.h>
 #include <strsafe.h>
--- a/Src/Winamp/config.h
+++ b/Src/Winamp/config.h
@ -124,7 +124,7 @@ CONFIG_EXT int config_si_wx DEF_VAL(0), config_si_wy DEF_VAL(0), config_si_width
 				config_si_autoshow DEF_VAL(1), config_si_autosize DEF_VAL(1), config_si_autohide DEF_VAL(1), config_si_open DEF_VAL(0);
 				*/
 CONFIG_EXT int config_plscrollsize DEF_VAL(1), config_plmw2xscroll DEF_VAL(1);
-CONFIG_EXT unsigned char config_windowshade,config_rofiob,config_eq_ws;
+CONFIG_EXT unsigned char config_archhade,config_rofiob,config_eq_ws;
 CONFIG_EXT unsigned char config_preamp DEF_VAL(31);
 CONFIG_EXT int config_pilp;
 CONFIG_EXT unsigned char config_randskin;
--- a/Src/Winamp/creddlg.h
+++ b/Src/Winamp/creddlg.h
@ -6,7 +6,7 @@
 #endif


-#include <windows.h>
+#include <arch.h>

 #define CDS_USEUSERNAME		0x0001	// szUser will be used to prepopulate user name field
 #define CDS_USEPASSWORD		0x0002	// szPassword will be used to prepopulate user name field
--- a/Src/Winamp/dispatchCallback.h
+++ b/Src/Winamp/dispatchCallback.h
@ -5,7 +5,7 @@
 #pragma once
 #endif

-#include <windows.h>
+#include <arch.h>
 #include <oleauto.h>
 #include <vector>

--- a/Src/Winamp/dpi.h
+++ b/Src/Winamp/dpi.h
@ -8,7 +8,7 @@ extern "C"
 {
 #endif

-#include <windows.h>
+#include <arch.h>

 // DPI awareness based on http://msdn.microsoft.com/en-US/library/dd464660.aspx
 // Definition: relative pixel = 1 pixel at 96 DPI and scaled based on actual DPI.
--- a/Src/Winamp/draw.cpp
+++ b/Src/Winamp/draw.cpp
@ -543,7 +543,7 @@ void draw_clear()
 	CopyToMainBM();
 	draw_playicon(2);
 	GetClientRect(hMainWindow,&r);
-	draw_tbar(config_hilite?(GetForegroundWindow() == hMainWindow?1:0):1, config_windowshade,0);
+	draw_tbar(config_hilite?(GetForegroundWindow() == hMainWindow?1:0):1, config_archhade,0);
 	update_area(0,0,r.right,r.bottom);
 }

--- a/Src/Winamp/draw.h
+++ b/Src/Winamp/draw.h
@ -1,7 +1,7 @@
 #ifndef NULLSOFT_DRAWH
 #define NULLSOFT_DRAWH

-#include <windows.h>
+#include <arch.h>
 #include "Main.h"
 #ifdef __cplusplus
 extern "C" {
--- a/Src/Winamp/draw_eq.cpp
+++ b/Src/Winamp/draw_eq.cpp
@ -13,7 +13,7 @@
 #include "WADrawDC.h"

 HDC eqMainDC, eqMainDC2;
-int enable_eq_windowshade_button;
+int enable_eq_archhade_button;
 HBITMAP eqMainBM = NULL, eqMainBM2 = NULL, eqExBM = NULL, eqOldmainBM2 = NULL, eqOldmainBM = NULL;

 extern "C" int eq_init = 0;
@ -29,7 +29,7 @@ void draw_eq_init()
 	eqMainDC = CreateCompatibleDC(screenHdc);
 	eqMainDC2 = CreateCompatibleDC(screenHdc);

-	enable_eq_windowshade_button = 2;
+	enable_eq_archhade_button = 2;

 	// attempt to use the ISO eq image (if present)
 	if(config_eq_frequencies!=EQ_FREQUENCIES_WINAMP)
@ -38,7 +38,7 @@ void draw_eq_init()
 	if (!eqMainBM)
 		eqMainBM = draw_LBitmap(NULL, L"eqmain.bmp");
 	if (eqMainBM)
-		enable_eq_windowshade_button = 0;
+		enable_eq_archhade_button = 0;
 	// and if that fails then we revert to the built in classic skin resources
 	else
 		eqMainBM = draw_LBitmap(MAKEINTRESOURCE((config_eq_frequencies==EQ_FREQUENCIES_WINAMP)?IDB_EQMAIN:IDB_EQMAIN_ISO), NULL);
@ -48,11 +48,11 @@ void draw_eq_init()
 	if (!eqExBM)
 	{
 		if (!skin_directory[0]) 
-			enable_eq_windowshade_button = 1;
+			enable_eq_archhade_button = 1;
 		eqExBM = draw_LBitmap(MAKEINTRESOURCE(IDB_EQEX), NULL);
 	}
 	else 
-		enable_eq_windowshade_button = 1;
+		enable_eq_archhade_button = 1;

 	draw_ReleaseDC(hMainWindow, screenHdc);
 		
@ -247,7 +247,7 @@ void draw_eq_tbutton(int b3, int wsb)
 	}
 	else
 	{
-		if (wsb && enable_eq_windowshade_button)
+		if (wsb && enable_eq_archhade_button)
 			BitBlt(eqMainDC, 254, 3, 9, 9, bmDC, 1, 38, SRCCOPY);
 		else
 			BitBlt(eqMainDC, 254, 3, 9, 9, eqMainDC, 254, 137, SRCCOPY);
--- a/Src/Winamp/draw_main.cpp
+++ b/Src/Winamp/draw_main.cpp
@ -18,7 +18,7 @@ void draw_tbuttons(int b1, int b2, int b3, int b4)
 	if (b1 != -1) BitBlt(mainDC,6,3,9,9,bmDC,0,b1*9,SRCCOPY);
 	if (b2 != -1) BitBlt(mainDC,244,3,9,9,bmDC,9,b2*9,SRCCOPY);
 	if (b3 != -1) BitBlt(mainDC,264,3,9,9,bmDC,18,b3*9,SRCCOPY);
-	if (b4 != -1) BitBlt(mainDC,254,3,9,9,bmDC,b4*9,config_windowshade?27:18,SRCCOPY);
+	if (b4 != -1) BitBlt(mainDC,254,3,9,9,bmDC,b4*9,config_archhade?27:18,SRCCOPY);
 	unsetSrcBM();
 	update_area(6,3,9,9);
 	update_area(243,3,274-243,9);
@ -108,12 +108,12 @@ void draw_paint(HWND hwnd)
 		draw_ReleaseDC(hMainWindow,screenHdc);
 }

-void draw_tbar( int active, int windowshade, int egg )
+void draw_tbar( int active, int archhade, int egg )
 {
 	int t[ 4 ] = { 0, 15, 29, 42 };
-	int l = t[ ( ( active ? 0 : 1 ) + ( windowshade ? 2 : 0 ) ) ];
+	int l = t[ ( ( active ? 0 : 1 ) + ( archhade ? 2 : 0 ) ) ];

-	if ( egg && !windowshade )
+	if ( egg && !archhade )
 		l = active ? 57 : 72;

 	if ( !draw_initted )
@ -125,7 +125,7 @@ void draw_tbar( int active, int windowshade, int egg )

 	unsetSrcBM();

-	if ( windowshade && config_windowshade )
+	if ( archhade && config_archhade )
 	{
 		int pos = 0;
 		draw_songname( L"", &pos, 0 );
@ -212,7 +212,7 @@ void draw_time(int minutes, int seconds, int clear) {
 		else
 			minutes=seconds=tlm=0;
 	}
-	if (config_windowshade)
+	if (config_archhade)
 		setSrcBM(fontBM);
 	else 
 	{
@ -225,7 +225,7 @@ void draw_time(int minutes, int seconds, int clear) {
 	}
 	if (clear) 
 	{
-		if (config_windowshade)
+		if (config_archhade)
 		{
 			BitBlt(mainDC,126,4,3,6,bmDC,142,0,SRCCOPY);
 			BitBlt(mainDC,130,4,3,6,bmDC,142,0,SRCCOPY);
@ -249,7 +249,7 @@ void draw_time(int minutes, int seconds, int clear) {
 	} 
 	else 
 	{
-		if (config_windowshade)
+		if (config_archhade)
 		{
 			if (tlm)
 			{
@ -311,7 +311,7 @@ void draw_time(int minutes, int seconds, int clear) {
 	{
 		draw_pe_timedisp(NULL, minutes,seconds,tlm,clear);
 	}
-	if (config_windowshade) update_area(125,4,32,6);
+	if (config_archhade) update_area(125,4,32,6);
 	else update_area(36,11+15,96-36+4,13);
 }

@ -449,7 +449,7 @@ void draw_positionbar(int position, int pressed) // position is 0-256
 			   bmDC,position+29,0,SRCCOPY);
 	unsetSrcBM();
 	update_rect(r);
-	if (config_windowshade)
+	if (config_archhade)
 	{
 		int a;
 		r.left = 226;
--- a/Src/Winamp/draw_sa.cpp
+++ b/Src/Winamp/draw_sa.cpp
@ -24,7 +24,7 @@ void draw_sa(unsigned char *values, int draw)
 	int dbx;
 	float spfo;

-	int ws=(config_windowshade&&config_mw_open);
+	int ws=(config_archhade&&config_mw_open);
 	int s = (config_dsize&&config_mw_open)?1:0;
 	unsigned char *gmem;

@ -96,9 +96,9 @@ void draw_sa(unsigned char *values, int draw)
 	}
 	else if (!s) // singlesize
 	{
-		if (!ws) // non windowshade singlesize
+		if (!ws) // non archhade singlesize
 		{
-			if (config_sa == 2) // non windowshade singlesize oscilliscope
+			if (config_sa == 2) // non archhade singlesize oscilliscope
 			{
 				gmem = specData + 76*2*14;
 				if (draw) 
@ -135,7 +135,7 @@ void draw_sa(unsigned char *values, int draw)
 					}
 				}
 			} 
-			else // non windowshade singlesize spectrum analyzer
+			else // non archhade singlesize spectrum analyzer
 			{
 				for (x = 0; x < 75; x ++)
 				{
@ -185,9 +185,9 @@ void draw_sa(unsigned char *values, int draw)
 				}
 			}
 		}
-		else // windowshade singlesize
+		else // archhade singlesize
 		{
-			if (config_sa==1)  // windowshade singlesize spectrum analyzer
+			if (config_sa==1)  // archhade singlesize spectrum analyzer
 			{
 				gmem = specData+76*2*(32-5);
 				for (x = 0; x < 37; x ++)
@ -240,7 +240,7 @@ void draw_sa(unsigned char *values, int draw)
 					if (t_bx[x*2] < 0) t_bx[x*2]=0;
 				}
 			}
-			else if (config_sa == 2)  // windowshade singlesize oscilliscope 
+			else if (config_sa == 2)  // archhade singlesize oscilliscope 
 			{
 				int wm=((config_safire>>2)&3);
 				int lastv=-5;
--- a/Src/Winamp/embwnd.cpp
+++ b/Src/Winamp/embwnd.cpp
@ -6,7 +6,7 @@
 ** Created:
 **/

-#include <windowsx.h>
+#include <archx.h>

 #include "main.h"
 #include "api.h"
@ -195,14 +195,14 @@ static void do_size( HWND hwnd, embedWindowState *state )
 			{
 				// TODO need to ensure this isn't used when freesize is disabled
 				//		isn't keeping track of the positions correctly on change
-				//		as some windows only part snap e.g. ml won't dock to edges or to bottom of main window
+				//		as some arch only part snap e.g. ml won't dock to edges or to bottom of main window
 				RECT rw = { 0 }, r = { 0 };
 				POINT pt = { x, y };
 				SendMessageW( hwnd, WM_USER + 0x101, 1, (LPARAM) &pt );

 				GetWindowRect( hwnd, &rw );

-				// trying to get classic skins to dock to other windows on resizing
+				// trying to get classic skins to dock to other arch on resizing
 				/*rw.left = state->r.left;
 				rw.top = state->r.top;
 				rw.right = state->r.left + x;
--- a/Src/Winamp/fullscreen.cpp
+++ b/Src/Winamp/fullscreen.cpp
@ -145,7 +145,7 @@ void restoreAOT()
 		// but for some reason I cannot figure out, it does not work unless WA has been clicked away and back in focus.
 		// if that hasn't been done, then reseting the flag on each window is necessary.
 		// now for the fun part: the above is true for classic skin, but in modern skins, reseting the flag
-		// on those windows actually prevents the player from coming back ONTOP! FUN!
+		// on those arch actually prevents the player from coming back ONTOP! FUN!
 		if (GetParent(hPLWindow) == NULL)
 		{
 			SetWindowPos(hPLWindow, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOOWNERZORDER);
--- a/Src/Winamp/ipc.cpp
+++ b/Src/Winamp/ipc.cpp
@ -554,9 +554,9 @@ LRESULT Main_OnIPC(HWND hwnd, int which, WPARAM data)
 			if (data == 1) g_mm_optionsbase_adj++;
 			return g_mm_optionsbase_adj;
 		case IPC_ADJUST_FFWINDOWSMENUPOS:
-			if (data == -1) g_mm_ffwindowsbase_adj--;
-			if (data == 1) g_mm_ffwindowsbase_adj++;
-			return g_mm_ffwindowsbase_adj;
+			if (data == -1) g_mm_ffarchbase_adj--;
+			if (data == 1) g_mm_ffarchbase_adj++;
+			return g_mm_ffarchbase_adj;
 		case IPC_ADJUST_FFOPTIONSMENUPOS:
 			if (data == -1) g_mm_ffoptionsbase_adj--;
 			if (data == 1) g_mm_ffoptionsbase_adj++;
@ -1208,7 +1208,7 @@ LRESULT Main_OnIPC(HWND hwnd, int which, WPARAM data)

 				EMBEDWND *pew = (EMBEDWND*)calloc(1, sizeof(EMBEDWND));
 				SetPropW(parms->me, EMBEDWND_PROPW, pew);
-				// this makes sure that JTFE won't mess with the windows
+				// this makes sure that JTFE won't mess with the arch
 				SetPropA(parms->me, "WnShdProcIgnore", (HANDLE)1);

 				// do this just incase it's missed off by the plug-in
@ -1414,7 +1414,7 @@ LRESULT Main_OnIPC(HWND hwnd, int which, WPARAM data)
 		case IPC_GET_PREVIOUS_PLITEM:
 			return -1;
 		case IPC_IS_WNDSHADE:
-			if (data == -1) return config_windowshade;
+			if (data == -1) return config_archhade;
 			if (data == IPC_GETWND_PE) return config_pe_height == 14;
 			if (data == IPC_GETWND_EQ) return config_eq_ws;
 			return 0;
--- a/Src/Winamp/main.cpp
+++ b/Src/Winamp/main.cpp
@ -7,7 +7,7 @@
 **/

 #include "main.h"
-#include <windowsx.h>
+#include <archx.h>

 #include "../Agave/Language/lang.h"
 #include <stdarg.h>
@ -101,7 +101,7 @@ int     g_need_titleupd = 0;
 int     g_need_infoupd = 0;
 int     g_SkinTop, g_BookmarkTop, g_LangTop;
 int     g_mm_optionsbase_adj = 0;       //used by IPC_ADJUST_OPTIONSMENUPOS
-int     g_mm_ffwindowsbase_adj = 0;       //used by IPC_ADJUST_FFWINDOWSMENUPOS
+int     g_mm_ffarchbase_adj = 0;       //used by IPC_ADJUST_FFWINDOWSMENUPOS
 int     g_mm_ffoptionsbase_adj = 0;       //used by IPC_ADJUST_FFOPTIONSMENUPOS
 int     g_has_video_plugin = 0;
 int     g_no_video_loaded = 0;       //filled in by in_init
@ -1485,7 +1485,7 @@ LRESULT CALLBACK Main_WndProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara
 					eggTyping = FALSE;
 					eggstat = !eggstat;
 					pos = 0;
-					draw_tbar( 1, config_windowshade, eggstat );
+					draw_tbar( 1, config_archhade, eggstat );
 				}
 			}
 			else
@ -1845,7 +1845,7 @@ again:
 				}
 				else if ( vn == APP_VERSION_NUM ) return lhwnd;
 			}
-			if ( failed ) return NULL; // no valid winamp windows, but one that fucked up
+			if ( failed ) return NULL; // no valid winamp arch, but one that fucked up

 			Sleep( 100 );
 		}
--- a/Src/Winamp/main_command.cpp
+++ b/Src/Winamp/main_command.cpp
@ -48,9 +48,9 @@ static void ToggleWindowShade_EQ()

 static void ToggleWindowShade_Main()
 {
-	config_windowshade = !config_windowshade;
+	config_archhade = !config_archhade;
 	set_aot(1);
-	draw_tbar(1, config_windowshade, eggstat);
+	draw_tbar(1, config_archhade, eggstat);
 	SendMessageW(hMainWindow, WM_TIMER, UPDATE_DISPLAY_TIMER + 4, 0);
 	sa_setthread(config_sa);
 }
@ -390,16 +390,16 @@ LRESULT Main_OnCommand(HWND hwnd, int wID, HWND hwndCtl, UINT codeNotify)
 	case WINAMP_EDIT_ID3:
 		if (FileName[0]) in_infobox(DIALOG_PARENT(hMainWindow), FileName);
 		return 1;
-	case WINAMP_OPTIONS_WINDOWSHADE_PL:         // toggle windowshade
+	case WINAMP_OPTIONS_WINDOWSHADE_PL:         // toggle archhade
 		ToggleWindowShade_PL();
 		return 1;
 	case WINAMP_OPTIONS_WINDOWSHADE_EQ:
 		ToggleWindowShade_EQ();
 		return 1;
-	case WINAMP_OPTIONS_WINDOWSHADE:         // toggle windowshade
+	case WINAMP_OPTIONS_WINDOWSHADE:         // toggle archhade
 		ToggleWindowShade_Main();
 		return 1;
-	case WINAMP_OPTIONS_WINDOWSHADE_GLOBAL:         // toggle windowshade
+	case WINAMP_OPTIONS_WINDOWSHADE_GLOBAL:         // toggle archhade
 		{
 			HWND hFocus = GetForegroundWindow();
 			if (hFocus == hPLWindow || IsChild(hFocus, hPLWindow))
@ -585,7 +585,7 @@ LRESULT Main_OnCommand(HWND hwnd, int wID, HWND hwndCtl, UINT codeNotify)
 			}
 		}
 		return 0;
-	case WINAMP_BUTTON1_SHIFT:         // button 1 (previous), sent from either windowshade,
+	case WINAMP_BUTTON1_SHIFT:         // button 1 (previous), sent from either archhade,
 	case WINAMP_BUTTON1_CTRL:          // keyboard shortcut, or normal buttons (ui.c)
 	case WINAMP_BUTTON1:
 		return (Main_OnButton1(hwnd, LOWORD(wID), hwndCtl, codeNotify));
--- a/Src/Winamp/main_display.cpp
+++ b/Src/Winamp/main_display.cpp
@ -19,7 +19,7 @@ int Main_OnGetText(wchar_t *text, int sizeCch)
 	return (int)sizeCch-rem;

 }
-// evil 256 color mode windows palette handling
+// evil 256 color mode arch palette handling
 int Main_OnQueryNewPalette(HWND hwnd)
 {
 	if (draw_hpal) { // hPal is NULL if we're in hicolor
@ -32,7 +32,7 @@ int Main_OnQueryNewPalette(HWND hwnd)
 	return 1;
 }

-// more 256 color windows palette handling
+// more 256 color arch palette handling
 int Main_OnPaletteChanged(HWND hwnd, HWND hwndPaletteChange)
 {
 	if (draw_hpal)
@ -75,7 +75,7 @@ int Main_OnDisplayChange(HWND hwnd)
 	draw_panbar(config_pan,0);
 	draw_songname(L"",&t,0);
 	draw_playicon(playing?paused?4:1:2);
-	draw_tbar(config_hilite?(GetForegroundWindow() == hMainWindow?1:0):1, config_windowshade,eggstat);
+	draw_tbar(config_hilite?(GetForegroundWindow() == hMainWindow?1:0):1, config_archhade,eggstat);

 	draw_monostereo(-1);
 	if (playing)
@ -86,7 +86,7 @@ int Main_OnDisplayChange(HWND hwnd)
 	draw_setnoupdate(0);
 	draw_songname(FileTitle,&ui_songposition,playing?in_getlength():PlayList_getcurrentlength());

-	// tell other windows
+	// tell other arch
 	if (IsWindow(hVideoWindow))
 		SendMessageW(hVideoWindow, WM_DISPLAYCHANGE,0,0);
 	if (IsWindow(hEQWindow))
--- a/Src/Winamp/main_init.cpp
+++ b/Src/Winamp/main_init.cpp
@ -55,7 +55,7 @@ BOOL InitApplication(HINSTANCE hInstance)  // register Winamp's window class, re
 #endif
 #endif

-	/* now register unicode windows */
+	/* now register unicode arch */
 	WNDCLASSW wcW = {0, };

 	wcW.style     = CS_DBLCLKS;
@ -220,7 +220,7 @@ void main_Create()
 	draw_playicon(2);
 	draw_clutterbar(0);
 	draw_monostereo(0);
-	draw_tbar(1, config_windowshade, 0);
+	draw_tbar(1, config_archhade, 0);
 	draw_setnoupdate(0);
 	InsertMenuW(GetSystemMenu(hMainWindow, FALSE), 0, MF_POPUP | MF_BYPOSITION, (UINT_PTR) main_menu, L"Winamp");
 	InsertMenu(GetSystemMenu(hMainWindow, FALSE), 1, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
--- a/Src/Winamp/main_mouse.cpp
+++ b/Src/Winamp/main_mouse.cpp
@ -123,45 +123,45 @@ int Main_OnRButtonUp(HWND hwnd, int x, int y, UINT flags)
 		if (ret) SendMessageW(hwnd, WM_COMMAND, ret, 0);
 		return 1;
 	}
-	else if ((!config_windowshade && x >= 36 && y >= 26 && x < 96 && y < 39) || 
-		(config_windowshade && x >= 129 && y >= 3 && x < 129+28 && y < 3+6))
+	else if ((!config_archhade && x >= 36 && y >= 26 && x < 96 && y < 39) || 
+		(config_archhade && x >= 129 && y >= 3 && x < 129+28 && y < 3+6))
 	{
 		hmenu = GetSubMenu(GetSubMenu(top_menu,3),1);
 		CheckMenuItem(hmenu,WINAMP_OPTIONS_ELAPSED,config_timeleftmode?MF_UNCHECKED:MF_CHECKED);
 		CheckMenuItem(hmenu,WINAMP_OPTIONS_REMAINING,config_timeleftmode?MF_CHECKED:MF_UNCHECKED);		
 	}
 	else if ((x >= 27 && y >= 40 && x < 99 && y < 61) ||
-		(config_windowshade && x >= 78 && y >= 4 && x < 116 && y < 11))
+		(config_archhade && x >= 78 && y >= 4 && x < 116 && y < 11))
 	{
 		hmenu=g_submenus_vis;
 	}
 	else if ((x >= 16 && y >= 88 && x < 37 && y < 106) ||				/// button 1
-		(config_windowshade && x >= 167 && y >= 3 && x < 176 && y < 12))
+		(config_archhade && x >= 167 && y >= 3 && x < 176 && y < 12))
 	{
 		hmenu = GetSubMenu(GetSubMenu(top_menu,3),2);
 	}
 	else if ((x >= 37 && y >= 88 && x < 62 && y < 106) ||				/// button 2
-		(config_windowshade && x >= 176 && y >= 3 && x < 186 && y < 12))
+		(config_archhade && x >= 176 && y >= 3 && x < 186 && y < 12))
 	{
 		hmenu = GetSubMenu(GetSubMenu(top_menu,3),3);
 	}
 	else if ((x >= 62 && y >= 88 && x < 89 && y < 106) ||				/// button 3
-		(config_windowshade && x >= 186 && y >= 3 && x < 196 && y < 12))
+		(config_archhade && x >= 186 && y >= 3 && x < 196 && y < 12))
 	{
 		hmenu = GetSubMenu(GetSubMenu(top_menu,3),4);
 	}
 	else if ((x >= 89 && y >= 88 && x < 107 && y < 106) ||				/// button 4
-		(config_windowshade && x >= 196 && y >= 3 && x < 206 && y < 12))
+		(config_archhade && x >= 196 && y >= 3 && x < 206 && y < 12))
 	{
 		hmenu = GetSubMenu(GetSubMenu(top_menu,3),5);
 	}
 	else if ((x >= 107 && y >= 88 && x < 130 && y < 106) ||				/// button 5
-		(config_windowshade && x >= 206 && y >= 3 && x < 216 && y < 12))
+		(config_archhade && x >= 206 && y >= 3 && x < 216 && y < 12))
 	{
 		hmenu = GetSubMenu(GetSubMenu(top_menu,3),6);
 	}
 	else if ((x >= 136 && y >= 89 && x < 158 && y < 105) ||				/// eject
-		(config_windowshade && x >= 215 && y >= 3 && x < 225 && y < 12))
+		(config_archhade && x >= 215 && y >= 3 && x < 225 && y < 12))
 	{
 		hmenu = GetSubMenu(GetSubMenu(top_menu,3),7);
 		UpdateAudioCDMenus(hmenu);
@ -208,10 +208,10 @@ int Main_OnLButtonDblClk(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFla
 		KillTimer(hwnd,666);
 		SendMessageW(hwnd,WM_CLOSE,0xDEADBEEF,0xDEADF00D);
 	}
-	else if (config_windowshade && nx <= 158 && nx >= 129 &&
+	else if (config_archhade && nx <= 158 && nx >= 129 &&
 		ny <= 10 && ny >= 5)
 		Main_OnLButtonDown(hwnd,0,x,y,keyFlags);
-	else if (config_windowshade && nx <= 213 && nx >= 168 &&
+	else if (config_archhade && nx <= 213 && nx >= 168 &&
 		ny <= 11 && ny >= 2)
 		Main_OnLButtonDown(hwnd,0,x,y,keyFlags);
 	else if (nx < 266 && nx > 117 && ny < 35 && ny > 24)
@ -219,9 +219,9 @@ int Main_OnLButtonDblClk(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFla
 		SendMessageW(hwnd,WM_COMMAND,WINAMP_EDIT_ID3,0);
 	}
 	else if ((nx >= 24 && ny >= 43 && nx < 24+76 && ny < 43+16) || 
-		(config_windowshade && nx >= 79 && ny >= 5 && nx < 79+38 && ny < 5+5))
+		(config_archhade && nx >= 79 && ny >= 5 && nx < 79+38 && ny < 5+5))
 	{
-		if (config_windowshade) config_sa = !config_sa;
+		if (config_archhade) config_sa = !config_sa;
 		else
 		{
 			config_sa+=2;
--- a/Src/Winamp/main_nonclient.cpp
+++ b/Src/Winamp/main_nonclient.cpp
@ -15,15 +15,15 @@ BOOL Main_OnNCActivate(HWND hwnd, BOOL fActive, HWND hwndActDeact, BOOL fMinimiz
 {
 	if (fActive == FALSE)
 	{
-		draw_tbar(config_hilite ? 0 : 1, config_windowshade, eggstat);
-		if (config_windowshade) SendMessageW(hwnd, WM_TIMER, UPDATE_DISPLAY_TIMER + 4, 0);
+		draw_tbar(config_hilite ? 0 : 1, config_archhade, eggstat);
+		if (config_archhade) SendMessageW(hwnd, WM_TIMER, UPDATE_DISPLAY_TIMER + 4, 0);
 	}
 	else
 	{
 		static int i;
-		if (i) draw_tbar(1, config_windowshade, eggstat);
+		if (i) draw_tbar(1, config_archhade, eggstat);
 		i = 1;
-		if (config_windowshade) SendMessageW(hwnd, WM_TIMER, UPDATE_DISPLAY_TIMER + 4, 0);
+		if (config_archhade) SendMessageW(hwnd, WM_TIMER, UPDATE_DISPLAY_TIMER + 4, 0);
 	}

 	return TRUE;
--- a/Src/Winamp/main_timer.cpp
+++ b/Src/Winamp/main_timer.cpp
@ -114,7 +114,7 @@ LRESULT Main_OnTimer(HWND hwnd, UINT id)
 				draw_playicon(8);
 		}
 	}
-	if (id == UPDATE_DISPLAY_TIMER + 1 && !config_minimized && !config_windowshade && config_mw_open)
+	if (id == UPDATE_DISPLAY_TIMER + 1 && !config_minimized && !config_archhade && config_mw_open)
 		if (config_autoscrollname&1)
 		{
 			ui_doscrolling();
--- a/Src/Winamp/manifest.xml
+++ b/Src/Winamp/manifest.xml
@ -47,8 +47,8 @@
     </application> 
 </compatibility>
 <asmv3:application>
-  <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+  <asmv3:archSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
   <dpiAware>true</dpiAware>
-  </asmv3:windowsSettings>
+  </asmv3:archSettings>
 </asmv3:application>
 </assembly>
--- a/Src/Winamp/manifest64.xml
+++ b/Src/Winamp/manifest64.xml
@ -46,8 +46,8 @@
     </application> 
 </compatibility>
 <asmv3:application>
-  <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+  <asmv3:archSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
   <dpiAware>true</dpiAware>
-  </asmv3:windowsSettings>
+  </asmv3:archSettings>
 </asmv3:application>
 </assembly></assembly>
--- a/Src/Winamp/menuv5.cpp
+++ b/Src/Winamp/menuv5.cpp
@ -307,13 +307,13 @@ int V5_Options_Menu(HWND hwnd, int x, int y, int width, int height)

 int V5_Windows_Menu(HWND hwnd, int x, int y, int width, int height)
 {
-	HMENU windows_menu = GetSubMenu(v5_top_menu, 3);
+	HMENU arch_menu = GetSubMenu(v5_top_menu, 3);
 	int flag = TPM_LEFTALIGN;
-	CheckMenuItem(windows_menu, WINAMP_OPTIONS_PLEDIT, config_pe_open ? MF_CHECKED : MF_UNCHECKED);
-	CheckMenuItem(windows_menu, WINAMP_VISPLUGIN, vis_running() ? MF_CHECKED : MF_UNCHECKED);
-	if (g_has_video_plugin) CheckMenuItem(windows_menu, WINAMP_OPTIONS_VIDEO, config_video_open ? MF_CHECKED : MF_UNCHECKED);
-	ensureInScreen(windows_menu, &x, &y, &flag, width, height);
-	DoTrackPopup(windows_menu, flag, x, y, hwnd);
+	CheckMenuItem(arch_menu, WINAMP_OPTIONS_PLEDIT, config_pe_open ? MF_CHECKED : MF_UNCHECKED);
+	CheckMenuItem(arch_menu, WINAMP_VISPLUGIN, vis_running() ? MF_CHECKED : MF_UNCHECKED);
+	if (g_has_video_plugin) CheckMenuItem(arch_menu, WINAMP_OPTIONS_VIDEO, config_video_open ? MF_CHECKED : MF_UNCHECKED);
+	ensureInScreen(arch_menu, &x, &y, &flag, width, height);
+	DoTrackPopup(arch_menu, flag, x, y, hwnd);
 	return 1;
 }

--- a/Src/Winamp/metrics.cpp
+++ b/Src/Winamp/metrics.cpp
@ -7,7 +7,7 @@
 **/

 #include "Main.h"
-#include <windows.h>
+#include <arch.h>
 #include "../nu/AutoUrl.h"
 #include <io.h>

--- a/Src/Winamp/ole.cpp
+++ b/Src/Winamp/ole.cpp
@ -119,7 +119,7 @@ public:
 			{
 				is_pe = 1;
 				if (pledit_poopie) pl_forceappend = 1; // if we got here because we're hosting the pledit, but not actually
-				// parenting it (meaning we are windowshaded playlist)
+				// parenting it (meaning we are archhaded playlist)
 			}
 			else
 			{
--- a/Src/Winamp/options_playlist.cpp
+++ b/Src/Winamp/options_playlist.cpp
@ -6,7 +6,7 @@
 ** Created:
 **/

-#include <windowsx.h>
+#include <archx.h>

 #include "Main.h"
 #include "resource.h"
--- a/Src/Winamp/paths.cpp
+++ b/Src/Winamp/paths.cpp
@ -6,7 +6,7 @@
 ** Created:
 **/

-#include <windows.h>
+#include <arch.h>
 #include <shlwapi.h>
 #include <strsafe.h>
 #include <shlobj.h>
--- a/Src/Winamp/random.h
+++ b/Src/Winamp/random.h
@ -2,7 +2,7 @@
 #define NULLSOFT_WINAMP_RANDOM_H

 #include "api_random.h"
-#include <windows.h> // for DWORD
+#include <arch.h> // for DWORD


 class Random : public api_random
--- a/Src/Winamp/registry.cpp
+++ b/Src/Winamp/registry.cpp
@ -124,7 +124,7 @@ BOOL config_setup_filetypes(int mode)
 	if (GetRegistrar(&registrar, !mode) == 0 && registrar)
 	{
 		wchar_t str[MAX_PATH+32] = {0}, langbuf[1024] = {0};
-		// droptarget stuff for windows XP
+		// droptarget stuff for arch XP
 		// clsid for open
 		registrar->RegisterGUID(programname, L"{46986115-84D6-459c-8F95-52DD653E532E}");
 		// clsid for enqueue
--- a/Src/Winamp/resource/TIPS.TXT
+++ b/Src/Winamp/resource/TIPS.TXT
@ -1,7 +1,7 @@
 Note that these keyboard shortcuts are a good starting point, but this list
 is far from complete. :)

-******* Keyboard Shortcuts (these can be used in most Winamp windows) *******
+******* Keyboard Shortcuts (these can be used in most Winamp arch) *******

 Key		Action
 -----------------------------------------------------------------------------
@ -18,7 +18,7 @@ Alt+E		Toggle Playlist Editor
 Alt+G		Toggle Graphical Equalizer
 Alt+V		Toggle Video Window
 Alt+L		Toggle Media Library
-Ctrl+Tab		Cycle through different Winamp windows
+Ctrl+Tab		Cycle through different Winamp arch
 Alt+S		Go to Skin selection
 Ctrl+P		Go to Preferences
 Alt+F		Open Main Menu
--- a/Src/Winamp/setup/httpgrab.h
+++ b/Src/Winamp/setup/httpgrab.h
@ -1,7 +1,7 @@
 #ifndef WINAMP_HTTP_GRAB_TEXT_HEADER
 #define WINAMP_HTTP_GRAB_TEXT_HEADER

-#include <windows.h>
+#include <arch.h>

 #define HTTPGRAB_USEWINDOWTEXT		0x0000
 #define HTTPGRAB_USESTATUSTEXT		0x0001
--- a/Src/Winamp/setup/ifc_setupjob.h
+++ b/Src/Winamp/setup/ifc_setupjob.h
@ -2,7 +2,7 @@
 #define WINAMP_IFC_SETUP_JOB_HEADER

 #include <bfc/dispatch.h>
-#include <windows.h>
+#include <arch.h>

 class NOVTABLE ifc_setupjob : public Dispatchable
 {
--- a/Src/Winamp/setup/ifc_setuppage.h
+++ b/Src/Winamp/setup/ifc_setuppage.h
@ -2,7 +2,7 @@
 #define WINAMP_IFC_SETUP_PAGE_HEADER

 #include <bfc/dispatch.h>
-#include <windows.h>
+#include <arch.h>

 class NOVTABLE ifc_setuppage : public Dispatchable
 {
--- a/Src/Winamp/setup/langutil.h
+++ b/Src/Winamp/setup/langutil.h
@ -1,7 +1,7 @@
 #ifndef WINAMP_SETUP_LANGUTIL_HEADER
 #define WINAMP_SETUP_LANGUTIL_HEADER

-#include <windows.h>
+#include <arch.h>
 #include "./loadimage.h"

 INT_PTR WADialogBoxParam(LPCWSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogFunc, LPARAM dwInitParam);
--- a/Src/Winamp/setup/loadimage.h
+++ b/Src/Winamp/setup/loadimage.h
@ -1,7 +1,7 @@
 #ifndef WINAMP_LOADIMAGE_HEADER
 #define WINAMP_LOADIMAGE_HEADER

-#include <windows.h>
+#include <arch.h>

 HBITMAP WALoadImage(HMODULE hMod, LPCWSTR pszSection, LPCWSTR pszImage, BOOL bPremult);
 HBITMAP WAResizeImage(HBITMAP hbmp, INT cx, INT cy, HBRUSH hbBk);
--- a/Src/Winamp/setup/postsetup.h
+++ b/Src/Winamp/setup/postsetup.h
@ -1,7 +1,7 @@
 #ifndef WINAMP_POSTSETUP_HEADER
 #define WINAMP_POSTSETUP_HEADER

-#include <windows.h>
+#include <arch.h>

 HWND CreateStatusWnd(HWND hwndParent, INT x, INT y, INT cx, INT cy);
 void SetStatusText();
--- a/Src/Winamp/setup/setup_api.h
+++ b/Src/Winamp/setup/setup_api.h
@ -1,7 +1,7 @@
 #ifndef WINAMP_SETUP_API_HEADER
 #define WINAMP_SETUP_API_HEADER

-#include <windows.h>
+#include <arch.h>


 class __declspec(novtable) WASetupAPI
--- a/Src/Winamp/setup/skininfo.h
+++ b/Src/Winamp/setup/skininfo.h
@ -1,7 +1,7 @@
 #ifndef WINAMP_SKININFO_HEADER
 #define WINAMP_SKININFO_HEADER

-#include <windows.h>
+#include <arch.h>

 #define SIF_COMMENT			0x01
 #define SIF_PREVIEW			0x02
--- a/Src/Winamp/setup/svc_setup.h
+++ b/Src/Winamp/setup/svc_setup.h
@ -5,7 +5,7 @@
 #include "./ifc_setuppage.h"
 #include "./ifc_setupjob.h"

-#include <windows.h>
+#include <arch.h>

 #ifdef __cplusplus
 extern "C" {
--- a/Src/Winamp/skinWindow.cpp
+++ b/Src/Winamp/skinWindow.cpp
@ -1,4 +1,4 @@
-#include <windowsx.h>
+#include <archx.h>

 #include "main.h"
 #include "./api.h"
--- a/Src/Winamp/strutil.cpp
+++ b/Src/Winamp/strutil.cpp
@ -6,7 +6,7 @@
 ** Created:
 **/

-#include <windows.h>
+#include <arch.h>
 #include <Shlwapi.h>
 #include "strutil.h"

--- a/Src/Winamp/util.cpp
+++ b/Src/Winamp/util.cpp
@ -7,7 +7,7 @@
 **/

 #include "main.h"
-#include <windows.h>
+#include <arch.h>
 #include "strutil.h"
 #include "../nu/ns_wc.h"
 #include "plush/plush.h"
--- a/Src/Winamp/vid_ddraw.cpp
+++ b/Src/Winamp/vid_ddraw.cpp
@ -191,7 +191,7 @@ bool DDrawVideoOutput::Paint(HWND hwnd)
 	ClientToScreen(hwnd, (LPPOINT)&r);
 	ClientToScreen(hwnd, ((LPPOINT)&r) + 1);

-	// transform coords from windows desktop coords (where 0,0==upper-left corner of box encompassing all monitors)
+	// transform coords from arch desktop coords (where 0,0==upper-left corner of box encompassing all monitors)
 	// to the coords for the monitor we're displaying on:
 	r.left -= m_mon_x;
 	r.right -= m_mon_x;
--- a/Src/Winamp/vid_gdi+.h
+++ b/Src/Winamp/vid_gdi+.h
@ -1,7 +1,7 @@
 #ifndef _VID_GDIPLUS_H_
 #define _VID_GDIPLUS_H_

-#include <windows.h>
+#include <arch.h>
 #include <gdiplus.h>
 #include "VideoOutputChild.h"

--- a/Src/Winamp/video.cpp
+++ b/Src/Winamp/video.cpp
@ -1,4 +1,4 @@
-#include <windowsx.h>
+#include <archx.h>

 #include "main.h"
 #include <ddraw.h>
@ -47,7 +47,7 @@ int widthOnOpen, heightOnOpen;
 #define VideoClassicHeight() 58
 static void VideoClose();

-/* Resizes the windows (parent and children) based on what the size of the video should be */
+/* Resizes the arch (parent and children) based on what the size of the video should be */
 static void SetVideoSize(int width, int height)
 {
 	if (m_videooutput && m_videooutput->is_fullscreen()) // fullscreen
@ -65,7 +65,7 @@ static void SetVideoSize(int width, int height)
 	}
 }

-/*	Resizes the windows (parent and children) based on what the size of the parent should be 	*/
+/*	Resizes the arch (parent and children) based on what the size of the parent should be 	*/
 void SetExteriorSize(int width, int height)
 {
 	// calculate interior size
@ -99,7 +99,7 @@ static void LayoutChildren(int width, int height)
 	}
 }

-/* Resizes the windows (parent and children) based on what the size of the parent should be
+/* Resizes the arch (parent and children) based on what the size of the parent should be
 Sets the position of the parent window */
 static void SetExteriorSizeAndPosition(int x, int y, int width, int height)
 {
--- a/Src/Winamp/wa_ipc.h
+++ b/Src/Winamp/wa_ipc.h
@ -19,7 +19,7 @@
 #ifndef _WA_IPC_H_
 #define _WA_IPC_H_

-#include <windows.h>
+#include <arch.h>
 #include <stddef.h>
 #if (_MSC_VER <= 1200)
 typedef int intptr_t;
@ -524,9 +524,9 @@ typedef struct {
 #define IPC_ENABLEDISABLE_ALL_WINDOWS 259 // 0xdeadbeef to disable
 /* (requires Winamp 2.9+)
 ** SendMessageW(hwnd_winamp,WM_WA_IPC,(enable?0:0xdeadbeef),IPC_ENABLEDISABLE_ALL_WINDOWS);
-** Sending this message with 0xdeadbeef as the param will disable all winamp windows and
-** any other values will enable all of the Winamp windows again. When disabled you won't
-** get any response on clicking or trying to do anything to the Winamp windows. If the
+** Sending this message with 0xdeadbeef as the param will disable all winamp arch and
+** any other values will enable all of the Winamp arch again. When disabled you won't
+** get any response on clicking or trying to do anything to the Winamp arch. If the
 ** taskbar icon is shown then you may still have control ;)
 */

@ -679,7 +679,7 @@ typedef struct {
 ** 0 : main popup menu (mapped to -1 in 5.x installs)
 ** 1 : main menubar file menu
 ** 2 : main menubar options menu
-** 3 : main menubar windows menu
+** 3 : main menubar arch menu
 ** 4 : main menubar help menu
 **
 ** For 5.x client versions the following values are valid (changed due to Modern skin support):
@ -688,8 +688,8 @@ typedef struct {
 **  1 : main menubar file menu
 **  2 : main menubar play menu
 **  3 : main menubar options menu
-**  4 : main menubar windows menu
-**  5 : main menubar windows help
+**  4 : main menubar arch menu
+**  5 : main menubar arch help
 **  6 : playlist editor menubar file menu
 **  7 : playlist editor menubar playlist menu
 **  8 : playlist editor menubar sort menu
@ -699,8 +699,8 @@ typedef struct {
 ** In all client versions, unsupported values will return NULL.
 **
 ** e.g. (psuedo code to add an item to the end of the main window 'view' menu)
-** HMENU windows_menu = (HMENU)SendMessageW(hwnd_winamp,WM_WA_IPC,4,IPC_GET_HMENU);
-** if(windows_menu)
+** HMENU arch_menu = (HMENU)SendMessageW(hwnd_winamp,WM_WA_IPC,4,IPC_GET_HMENU);
+** if(arch_menu)
 ** {
 **   // WA_MENUITEM_ID is obtained from IPC_REGISTER_WINAMP_IPCMESSAGE or a predefined
 **   // value if that api is not supported on the client version you are working with.
@ -709,7 +709,7 @@ typedef struct {
 **   MENUITEMINFO i = {sizeof(i), MIIM_ID | MIIM_STATE | MIIM_TYPE, MFT_STRING,
 **                     window_visible ? MFS_CHECKED : 0, WA_MENUITEM_ID};
 **   i.dwTypeData = "My Menu Item";
-**   InsertMenuItem(windows_menu, GetMenuItemCount(windows_menu), TRUE, &i);
+**   InsertMenuItem(arch_menu, GetMenuItemCount(arch_menu), TRUE, &i);
 ** }
 */

@ -1446,7 +1446,7 @@ typedef struct embedEnumStruct
 **
 ** Not sending this (ideally at the end of the window being moved) will likely cause issues
 ** with the placement and docking of the legacy window when Winamp's naitve and any embedded
-** windows are then moved.
+** arch are then moved.
 */


@ -1460,7 +1460,7 @@ typedef struct embedEnumStruct
 **
 ** or
 **
-** SnapWindowToAllWindows is used to allow the window to natively dock to other Winamp windows
+** SnapWindowToAllWindows is used to allow the window to natively dock to other Winamp arch
 ** RECT r;
 ** HWND myWnd = 0;
 ** void (*SnapWindowToAllWindows)(LPRECT outrc, HWND hwndNoSnap)=0;
@ -1971,8 +1971,8 @@ class ITrackSelector
 #define IPC_ADJUST_FFWINDOWSMENUPOS 606
 /* (requires Winamp 2.9+)
 ** int newpos=SendMessageW(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_FFWINDOWSMENUPOS);
-** This will move where Winamp expects the freeform windows in the menubar windows main
-** menu. This is useful if you wish to insert a menu item above extra freeform windows.
+** This will move where Winamp expects the freeform arch in the menubar arch main
+** menu. This is useful if you wish to insert a menu item above extra freeform arch.
 */


@ -1987,7 +1987,7 @@ class ITrackSelector
 #define IPC_ADJUST_FFOPTIONSMENUPOS 609
 /* (requires Winamp 2.9+)
 ** int newpos=SendMessageW(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_FFOPTIONSMENUPOS);
-** moves where winamp expects the freeform preferences item in the menubar windows main
+** moves where winamp expects the freeform preferences item in the menubar arch main
 ** menu. This is useful if you wish to insert a menu item above the preferences item.
 ** If you pass adjust_offset as zero then it will return the current offset without adjusting it.
 **
@ -2198,7 +2198,7 @@ typedef struct {
 /* (requires Winamp 5.0+)
 ** SendMessageW(hwnd_winamp,WM_WA_IPC,enabled,IPC_SETDRAWBORDERS);
 ** Set enabled to 1 to enable and 0 to disable drawing of the playlist editor and winamp
-** gen class windows (used by gen_ff to allow it to draw its own window borders).
+** gen class arch (used by gen_ff to allow it to draw its own window borders).
 */


@ -2545,7 +2545,7 @@ typedef struct {
 ** int ismainwnd = (HWND)SendMessageW(hwnd_winamp,WM_WA_IPC,(WPARAM)(HWND)test_wnd,IPC_FF_ISMAINWND);
 **
 ** This allows you to determine if the window handle passed to it is a modern skin main
-** window or not. If it is a main window or any of its windowshade variants then it will
+** window or not. If it is a main window or any of its archhade variants then it will
 ** return 1.
 **
 ** Because of the way modern skins are implemented, it is possible for this message to
@ -2554,7 +2554,7 @@ typedef struct {
 ** window and also a winshaded version.
 **
 ** The following code example below is one way of seeing how this api works since it will
-** enumerate all windows related to Winamp at the time and allows you to process as
+** enumerate all arch related to Winamp at the time and allows you to process as
 ** required when a detection happens.
 **
 **
@ -2564,7 +2564,7 @@ typedef struct {
 **
 **   if(SendMessageW(hwnd_winamp,WM_WA_IPC,(WPARAM)hwnd,IPC_FF_ISMAINWND)){
 **     // do processing in here 
-**     // or continue the enum for other main windows (if they exist)
+**     // or continue the enum for other main arch (if they exist)
 **     // and just comment out the line below
 **     return 0;
 **   }
@ -2578,7 +2578,7 @@ typedef struct {
 ** HWND wa2embed = (HWND)SendMessageW(hwnd_winamp,WM_WA_IPC,(WPARAM)(HWND)test_wnd,IPC_FF_GETCONTENTWND);
 **
 ** This will return the Winamp 2 window that is embedded in the window's container
-** i.e. if hwnd is the playlist editor windowshade hwnd then it will return the Winamp 2
+** i.e. if hwnd is the playlist editor archhade hwnd then it will return the Winamp 2
 **      playlist editor hwnd.
 **
 ** If no content is found such as the window has nothing embedded then this will return
--- a/Src/Winamp/whatsnew.txt
+++ b/Src/Winamp/whatsnew.txt
@ -188,7 +188,7 @@ Winamp 5.12
 * Fixed: [in_mp4] unicode metadata writing 
 * Fixed: [in_wm/in_dshow] mms:// streaming video playback
 * Fixed: [in_cdda] audio cd bitrate display
-* Fixed: [in_cdda] Sonic engine on 64bit windows (thanks STanger)
+* Fixed: [in_cdda] Sonic engine on 64bit arch (thanks STanger)
 * Fixed: lots of small bugs ...
 * Updated: Sonic CD Engine 2.2.50
 * Updated: libmp4v2 1.4.1
@ -352,7 +352,7 @@ Winamp 5.04:
 * added screenshots of classic/modern mode in installer
 * fixed MP3 bitrate calculation (in_mp3 was reporting incorrect lengths on some MP3s)
 * fixed incorrect length reporting on long WMA files
-* better fix for pledit/video windows showing up at startup when minimized
+* better fix for pledit/video arch showing up at startup when minimized
 * fixed db text bug when moving EQ sliders
 * upgraded MP3 encoding to LAME v3.96
 * fixed crash in WMA playback when using WMA v8 codecs
@ -384,7 +384,7 @@ Winamp 5.04:
 * added escaping of ", ', [ and ] in ml queries : uses %HH where HH is the hex char code (uses %% for '%')
 * added sdk support for multiple audio/video tracks in video input plugins (see wa_ipc.h for ITrackSelector class)
 * added multiple audio avi support (right click video window, select "Audio Tracks")
-* fixed multimonitor problem when toggling a windowshade on one monitor while playing a fullscreen video on the other
+* fixed multimonitor problem when toggling a archhade on one monitor while playing a fullscreen video on the other
 * added ML_IPC_EDITQUERY and ML_IPC_EDITVIEW
 * fixed pledit drawing bug under winxp/cleartype
 * fixed crash in id3 reading of zero byte files
@ -398,12 +398,12 @@ Winamp 5.04:
 * made ui:preferences global hotkey open the prefs to the previously opened page
 * fixed a few preferences cosmetic 'bugs'
 * modern skin updates :
-  - fixed windowshade repeat-track button state
+  - fixed archhade repeat-track button state
  - fixed scaling docked toolbars
  - fixed 5.03 assert on deletion of newGroupAsLayout()
-  - fixed floating video windows coordinates dropping to 0,0
+  - fixed floating video arch coordinates dropping to 0,0
  - fixed auto opaque when layouts are loaded already docked as toolbars
-  - fixed fadein/fadeout not used on notification window when linking all normal windows' 
+  - fixed fadein/fadeout not used on notification window when linking all normal arch' 
    alpha
  - fixed docked toolbars moving when some other window docked to them switches to an 
    alternative layout
@ -423,7 +423,7 @@ Winamp 5.04:
    resets to 4:3 proportions
  - fixed docking bug when using snapadjustleft
  - fixed buggy calculation of time display default width conflicting with right text alignment
-  - fixed windows moving after changing screen resolution
+  - fixed arch moving after changing screen resolution
  - fixed rare always on top desync with classic skins

 Winamp 5.03:
@ -448,7 +448,7 @@ Winamp 5.03:
 * updated VP6 video decoder to latest VP6.2 code
 * fixed crash when launching winamp with very long filenames from explorer
 * made registration dialog to appear in Explorer's taskbar when installing pro version
-* fixed pledit/video windows showing up at startup when minimized
+* fixed pledit/video arch showing up at startup when minimized
 * modern skins updates :
  - winamp modern skin now uses a 3 state repeat button: no repeat/repeat all/repeat track
  - added appplication desktop toolbars capabilities for layouts, add 
@ -458,7 +458,7 @@ Winamp 5.03:
    of course we continue to support 0.8 to 1.1)
  - (very) limited maki debugger (for now you can bring it up with invokeDebugger(); in a 
    script then use 'x' to continue and 'i' to trace into)
-  - fixed obscure capture problem with dragging windows
+  - fixed obscure capture problem with dragging arch
  - fixed rectrgn being forced to 1 in xml xuiobject buttons that are originally imageless
  - fixed hilited state not on after clicking on buttons while the mouse stays in area
  - fixed scripted onEnterArea/onLeaveArea not being always correctly called while mouse 
@ -569,7 +569,7 @@ Winamp 5.0rc11:

 Winamp 5.0rc10:
 * modern skin updates
-  - fixed coming back from windowshade closes video drawer
+  - fixed coming back from archhade closes video drawer
  - fixed user settings path assert
  - added 6 color themes (coagulated, peachy, bricks set, rosemary, blueberry and cream, qwayke)
 * added media library plugins configuration, support for type column
@ -660,15 +660,15 @@ Winamp 5.0rc0 11/16/03
  - fixed lack of shift/ctrl + next/play/stop/prev
  - fixed system.floattostring ignoring its ndigits param
  - fixed potential crash in text widgets that change display param dynamically
-  - fixed locked windows going offscreen (like nonstep avs) made then ignore offscreen since they are locked to a layout that checks its own position
+  - fixed locked arch going offscreen (like nonstep avs) made then ignore offscreen since they are locked to a layout that checks its own position
  - added nooffscreencheck="1" for layouts in case offscreen check needs to be disabled for a window
  - fixed assert in region
  - fixed crash color extraction from undefined container
  - fixed crash when not specifying a band parameter to an eqband object
  - fixed buttons onleavearea detection with nonstandard scales
-  - fixed notifier not showing minimized when "show in windowshade and when minimized" is on
+  - fixed notifier not showing minimized when "show in archhade and when minimized" is on
  - fixed freeform dropdownlists not closing
-  - fixed crash when a window is destroyed while moving all windows docked
+  - fixed crash when a window is destroyed while moving all arch docked
  - fixed system.playfile (base dir changed, has to be relative to skin in wa5, so filename is tweaked if it starts with "skin\nameofskin")


@ -710,7 +710,7 @@ Winamp 5.0beta4:
  - fixed custom opacity using window's opacity as a starting point (and reseting to it on cancel) when opacity is linked
  - fixed invisible window when loading desktopalpha skin with global transparency on
  - made jpgloading external
-  - fixed ctrl+f4 on main window or on pure wasabi windows (with no pl/ml/video, etc, ie: colorthemes) bringing up wa2 window
+  - fixed ctrl+f4 on main window or on pure wasabi arch (with no pl/ml/video, etc, ie: colorthemes) bringing up wa2 window
  - fixed notifier "disable in fullscreen"
  - fixed 0db/-12db not always working
  - fixed eq showing last modern skin eq settings after going back to classic and changing them
@ -720,7 +720,7 @@ Winamp 5.0beta4:
  - fixed equalizer menu entry being checked after closing config drawer without animation
  - fixed blank notifier when linked autoopacity on
  - fixed switching desktopalpha on a window that previously had forced transparency flag
-  - fixed clicking eq button on windowshade not repainting drawer when transparency on and eq wasn't the previously selected tab in config drawer and drawer animation is off (phew!)
+  - fixed clicking eq button on archhade not repainting drawer when transparency on and eq wasn't the previously selected tab in config drawer and drawer animation is off (phew!)
 * updated a lot of little menu shit
 * made better handling of no media in library
 * renamed a lot of directories to folders, library to media library.
@ -791,9 +791,9 @@ Winamp 5.0beta4 11/10/03:
 Winamp 5.0beta3 11/07/03:
 * modern skin updates :
  - new skin drop
-  - fixed winamp3 skins windowshade not being used :
-    - prevented use of autoclose="1" in < 1.0 skins (wasn't doing anything in 0.8 but breaks windowshades if used in 1.0)
-    - added autoavailable="0" to drawer's wndholder params (should _not_ be used in floating component windows unless you know what you are doing)
+  - fixed winamp3 skins archhade not being used :
+    - prevented use of autoclose="1" in < 1.0 skins (wasn't doing anything in 0.8 but breaks archhades if used in 1.0)
+    - added autoavailable="0" to drawer's wndholder params (should _not_ be used in floating component arch unless you know what you are doing)
  - fixed maddoubleclicks on switch to vis/video spawning undocked wnd
  - fixed vertical componentbucket sizes stuff, added functions to use as custom bucket
  - fixed freetype wrapped text draw
@ -829,7 +829,7 @@ Winamp 5.0beta3 11/07/03:
  - fixed double click in songtitle not cancelling text grab
  - added fullscreen flag for vis to send to winamp so that script can query if something (video or vis) is fullscreen, modified avs & milkdrop accordingly
  - linked auto100% opacity when layouts opacity is linked
-  - added link all windows opacity (and auto100%) & scale, added custom opacity dialog
+  - added link all arch opacity (and auto100%) & scale, added custom opacity dialog
  - made auto100% hold time configurable
  - made another mode where scale lock is just ignored, and everything is locked
  - fixed notifier being in the menu (added nomenu param to containers)
@ -886,7 +886,7 @@ Winamp 5.0beta2 10/23/03:
  - added popup menu on song title text
  - fixed how menus would overlap menubar buttons when skin was at the bottom of the screen
  - added "animate config drawer" in skin option menus
-  - fixed saving/restoring of classic main window and eq status, and classic pledit windowshade and size
+  - fixed saving/restoring of classic main window and eq status, and classic pledit archhade and size
  - fixed showing classic skins at startup when loading modern skin
  - even newer skin drop
  - added "temporary" to scale menu so that this locked scale thing is a bit more obvious
@ -900,7 +900,7 @@ Winamp 5.0beta2 10/23/03:
  - added checkbox for using operating system font rendering
  - gave a few fontsizes to bitmapfont text objects so overrides aren't all the same size
  - fixed crashbugs when not finding ttf fonts
-  - fixed empty playlist when starting with previously windowshaded playlist in classic mode but no xnf data
+  - fixed empty playlist when starting with previously archhaded playlist in classic mode but no xnf data
  - fixed crash when trying to update stuff while switching skin
  - fixed crossfader time going back to 0
  - added right to left ttf rendering
@ -908,7 +908,7 @@ Winamp 5.0beta2 10/23/03:
  - updated to freetype 2.1.5, fixes crash, #ifdefed out some unused stuff from it
  - fixed ctrl+w + alt+g guru
  - fixed alt+tab while resizing player
-  - fixed player leaving a resize trail when aborting resize above autorefresh-on-alt+tab windows
+  - fixed player leaving a resize trail when aborting resize above autorefresh-on-alt+tab arch
  - removed small kerning hack due to freetype 2.1.5 having much better native kerning
  - fixed equalizer xnf entry getting duplicated over and over
  - fixed small leak in font loader
@ -917,7 +917,7 @@ Winamp 5.0beta2 10/23/03:
  - added ability to not override bitmap font with ttf or use altfont on 7-bits character strings
  - fixed disabled widgets states
  - fixed typo in about box :)
-  - added ctrl+tab / ctrl+shift+tab to cycle thru windows
+  - added ctrl+tab / ctrl+shift+tab to cycle thru arch
 * made playlist showing deferred so startups looked cleaner with modern skins
 * fixed crash on skindir change in prefs
 * added "adding to burner" status window when using sendto/drag&drop to burner, for reassuring
@ -947,7 +947,7 @@ Winamp 5.0beta2 10/23/03:
 * made modern skin extracted by default, for speed
 * improved config dialogs for aac/mp3
 * made info viewer activated by button instead of slider 
-* made internet radio/tv page handle resize better (search doesnt get screwed on small windows)
+* made internet radio/tv page handle resize better (search doesnt get screwed on small arch)
 * cleaned up some labeling places
 * cleaned up ripping and burning UIs more
 * fixed library prefs radio buttons
@ -985,7 +985,7 @@ Winamp 5.0beta 10/13/03
  - removed move="1" for song title display on main window normal and shade modes
  - fixed click on beatvis that would sometime fail to toggle active status
  - added gammagroup xml param to vis objects
-  - made switching to windowshade open undocked video & vis when video is playing or vis is visible, docks back when coming back to normal mode
+  - made switching to archhade open undocked video & vis when video is playing or vis is visible, docks back when coming back to normal mode
 * made library able to update info on files that dont support tag writing when tag writing is checked
 * fixed burning bug when using certain .WAV output settings
 * enabled burning on multiple devices simultaneously
@ -1009,7 +1009,7 @@ Winamp 5.a10 10/10/03:
  - fixed right key in menubar when menu item selected is a submenu, fixed left when in a submenu, fixed right after hovering on an submenu item, phew!
  - fixed left/right keys seeking while in a menubar
  - fixed guru due to custom checkbox accessing nonexisting layouts because they are now dynamic, made them use configattributes
-  - made vis & video open undocked when in windowshade mode
+  - made vis & video open undocked when in archhade mode

 Winamp 5.0a9 10/08/03:
 * modern skin updates :
@ -1024,11 +1024,11 @@ Winamp 5.0a9 10/08/03:
  - added "equalizer" to popups, automatically opens the drawer and switches to the tab
  - added modern skin submenu to main popup menu/options
  - added attrib page for adding items to View menu via script (also show up in main popup)
-  - fixed auto move of docked layouts when switching to windowshade when original layout has snapadjust values
+  - fixed auto move of docked layouts when switching to archhade when original layout has snapadjust values
  - added action PE_ListOfLists for winshade playlist editors
  - added about box guid for lightning bolt click ({8DDA9D48-B915-4320-A888-831A1D837516})
  - added unlink="1" for layouts to remember their own position/size regardless of linkwidth/linkheight
-  - added windowshade for main & pledit, whoohoo Sven!
+  - added archhade for main & pledit, whoohoo Sven!
  - fixed checkmark for container entries in menu
  - added automatic discarding of unused bitmaps in memory, drops usage by 2 to 7mb (depending on skin) when not interacting with the ui
  - fixed huge leak in ttf rendering, that one was leaking 300k/s when the song title was scrolling ! uh oh...
@ -1038,7 +1038,7 @@ Winamp 5.0a9 10/08/03:
  - fixed small leak in gammamgr
  - reduced memory usage by ~3mb when using winamp modern skin.
  - fixed shutdown sequence
-  - fixed drawer locking up in closed position after detaching both windows via the menus
+  - fixed drawer locking up in closed position after detaching both arch via the menus
  - fixed vis or video poping up when clicking detach menu option while wnd is hidden
  - added option to bypass user defined drawer direction when window is going to get partially hidden after opening the drawer
  - added ability to set cfgattribute value "-" to make a separator in the custom skin option menus 
@ -1409,7 +1409,7 @@ Winamp 2.7:
  * new directsound output plug-in (very charming)
  * many optimizations and bugfixes to AVS - this version is quite fast.
  * faster playlist loading, faster playlist editting on large lists
-  * windowshade visualization now has spectrum analyzer instead of (crappy)
+  * archhade visualization now has spectrum analyzer instead of (crappy)
    VU meter.
  * improved that old issue of what happens when you delete the playing file 
    in the playlist.
@ -1450,7 +1450,7 @@ Winamp 2.63:
    files into WMA!

 Winamp 2.62:
-  * Generic dialog processing message loop so now TAB/etc... works in plugins dialog windows
+  * Generic dialog processing message loop so now TAB/etc... works in plugins dialog arch
  * Fix to Mjuice (memory leak that caused the full install to puke after many hours)
  * Winamp Visualization Studio updates.
  * Installer bitmap updates
@ -1660,7 +1660,7 @@ What's new in Winamp 2.03?
  * Improved shift selection in playlist editor
  * Better litestep support (litestep options in preferences/options, too)
  * Fixed a number of midi/cdda related bugs
-  * Added WM_GETMINMAXINFO handler, to improve maximize handling and windowshade
+  * Added WM_GETMINMAXINFO handler, to improve maximize handling and archhade
  * Fixed some stupid (but very annoying) window region related bugs. 
  * Nitrane 1.22, for better sounding MP3 playback
  * New 'No Playlist Advance' option for DJs and people who like to jump
@ -1678,9 +1678,9 @@ What's new in Winamp 2.02?
  * Ported some code to C in in_mod, for the upcoming 2.02 AXP build :)
 
 What's new in Winamp 2.01?
-  * made playlist editor use windows font.. resizable and skinnable
+  * made playlist editor use arch font.. resizable and skinnable
  * fixed a silly little hide-mainwindow-while-minimized-bug
-  * added up/down arrow (and mousewheel scroll) to plwindowshade
+  * added up/down arrow (and mousewheel scroll) to plarchhade
  * fixed silly position bar moving bug
  * made EQ's 0-lock more accurate
  * made title-scroll option 
@ -1771,7 +1771,7 @@ What's new in Winamp 1.91?
  * mod decoder: fixed priority setting bug
  * mod decoder: added better 8 bit support
  * mod decoder: new 'if title is empty' logic.. 
-  * mod decoder: added support  for windowshade vu
+  * mod decoder: added support  for archhade vu
  * mod decoder: added .669 support
  * mod decoder: new output system (optimized)
  * mod decoder: added waveform dsp plugin support
@ -1861,7 +1861,7 @@ What's new in Winamp 1.69?
 What's new in Winamp 1.666?
  * The Clutterbar.
  * Windowshade button 
-  * Seek-in-windowshade mode 
+  * Seek-in-archhade mode 
  * Added desktop icon adding to preferences
  * Added a nifty hq control on main interface. 
  * New ID3 tags 
@ -1877,7 +1877,7 @@ What's new in Winamp 1.666?
  * Changed format of seeking display status 
  * Added nifty "add to playlist from explorer" (more or less) option to 
    prefs/initial setup 
-  * Better VU meter with peak detection in windowshade 
+  * Better VU meter with peak detection in archhade 
  * More stable threading
  * Improved command line handling (supports relative pathnames better) 
  * Alternate volume setting mode (for some soundcards)
@ -1932,7 +1932,7 @@ What's new in Winamp 1.6 BETA?
        be pretty useful. 
  * Right-click context menus in main interface 
  * Improved ID3 tag editor w/ MPEG info display 
-  * VU meter and eject button in windowshade mode 
+  * VU meter and eject button in archhade mode 
  * Increased visualization accuracy 
  * Faster seeking 
  * More reliable HTTP streaming 
--- a/Src/Winamp/winampv6.vcxproj
+++ b/Src/Winamp/winampv6.vcxproj
@ -102,26 +102,26 @@
    </VcpkgInstalledDir>
    <VcpkgUseStatic>false</VcpkgUseStatic>
    <VcpkgConfiguration>Debug</VcpkgConfiguration>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
  </PropertyGroup>
  <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <VcpkgInstalledDir>
    </VcpkgInstalledDir>
    <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
  </PropertyGroup>
  <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <VcpkgInstalledDir>
    </VcpkgInstalledDir>
    <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
    <VcpkgConfiguration>Debug</VcpkgConfiguration>
  </PropertyGroup>
  <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <VcpkgInstalledDir>
    </VcpkgInstalledDir>
    <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
@ -146,7 +146,7 @@
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>comctl32.lib;winmm.lib;msacm32.lib;shlwapi.lib;Rpcrt4.lib;d3dx9d.lib;wininet.lib;fmtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-dbg;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-dbg;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
      <DelayLoadDLLs>msacm32.dll;nsutil.dll;comctl32.dll;comdlg32.dll;tataki.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@ -230,7 +230,7 @@ xcopy /Y /D /S "..\..\Qt\DLL_5.12_$(PlatformShortName)\$(Configuration)\" "..\..
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>comctl32.lib;winmm.lib;msacm32.lib;shlwapi.lib;Rpcrt4.lib;d3dx9d.lib;wininet.lib;fmtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-dbg;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-dbg;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
      <DelayLoadDLLs>msacm32.dll;nsutil.dll;comctl32.dll;comdlg32.dll;tataki.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@ -245,7 +245,7 @@ xcopy /Y /D /S "..\..\Qt\DLL_5.12_$(PlatformShortName)\$(Configuration)\" "..\..
      <Command>xcopy /Y /D /S $(OutDir)$(TargetName)$(TargetExt) ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\
 xcopy /Y /D /S $(IntDir)$(TargetName).pdb ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\

-xcopy /Y /D /S "..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-dbg\bin\fmtd.dll" "..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\"
+xcopy /Y /D /S "..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-dbg\bin\fmtd.dll" "..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\"

 xcopy /Y /D /S ..\resources\languages\*.wlz ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\Lang\

@ -307,7 +307,7 @@ xcopy /Y /D /S "..\resources\data\dsp_sps\*.sps" "..\..\Build\Winamp_$(PlatformS
      <AdditionalDependencies>comctl32.lib;winmm.lib;msacm32.lib;shlwapi.lib;Rpcrt4.lib;d3dx9.lib;wininet.lib;fmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
      <DelayLoadDLLs>msacm32.dll;nsutil.dll;comctl32.dll;comdlg32.dll;tataki.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-      <AdditionalLibraryDirectories>..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-rel;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-rel;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
@ -390,7 +390,7 @@ xcopy /Y /D /S "..\..\Qt\DLL_5.12_$(PlatformShortName)\$(Configuration)\" "..\..
      <AdditionalDependencies>comctl32.lib;winmm.lib;msacm32.lib;shlwapi.lib;Rpcrt4.lib;d3dx9.lib;wininet.lib;fmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
      <DelayLoadDLLs>msacm32.dll;nsutil.dll;comctl32.dll;comdlg32.dll;tataki.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-      <AdditionalLibraryDirectories>..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-rel;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-rel;..\external_dependencies\microsoft_directx_sdk_2010\Lib\$(PlatformShortName);..\nsutil\$(PlatformShortName)_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
@ -402,7 +402,7 @@ xcopy /Y /D /S "..\..\Qt\DLL_5.12_$(PlatformShortName)\$(Configuration)\" "..\..
    <PostBuildEvent>
      <Command>xcopy /Y /D /S $(OutDir)$(TargetName)$(TargetExt) ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\

-xcopy /Y /D /S "..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-windows-rel\bin\fmt.dll" "..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\"
+xcopy /Y /D /S "..\external_dependencies\vcpkg\buildtrees\fmt\$(PlatformShortName)-arch-rel\bin\fmt.dll" "..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\"

 xcopy /Y /D /S ..\resources\languages\*.wlz ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\Lang\