34 files changed, 401 insertions, 1606 deletions
diff --git a/plugins/!NotAdopted/NoHistory/NoHistory.aps b/plugins/!NotAdopted/NoHistory/NoHistory.aps
deleted file mode 100644
index fe588be222..0000000000
--- a/plugins/!NotAdopted/NoHistory/NoHistory.aps
+++ /dev/null
diff --git a/plugins/!NotAdopted/NoHistory/NoHistory.mdsp b/plugins/!NotAdopted/NoHistory/NoHistory.mdsp
deleted file mode 100644
index e0632f4335..0000000000
--- a/plugins/!NotAdopted/NoHistory/NoHistory.mdsp
+++ /dev/null
@@ -1,102 +0,0 @@
-[Project]
-name=NoHistory
-type=2
-defaultConfig=0
-
-
-[Debug]
-// compiler 
-workingDirectory=
-arguments=
-intermediateFilesDirectory=Debug
-outputFilesDirectory=Debug
-compilerPreprocessor=
-extraCompilerOptions=
-compilerIncludeDirectory=..\..\include
-noWarning=0
-defaultWarning=0
-allWarning=1
-extraWarning=0
-isoWarning=0
-warningsAsErrors=0
-debugType=1
-debugLevel=2
-exceptionEnabled=1
-runtimeTypeEnabled=1
-optimizeLevel=0
-
-// linker
-libraryPath=
-outputFilename=Debug\NoHistory.dll
-libraries=comctl32
-extraLinkerOptions=
-ignoreStartupFile=0
-ignoreDefaultLibs=0
-stripExecutableFile=0
-
-// archive
-extraArchiveOptions=
-
-//resource
-resourcePreprocessor=
-resourceIncludeDirectory=
-extraResourceOptions=
-
-[Release]
-// compiler 
-workingDirectory=
-arguments=
-intermediateFilesDirectory=Release
-outputFilesDirectory=Release
-compilerPreprocessor=
-extraCompilerOptions=
-compilerIncludeDirectory=..\..\include
-noWarning=0
-defaultWarning=0
-allWarning=1
-extraWarning=0
-isoWarning=0
-warningAsErrors=0
-debugType=0
-debugLevel=1
-exceptionEnabled=1
-runtimeTypeEnabled=1
-optimizeLevel=2
-
-// linker
-libraryPath=
-outputFilename=Release\NoHistory.dll
-libraries=comctl32
-extraLinkerOptions=
-ignoreStartupFile=0
-ignoreDefaultLibs=0
-stripExecutableFile=1
-
-// archive
-extraArchiveOptions=
-
-//resource
-resourcePreprocessor=
-resourceIncludeDirectory=
-extraResourceOptions=
-
-[Source]
-1=dllmain.cpp
-2=icons.cpp
-3=options.cpp
-[Header]
-1=common.h
-2=private.h
-3=resource.h
-4=icons.h
-5=IcoLib.h
-6=options.h
-[Resource]
-1=resource.rc
-[Other]
-[History]
-options.cpp,5214
-..\tipper\options.cpp,37783
-common.h,481
-private.h,701
-dllmain.cpp,2225
diff --git a/plugins/!NotAdopted/NoHistory/NoHistory_8.dsp b/plugins/!NotAdopted/NoHistory/NoHistory_8.dsp
deleted file mode 100644
index f348c2193a..0000000000
--- a/plugins/!NotAdopted/NoHistory/NoHistory_8.dsp
+++ /dev/null
@@ -1,238 +0,0 @@
-# Microsoft Developer Studio Project File - Name="NoHistory" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=NoHistory - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "NoHistory_8.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "NoHistory_8.mak" CFG="NoHistory - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "NoHistory - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "NoHistory - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "NoHistory - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "$(SolutionDir)$(ConfigurationName)"
-# PROP BASE Intermediate_Dir "$(ConfigurationName)"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "$(SolutionDir)$(ConfigurationName)"
-# PROP Intermediate_Dir "$(ConfigurationName)"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "NOHISTORY_EXPORTS" /D "_UNICODE" /YX /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "NOHISTORY_EXPORTS" /D "_UNICODE" /YX /GZ /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /out:"..\..\bin\$(ConfigurationName)\plugins\$(ProjectName).dll" /implib:"$(IntDir)/$(TargetName).lib" /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /out:"..\..\bin\$(ConfigurationName)\plugins\$(ProjectName).dll" /implib:"$(IntDir)/$(TargetName).lib" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "NoHistory - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "$(SolutionDir)$(ConfigurationName)"
-# PROP BASE Intermediate_Dir "$(ConfigurationName)"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release/"
-# PROP Intermediate_Dir "Release/"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "NOHISTORY_EXPORTS" /D "_UNICODE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /Zi /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "NOHISTORY_EXPORTS" /D "_MBCS" /YX /c
-# ADD BASE MTL /nologo /win32
-# ADD MTL /nologo /win32
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /out:"..\..\bin\$(ConfigurationName)\plugins\$(ProjectName).dll" /implib:"$(IntDir)/$(TargetName).lib" /pdbtype:sept /opt:ref /opt:icf
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /subsystem:windows /dll /debug /machine:IX86 /out:"../../bin/Release/plugins/nohistory.dll" /pdbtype:sept /opt:ref /opt:icf
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "NoHistory - Win32 Debug"
-# Name "NoHistory - Win32 Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-# Begin Source File
-
-SOURCE=.\dllmain.cpp
-DEP_CPP_DLLMA=\
-	"..\..\include\m_clc.h"\
-	"..\..\include\m_clist.h"\
-	"..\..\include\m_database.h"\
-	"..\..\include\m_icolib.h"\
-	"..\..\include\m_langpack.h"\
-	"..\..\include\m_message.h"\
-	"..\..\include\m_options.h"\
-	"..\..\include\m_protocols.h"\
-	"..\..\include\m_updater.h"\
-	"..\..\include\newpluginapi.h"\
-	"..\..\include\win2k.h"\
-	".\common.h"\
-	".\icons.h"\
-	".\options.h"\
-	".\private.h"\
-	
-NODEP_CPP_DLLMA=\
-	".\_plugins.h"\
-	".\_system.h"\
-	".\_utils.h"\
-	".\tatusmodes.h"\
-	
-
-!IF  "$(CFG)" == "NoHistory - Win32 Debug"
-
-# ADD CPP /nologo /GX /Yc"common.h" /GZ
-
-!ELSEIF  "$(CFG)" == "NoHistory - Win32 Release"
-
-# ADD CPP /nologo /GX /Yc"common.h"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\icons.cpp
-DEP_CPP_ICONS=\
-	"..\..\include\m_clc.h"\
-	"..\..\include\m_clist.h"\
-	"..\..\include\m_database.h"\
-	"..\..\include\m_icolib.h"\
-	"..\..\include\m_langpack.h"\
-	"..\..\include\m_message.h"\
-	"..\..\include\m_options.h"\
-	"..\..\include\m_protocols.h"\
-	"..\..\include\m_updater.h"\
-	"..\..\include\newpluginapi.h"\
-	"..\..\include\win2k.h"\
-	".\common.h"\
-	".\icons.h"\
-	
-NODEP_CPP_ICONS=\
-	".\_plugins.h"\
-	".\_system.h"\
-	".\_utils.h"\
-	".\tatusmodes.h"\
-	
-# End Source File
-# Begin Source File
-
-SOURCE=.\options.cpp
-DEP_CPP_OPTIO=\
-	"..\..\include\m_clc.h"\
-	"..\..\include\m_clist.h"\
-	"..\..\include\m_database.h"\
-	"..\..\include\m_icolib.h"\
-	"..\..\include\m_langpack.h"\
-	"..\..\include\m_message.h"\
-	"..\..\include\m_options.h"\
-	"..\..\include\m_protocols.h"\
-	"..\..\include\m_updater.h"\
-	"..\..\include\newpluginapi.h"\
-	"..\..\include\win2k.h"\
-	".\common.h"\
-	".\icons.h"\
-	".\options.h"\
-	
-NODEP_CPP_OPTIO=\
-	".\_plugins.h"\
-	".\_system.h"\
-	".\_utils.h"\
-	".\tatusmodes.h"\
-	
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;inc;xsd"
-# Begin Source File
-
-SOURCE=.\common.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\icons.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\options.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\private.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-# Begin Source File
-
-SOURCE=.\history_clear.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\history_disabled.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\history_enabled.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\NoHistory.rc
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\private.rc
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.rc
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/plugins/!NotAdopted/NoHistory/NoHistory_8.dsw b/plugins/!NotAdopted/NoHistory/NoHistory_8.dsw
deleted file mode 100644
index c1d5efa0ad..0000000000
--- a/plugins/!NotAdopted/NoHistory/NoHistory_8.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "NoHistory"=.\NoHistory_8.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/plugins/!NotAdopted/NoHistory/NoHistory_8.ncb b/plugins/!NotAdopted/NoHistory/NoHistory_8.ncb
deleted file mode 100644
index fd1571b4d4..0000000000
--- a/plugins/!NotAdopted/NoHistory/NoHistory_8.ncb
+++ /dev/null
diff --git a/plugins/!NotAdopted/NoHistory/NoHistory_8.opt b/plugins/!NotAdopted/NoHistory/NoHistory_8.opt
deleted file mode 100644
index 8197d6a54f..0000000000
--- a/plugins/!NotAdopted/NoHistory/NoHistory_8.opt
+++ /dev/null
diff --git a/plugins/!NotAdopted/NoHistory/NoHistory_8.plg b/plugins/!NotAdopted/NoHistory/NoHistory_8.plg
deleted file mode 100644
index 6e89caaa6f..0000000000
--- a/plugins/!NotAdopted/NoHistory/NoHistory_8.plg
+++ /dev/null
@@ -1,48 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: NoHistory - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x409 /fo"Release/resource.res" "R:\miranda\mirandanewscr\plugins\NoHistory\resource.rc"" 
-Creating temporary file "S:\TEMP\RSP6ED.tmp" with contents
-[
-/nologo /MT /W3 /GX /Zi /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "NOHISTORY_EXPORTS" /D "_MBCS" /Fp"Release/NoHistory_8.pch" /Yc"common.h" /Fo"Release/" /Fd"Release/" /c 
-"R:\miranda\mirandanewscr\plugins\NoHistory\dllmain.cpp"
-]
-Creating command line "cl.exe @S:\TEMP\RSP6ED.tmp" 
-Creating temporary file "S:\TEMP\RSP6EE.tmp" with contents
-[
-/nologo /MT /W3 /GX /Zi /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "NOHISTORY_EXPORTS" /D "_MBCS" /Fp"Release/NoHistory_8.pch" /YX /Fo"Release/" /Fd"Release/" /c 
-"R:\miranda\mirandanewscr\plugins\NoHistory\icons.cpp"
-"R:\miranda\mirandanewscr\plugins\NoHistory\options.cpp"
-]
-Creating command line "cl.exe @S:\TEMP\RSP6EE.tmp" 
-Creating temporary file "S:\TEMP\RSP6EF.tmp" with contents
-[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"Release/nohistory.pdb" /debug /machine:IX86 /out:"Release/nohistory.dll" /implib:"Release/nohistory.lib" /pdbtype:sept /opt:ref /opt:icf 
-.\Release\dllmain.obj
-.\Release\icons.obj
-.\Release\options.obj
-.\Release\resource.res
-]
-Creating command line "link.exe @S:\TEMP\RSP6EF.tmp"
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-dllmain.cpp
-Compiling...
-icons.cpp
-options.cpp
-Linking...
-   Creating library Release/nohistory.lib and object Release/nohistory.exp
-
-
-
-<h3>Results</h3>
-nohistory.dll - 0 error(s), 0 warning(s)
-</pre>
-</body>
-</html>
diff --git a/plugins/!NotAdopted/NoHistory/NoHistory_8.sln b/plugins/!NotAdopted/NoHistory/NoHistory_8.sln
deleted file mode 100644
index 9bdfb770ea..0000000000
--- a/plugins/!NotAdopted/NoHistory/NoHistory_8.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NoHistory", "NoHistory_8.vcproj", "{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Debug|Win32.Build.0 = Debug|Win32
-		{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Release|Win32.ActiveCfg = Release|Win32
-		{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/plugins/!NotAdopted/NoHistory/NoHistory_8.vcproj b/plugins/!NotAdopted/NoHistory/NoHistory_8.vcproj
deleted file mode 100644
index 60599d558c..0000000000
--- a/plugins/!NotAdopted/NoHistory/NoHistory_8.vcproj
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject ProjectType="Visual C++" Version="7.00" Name="NoHistory" ProjectGUID="{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}" RootNamespace="NoHistory" Keyword="Win32Proj">
-  <Platforms>
-    <Platform Name="Win32" />
-  </Platforms>
-  <ToolFiles>
-  </ToolFiles>
-  <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1">
-      <Tool Name="VCPreBuildEventTool" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCWebServiceProxyGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NOHISTORY_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderThrough="common.h" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="4" DisableSpecificWarnings="4996" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" AdditionalDependencies="comctl32.lib" OutputFile="../../bin/$(ConfigurationName)/plugins/$(ProjectName).dll" LinkIncremental="2" GenerateDebugInformation="true" SubSystem="2" ImportLibrary="$(IntDir)/$(TargetName).lib" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCWebDeploymentTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="1" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCWebServiceProxyGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="../../include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NOHISTORY_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="2" PrecompiledHeaderThrough="common.h" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" DisableSpecificWarnings="4996" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" AdditionalDependencies="comctl32.lib" OutputFile="../../bin/$(ConfigurationName)/plugins/$(ProjectName).dll" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" ImportLibrary="$(IntDir)/$(TargetName).lib" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCWebDeploymentTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-  </Configurations>
-  <References>
-  </References>
-  <Files>
-    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-      <File RelativePath=".\dllmain.cpp">
-        <FileConfiguration Name="Debug|Win32">
-          <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1" />
-        </FileConfiguration>
-        <FileConfiguration Name="Release|Win32">
-          <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1" />
-        </FileConfiguration>
-      </File>
-      <File RelativePath=".\icons.cpp">
-      </File>
-      <File RelativePath=".\options.cpp">
-      </File>
-    </Filter>
-    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath=".\common.h">
-      </File>
-      <File RelativePath=".\icons.h">
-      </File>
-      <File RelativePath=".\options.h">
-      </File>
-      <File RelativePath=".\private.h">
-      </File>
-      <File RelativePath=".\resource.h">
-      </File>
-    </Filter>
-    <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-      <File RelativePath=".\history_clear.ico">
-      </File>
-      <File RelativePath=".\history_disabled.ico">
-      </File>
-      <File RelativePath=".\history_enabled.ico">
-      </File>
-      <File RelativePath=".\NoHistory.rc">
-        <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true">
-          <Tool Name="VCResourceCompilerTool" />
-        </FileConfiguration>
-        <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true">
-          <Tool Name="VCResourceCompilerTool" />
-        </FileConfiguration>
-      </File>
-      <File RelativePath=".\private.rc">
-        <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true">
-          <Tool Name="VCResourceCompilerTool" />
-        </FileConfiguration>
-        <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true">
-          <Tool Name="VCResourceCompilerTool" />
-        </FileConfiguration>
-      </File>
-      <File RelativePath=".\resource.rc">
-      </File>
-    </Filter>
-  </Files>
-  <Globals>
-  </Globals>
-</VisualStudioProject>
-\ No newline at end of file
diff --git a/plugins/!NotAdopted/NoHistory/NoHistory_8.vcproj.bak b/plugins/!NotAdopted/NoHistory/NoHistory_8.vcproj.bak
deleted file mode 100644
index c0fa6459f6..0000000000
--- a/plugins/!NotAdopted/NoHistory/NoHistory_8.vcproj.bak
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="NoHistory"
-	ProjectGUID="{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}"
-	RootNamespace="NoHistory"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NOHISTORY_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
-				OutputFile="../../bin/$(ConfigurationName)/plugins/$(ProjectName).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(IntDir)/$(TargetName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NOHISTORY_EXPORTS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
-				OutputFile="../../bin/$(ConfigurationName)/plugins/$(ProjectName).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(IntDir)/$(TargetName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\dllmain.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\icons.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\options.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\common.h"
-				>
-			</File>
-			<File
-				RelativePath=".\icons.h"
-				>
-			</File>
-			<File
-				RelativePath=".\options.h"
-				>
-			</File>
-			<File
-				RelativePath=".\private.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\history_clear.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\history_disabled.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\history_enabled.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\NoHistory.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\private.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\resource.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/plugins/!NotAdopted/NoHistory/NoHistory_9.sln b/plugins/!NotAdopted/NoHistory/NoHistory_9.sln
deleted file mode 100644
index 56a6c1ccc5..0000000000
--- a/plugins/!NotAdopted/NoHistory/NoHistory_9.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NoHistory", "NoHistory_9.vcproj", "{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Debug|Win32.Build.0 = Debug|Win32
-		{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Debug|x64.ActiveCfg = Debug|x64
-		{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Debug|x64.Build.0 = Debug|x64
-		{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Release|Win32.ActiveCfg = Release|Win32
-		{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Release|Win32.Build.0 = Release|Win32
-		{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Release|x64.ActiveCfg = Release|x64
-		{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/plugins/!NotAdopted/NoHistory/NoHistory_9.vcproj b/plugins/!NotAdopted/NoHistory/NoHistory_9.vcproj
deleted file mode 100644
index b4fd128feb..0000000000
--- a/plugins/!NotAdopted/NoHistory/NoHistory_9.vcproj
+++ /dev/null
@@ -1,539 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="NoHistory"
-	ProjectGUID="{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}"
-	RootNamespace="NoHistory"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NOHISTORY_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
-				OutputFile="../../bin/$(ConfigurationName)/plugins/$(ProjectName).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/$(TargetName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="../../include;../../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NOHISTORY_EXPORTS"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
-				OutputFile="../../bin/$(ConfigurationName)/plugins/$(ProjectName).dll"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/$(TargetName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)64"
-			IntermediateDirectory="$(ConfigurationName)64"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NOHISTORY_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
-				OutputFile="../../bin/$(ConfigurationName)/plugins/$(ProjectName).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/$(TargetName).lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)64"
-			IntermediateDirectory="$(ConfigurationName)64"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="../../include;../../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NOHISTORY_EXPORTS"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
-				OutputFile="../../bin/$(ConfigurationName)/plugins/$(ProjectName).dll"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/$(TargetName).lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\dllmain.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\icons.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\options.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\common.h"
-				>
-			</File>
-			<File
-				RelativePath=".\icons.h"
-				>
-			</File>
-			<File
-				RelativePath=".\options.h"
-				>
-			</File>
-			<File
-				RelativePath=".\private.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\history_clear.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\history_disabled.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\history_enabled.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\NoHistory.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\private.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\resource.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/plugins/!NotAdopted/NoHistory/icons.cpp b/plugins/!NotAdopted/NoHistory/icons.cpp
deleted file mode 100644
index b8fcddc70b..0000000000
--- a/plugins/!NotAdopted/NoHistory/icons.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "common.h"
-#include "icons.h"
-#include "resource.h"
-
-HICON hIconRemove, hIconKeep, hIconClear;
-HANDLE hIcoLibIconsChanged = 0;
-
-int ReloadIcons(WPARAM wParam, LPARAM lParam) {
-	hIconRemove = Skin_GetIcon(MODULE "_remove");
-	hIconKeep = Skin_GetIcon(MODULE "_keep");
-	hIconClear = Skin_GetIcon(MODULE "_clear");
-
-	return 0;
-}
-
-void InitIcons() {
-	if(ServiceExists(MS_SKIN2_ADDICON)) {
-		SKINICONDESC sid = {0};
-		sid.cbSize = sizeof(SKINICONDESC);
-
-		sid.pszSection = MODULE;
-
-#define AddIcon(x,y,z)																				\
-		sid.pszDescription = Translate(x);															\
-		sid.pszName = y;																			\
-		sid.pszDefaultFile = MODULE ".dll";															\
-		sid.hDefaultIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(z), IMAGE_ICON, 0, 0, 0);		\
-		CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);												\
-		sid.iDefaultIndex++;
-
-		AddIcon("Disable", MODULE "_remove", IDI_HREMOVE);
-		AddIcon("Enable", MODULE "_keep", IDI_HKEEP);
-		AddIcon("Clear", MODULE "_clear", IDI_HCLEAR);
-
-#undef	AddIcon
-
-		ReloadIcons(0, 0);
-
-		hIcoLibIconsChanged = HookEvent(ME_SKIN2_ICONSCHANGED, ReloadIcons);
-	} else {
-		hIconRemove = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_HREMOVE), IMAGE_ICON, 0, 0, 0);//LR_LOADTRANSPARENT | LR_LOADMAP3DCOLORS );
-		hIconKeep = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_HKEEP), IMAGE_ICON, 0, 0, 0);//LR_LOADTRANSPARENT | LR_LOADMAP3DCOLORS );
-		hIconClear = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_HCLEAR), IMAGE_ICON, 0, 0, 0);//LR_LOADTRANSPARENT | LR_LOADMAP3DCOLORS );
-	}
-
-}
-
-void DeinitIcons() {
-	if(hIcoLibIconsChanged) UnhookEvent(hIcoLibIconsChanged);
-	else {
-		DestroyIcon(hIconRemove);
-		DestroyIcon(hIconKeep);
-		DestroyIcon(hIconClear);
-	}
-}
diff --git a/plugins/!NotAdopted/NoHistory/private.aps b/plugins/!NotAdopted/NoHistory/private.aps
deleted file mode 100644
index 343dfb5165..0000000000
--- a/plugins/!NotAdopted/NoHistory/private.aps
+++ /dev/null
diff --git a/plugins/!NotAdopted/NoHistory/resource.aps b/plugins/!NotAdopted/NoHistory/resource.aps
deleted file mode 100644
index 5d9d5042ce..0000000000
--- a/plugins/!NotAdopted/NoHistory/resource.aps
+++ /dev/null
diff --git a/plugins/!NotAdopted/NoHistory/NoHistory.rc b/plugins/NoHistory/NoHistory.rc
index 485ca27bd6..485ca27bd6 100644
--- a/plugins/!NotAdopted/NoHistory/NoHistory.rc
+++ b/plugins/NoHistory/NoHistory.rc
diff --git a/plugins/NoHistory/NoHistory.vcxproj b/plugins/NoHistory/NoHistory.vcxproj
new file mode 100644
index 0000000000..4992dbd857
--- /dev/null
+++ b/plugins/NoHistory/NoHistory.vcxproj
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>NoHistory</ProjectName>
+    <ProjectGuid>{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}</ProjectGuid>
+    <RootNamespace>NoHistory</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NOHISTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Windows</SubSystem>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>../../include;../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NOHISTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;NOHISTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Windows</SubSystem>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;NOHISTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="icons.cpp" />
+    <ClCompile Include="options.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="common.h" />
+    <ClInclude Include="icons.h" />
+    <ClInclude Include="options.h" />
+    <ClInclude Include="private.h" />
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="history_clear.ico" />
+    <None Include="history_disabled.ico" />
+    <None Include="history_enabled.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="NoHistory.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ResourceCompile>
+    <ResourceCompile Include="private.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ResourceCompile>
+    <ResourceCompile Include="resource.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/plugins/NoHistory/NoHistory.vcxproj.filters b/plugins/NoHistory/NoHistory.vcxproj.filters
new file mode 100644
index 0000000000..1fa1822595
--- /dev/null
+++ b/plugins/NoHistory/NoHistory.vcxproj.filters
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="icons.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="options.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="icons.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="options.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="private.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="history_clear.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="history_disabled.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="history_enabled.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="NoHistory.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="private.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="resource.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/plugins/!NotAdopted/NoHistory/common.h b/plugins/NoHistory/common.h
index 4f113af9a4..060be9624a 100644
--- a/plugins/!NotAdopted/NoHistory/common.h
+++ b/plugins/NoHistory/common.h
@@ -24,7 +24,6 @@
 #include <m_icolib.h>
 
 #include <m_utils.h>
-#include "m_updater.h"
 
 #define MODULE						"NoHistory"
 #define DBSETTING_REMOVE			"RemoveHistory"
diff --git a/plugins/!NotAdopted/NoHistory/dllmain.cpp b/plugins/NoHistory/dllmain.cpp
index b60b77c7e7..2a76dc620a 100644
--- a/plugins/!NotAdopted/NoHistory/dllmain.cpp
+++ b/plugins/NoHistory/dllmain.cpp
@@ -11,10 +11,7 @@
 // Common Plugin Stuff
 ///////////////////////////////////////////////
 HINSTANCE hInst;
-PLUGINLINK *pluginLink;
-
-struct MM_INTERFACE   mmi  = {sizeof(struct MM_INTERFACE  ),0};
-
+int hLangpack = 0;
 
 // add icon to srmm status icons
 static void SrmmMenu_UpdateIcon(HANDLE hContact);
@@ -49,13 +46,8 @@ PLUGININFOEX pluginInfo={
 	"mail@scottellis.com.au; nightfox@myied.org",
 	"� 2005 Scott Ellis; NightFox 2010",
 	"http://www.scottellis.com.au/",
-	0,		//not transient
-	0,		//doesn't replace anything built-in
-#ifdef _UNICODE
-{ 0xb25e8c7b, 0x292b, 0x495a, { 0x9f, 0xb8, 0xa4, 0xc3, 0xd4, 0xee, 0xb0, 0x4b } } // {B25E8C7B-292B-495a-9FB8-A4C3D4EEB04B}
-#else
-{ 0x12e5a39, 0x78a6, 0x4ccb, { 0xa6, 0x3f, 0x60, 0xfa, 0x7c, 0xb4, 0xd, 0xee } } // {012E5A39-78A6-4ccb-A63F-60FA7CB40DEE}
-#endif
+	UNICODE_AWARE,		//not transient
+	{ 0xb25e8c7b, 0x292b, 0x495a, { 0x9f, 0xb8, 0xa4, 0xc3, 0xd4, 0xee, 0xb0, 0x4b } } // {B25E8C7B-292B-495a-9FB8-A4C3D4EEB04B}
 };
 
 extern "C" BOOL APIENTRY DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) {
@@ -67,11 +59,6 @@ extern "C" __declspec (dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirand
 	return &pluginInfo;
 }
 
-extern "C" __declspec (dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) {
-	pluginInfo.cbSize = sizeof(PLUGININFO);
-	return (PLUGININFO*)&pluginInfo;
-}
-
 static const MUUID interfaces[] = {MIID_NOHISTORY, MIID_LAST};
 extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) {
 	return interfaces;
@@ -162,9 +149,8 @@ int OnDatabaseEventAdd(WPARAM wParam, LPARAM lParam) {
 
 
 INT_PTR ServiceClear(WPARAM wParam, LPARAM lParam) {
-	HANDLE hContact = (HANDLE)wParam;
-	
 	if(MessageBox(0, TranslateT("This operation will PERMANENTLY REMOVE all history for this contact.\nAre you sure you want to do this?"), TranslateT("Clear History"), MB_YESNO | MB_ICONWARNING) == IDYES) {
+		HANDLE hContact = (HANDLE)wParam;
 		RemoveAllEvents(hContact);
 	}
 	
@@ -181,11 +167,11 @@ int PrebuildContactMenu(WPARAM wParam, LPARAM lParam) {
 	CLISTMENUITEM mi = {0};
 	mi.cbSize = sizeof(mi);
 
-	mi.flags = CMIM_FLAGS;
+	mi.flags = CMIM_FLAGS|CMIF_TCHAR;
 	if(chat_room) mi.flags |= CMIF_HIDDEN;
 	else {
 		mi.flags |= (CMIM_NAME | CMIM_ICON);
-		mi.pszName = (remove ? Translate("Enable History") : Translate("Disable History"));
+		mi.ptszName = (remove ? LPGENT("Enable History") : LPGENT("Disable History"));
 		mi.hIcon = (remove ? hIconKeep : hIconRemove);
 	}
 	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuToggle, (LPARAM)&mi);
@@ -318,58 +304,24 @@ void SrmmMenu_Load()
 }
 
 int ModulesLoaded(WPARAM wParam, LPARAM lParam) {
-	if(ServiceExists(MS_UPDATE_REGISTER)) {
-		// register with updater
-		Update update = {0};
-		char szVersion[16];
-
-		update.cbSize = sizeof(Update);
-
-		update.szComponentName = pluginInfo.shortName;
-		update.pbVersion = (BYTE *)CreateVersionString(pluginInfo.version, szVersion);
-		update.cpbVersion = (int)strlen((char *)update.pbVersion);
-
-		update.szUpdateURL = UPDATER_AUTOREGISTER;
-		
-		// these are the three lines that matter - the archive, the page containing the version string, and the text (or data) 
-		// before the version that we use to locate it on the page
-		// (note that if the update URL and the version URL point to standard file listing entries, the backend xml
-		// data will be used to check for updates rather than the actual web page - this is not true for beta urls)
-		update.szBetaUpdateURL = "http://www.scottellis.com.au/miranda_plugins/no_history.zip";
-		update.szBetaVersionURL = "http://www.scottellis.com.au/miranda_plugins/ver_no_history.html";
-		update.pbBetaVersionPrefix = (BYTE *)"NoHistory plugin, version ";
-		
-		update.cpbBetaVersionPrefix = (int)strlen((char *)update.pbBetaVersionPrefix);
-
-		CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);
-	}
-
-	hServiceToggle = (HANDLE)CreateServiceFunction(MS_NOHISTORY_TOGGLE, ServiceToggle);
-	hServiceClear = (HANDLE)CreateServiceFunction(MS_NOHISTORY_CLEAR, ServiceClear);
-	
 	InitIcons();
 	
 	// create contact menu item
 	CLISTMENUITEM mi = {0};
 	mi.cbSize = sizeof(mi);
-	mi.flags = CMIM_ALL;
+	mi.flags = CMIF_TCHAR;
 
 	mi.position = -300010;
-	mi.pszName = Translate("Disable History");
+	mi.ptszName = LPGENT("Disable History");
 	mi.pszService = MS_NOHISTORY_TOGGLE;
 	mi.hIcon = hIconRemove;
-	hMenuToggle = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi);
+	hMenuToggle = Menu_AddMainMenuItem(&mi);
 
 	mi.position = -300005;
-	mi.pszName = Translate("Clear History");
+	mi.ptszName = LPGENT("Clear History");
 	mi.pszService = MS_NOHISTORY_CLEAR;
 	mi.hIcon = hIconClear;
-	hMenuClear = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi);
-
-	hEventMenuPrebuild = HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PrebuildContactMenu);
-
-	// hooked so we can track events added to the database
-	hEventDbEventAdded = HookEvent(ME_DB_EVENT_ADDED, OnDatabaseEventAdd);
+	hMenuClear = Menu_AddMainMenuItem(&mi);
 	
 	// add icon to srmm status icons
 	SrmmMenu_Load();
@@ -379,37 +331,27 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) {
 
 
 HANDLE hModulesLoaded;
-extern "C" __declspec (dllexport) int Load(PLUGINLINK *link) {
-	pluginLink=link;
-
-	CallService( MS_SYSTEM_GET_MMI,	 0, (LPARAM)&mmi  );
-		
+extern "C" __declspec (dllexport) int Load() {
 	InitializeCriticalSection(&list_cs);
-
-	// fix for wrong module name - ugh
-	DBVARIANT dbv;
-	HANDLE hContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDFIRST, 0, 0 );
-	while ( hContact != NULL )
-	{
-		if(!DBGetContactSetting(hContact, "NoHostory", DBSETTING_REMOVE, &dbv)) {
-			if(dbv.type == DBVT_BYTE && dbv.bVal != 0)
-				DBWriteContactSettingByte(hContact, MODULE, DBSETTING_REMOVE, 1);
-			DBFreeVariant(&dbv);
-			DBDeleteContactSetting(hContact, "NoHostory", DBSETTING_REMOVE);
-		}
-		hContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDNEXT,( WPARAM )hContact, 0 );
-	}	
-	
-	INITCOMMONCONTROLSEX icex;
+	mir_getLP(&pluginInfo);
 
 	// Ensure that the common control DLL is loaded (for listview)
+	INITCOMMONCONTROLSEX icex;
 	icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
 	icex.dwICC  = ICC_LISTVIEW_CLASSES;
 	InitCommonControlsEx(&icex); 	
 	
 	InitOptions();
+
+	hEventMenuPrebuild = HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PrebuildContactMenu);
+	// hooked so we can track events added to the database
+	hEventDbEventAdded = HookEvent(ME_DB_EVENT_ADDED, OnDatabaseEventAdd);
 	// hook modules loaded
 	hModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);
+
+	hServiceToggle = CreateServiceFunction(MS_NOHISTORY_TOGGLE, ServiceToggle);
+	hServiceClear = CreateServiceFunction(MS_NOHISTORY_CLEAR, ServiceClear);
+
 	return 0;
 }
 
diff --git a/plugins/!NotAdopted/NoHistory/docs/licence_NoHistory.txt b/plugins/NoHistory/docs/licence_NoHistory.txt
index a391390f72..a391390f72 100644
--- a/plugins/!NotAdopted/NoHistory/docs/licence_NoHistory.txt
+++ b/plugins/NoHistory/docs/licence_NoHistory.txt
diff --git a/plugins/!NotAdopted/NoHistory/history_clear.ico b/plugins/NoHistory/history_clear.ico
index 1a95f86f20..1a95f86f20 100644
--- a/plugins/!NotAdopted/NoHistory/history_clear.ico
+++ b/plugins/NoHistory/history_clear.ico
diff --git a/plugins/!NotAdopted/NoHistory/history_disabled.ico b/plugins/NoHistory/history_disabled.ico
index 27225e24fb..27225e24fb 100644
--- a/plugins/!NotAdopted/NoHistory/history_disabled.ico
+++ b/plugins/NoHistory/history_disabled.ico
diff --git a/plugins/!NotAdopted/NoHistory/history_enabled.ico b/plugins/NoHistory/history_enabled.ico
index cee748347d..cee748347d 100644
--- a/plugins/!NotAdopted/NoHistory/history_enabled.ico
+++ b/plugins/NoHistory/history_enabled.ico
diff --git a/plugins/NoHistory/icons.cpp b/plugins/NoHistory/icons.cpp
new file mode 100644
index 0000000000..6bfff6a424
--- /dev/null
+++ b/plugins/NoHistory/icons.cpp
@@ -0,0 +1,49 @@
+#include "common.h"
+#include "icons.h"
+#include "resource.h"
+
+HICON hIconRemove, hIconKeep, hIconClear;
+HANDLE hIcoLibIconsChanged = 0;
+
+int ReloadIcons(WPARAM wParam, LPARAM lParam) {
+	hIconRemove	= Skin_GetIcon(MODULE "_remove");
+	hIconKeep	= Skin_GetIcon(MODULE "_keep");
+	hIconClear	= Skin_GetIcon(MODULE "_clear");
+
+	return 0;
+}
+
+void InitIcons() {
+		SKINICONDESC sid = {0};
+		sid.cbSize = sizeof(SKINICONDESC);
+
+		sid.ptszSection = _T(MODULE);
+		sid.flags  = SIDF_ALL_TCHAR;
+
+		TCHAR path[MAX_PATH]; 
+		GetModuleFileName(hInst,path,MAX_PATH);
+
+#define AddIcon(x,y,z)																				\
+		sid.ptszDescription = x;															\
+		sid.pszName = y;																			\
+		sid.ptszDefaultFile = path;															\
+		sid.hDefaultIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(z), IMAGE_ICON, 0, 0, 0);		\
+		Skin_AddIcon(&sid);												\
+		sid.iDefaultIndex++;																		
+
+		AddIcon(LPGENT("Disable"), MODULE "_remove", IDI_HREMOVE);
+		AddIcon(LPGENT("Enable"), MODULE "_keep", IDI_HKEEP);
+		AddIcon(LPGENT("Clear"), MODULE "_clear", IDI_HCLEAR);
+
+#undef	AddIcon
+
+		ReloadIcons(0, 0);
+
+		hIcoLibIconsChanged = HookEvent(ME_SKIN2_ICONSCHANGED, ReloadIcons);
+
+}
+
+void DeinitIcons() {
+	if(hIcoLibIconsChanged)
+		UnhookEvent(hIcoLibIconsChanged);
+}
diff --git a/plugins/!NotAdopted/NoHistory/icons.h b/plugins/NoHistory/icons.h
index 88fae4be67..88fae4be67 100644
--- a/plugins/!NotAdopted/NoHistory/icons.h
+++ b/plugins/NoHistory/icons.h
diff --git a/plugins/!NotAdopted/NoHistory/options.cpp b/plugins/NoHistory/options.cpp
index 7e73253613..45b2c876eb 100644
--- a/plugins/!NotAdopted/NoHistory/options.cpp
+++ b/plugins/NoHistory/options.cpp
@@ -5,18 +5,17 @@
 
 static void SetListGroupIcons(HWND hwndList,HANDLE hFirstItem,HANDLE hParentItem,int *groupChildCount)
 {
-	int typeOfFirst;
 	int iconOn = 1;
 	int childCount = 0;
 	int iImage;
-	HANDLE hItem,hChildItem;
+	HANDLE hItem;
 
-	typeOfFirst=SendMessage(hwndList,CLM_GETITEMTYPE,(WPARAM)hFirstItem,0);
+	int typeOfFirst=SendMessage(hwndList,CLM_GETITEMTYPE,(WPARAM)hFirstItem,0);
 	//check groups
 	if(typeOfFirst==CLCIT_GROUP) hItem=hFirstItem;
 	else hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hFirstItem);
 	while(hItem) {
-		hChildItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_CHILD,(LPARAM)hItem);
+		HANDLE hChildItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_CHILD,(LPARAM)hItem);
 		if(hChildItem) SetListGroupIcons(hwndList,hChildItem,hItem,&childCount);
 		if(iconOn && SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,0)==0) iconOn=0;
 		hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hItem);
@@ -37,15 +36,14 @@ static void SetListGroupIcons(HWND hwndList,HANDLE hFirstItem,HANDLE hParentItem
 
 static void SetAllChildIcons(HWND hwndList,HANDLE hFirstItem,int iColumn,int iImage)
 {
-	int typeOfFirst,iOldIcon;
-	HANDLE hItem,hChildItem;
+	HANDLE hItem;
 
-	typeOfFirst=SendMessage(hwndList,CLM_GETITEMTYPE,(WPARAM)hFirstItem,0);
+	int typeOfFirst=SendMessage(hwndList,CLM_GETITEMTYPE,(WPARAM)hFirstItem,0);
 	//check groups
 	if(typeOfFirst==CLCIT_GROUP) hItem=hFirstItem;
 	else hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hFirstItem);
 	while(hItem) {
-		hChildItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_CHILD,(LPARAM)hItem);
+		HANDLE hChildItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_CHILD,(LPARAM)hItem);
 		if(hChildItem) SetAllChildIcons(hwndList,hChildItem,iColumn,iImage);
 		hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hItem);
 	}
@@ -53,7 +51,7 @@ static void SetAllChildIcons(HWND hwndList,HANDLE hFirstItem,int iColumn,int iIm
 	if(typeOfFirst==CLCIT_CONTACT) hItem=hFirstItem;
 	else hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hFirstItem);
 	while(hItem) {
-		iOldIcon=SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,iColumn);
+		int iOldIcon=SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,iColumn);
 		if(iOldIcon!=0xFF && iOldIcon!=iImage) SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,iImage));
 		hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hItem);
 	}
@@ -62,38 +60,31 @@ static void SetAllChildIcons(HWND hwndList,HANDLE hFirstItem,int iColumn,int iIm
 
 static void ResetListOptions(HWND hwndList)
 {
-	int i;
-
 	SendMessage(hwndList,CLM_SETBKBITMAP,0,(LPARAM)(HBITMAP)NULL);
 	SendMessage(hwndList,CLM_SETBKCOLOR,GetSysColor(COLOR_WINDOW),0);
 	SendMessage(hwndList,CLM_SETGREYOUTFLAGS,0,0);
 	SendMessage(hwndList,CLM_SETLEFTMARGIN,2,0);
 	SendMessage(hwndList,CLM_SETINDENT,10,0);
-	for(i=0;i<=FONTID_MAX;i++)
+	for(int i=0;i<=FONTID_MAX;i++)
 		SendMessage(hwndList,CLM_SETTEXTCOLOR,i,GetSysColor(COLOR_WINDOWTEXT));
 	SetWindowLong(hwndList,GWL_STYLE,GetWindowLong(hwndList,GWL_STYLE)|CLS_SHOWHIDDEN);
 }
 
 static void SetAllContactIcons(HWND hwndList)
 {
-	HANDLE hContact,hItem;
-	bool disabled;
-	char *proto;
-	bool chat_room;
-
-	hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0);
+	HANDLE hContact = db_find_first();
 	do {
-		proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
-		chat_room = (proto && DBGetContactSettingByte(hContact, proto, "ChatRoom", 0) != 0);
+		char *proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+		bool chat_room = (proto && DBGetContactSettingByte(hContact, proto, "ChatRoom", 0) != 0);
 
 		if(!chat_room) {
-			hItem=(HANDLE)SendMessage(hwndList,CLM_FINDCONTACT,(WPARAM)hContact,0);
+			HANDLE hItem=(HANDLE)SendMessage(hwndList,CLM_FINDCONTACT,(WPARAM)hContact,0);
 			if(hItem) {
-				disabled = (DBGetContactSettingByte(hContact, MODULE, DBSETTING_REMOVE, 0) == 1);
+				bool disabled = (DBGetContactSettingByte(hContact, MODULE, DBSETTING_REMOVE, 0) == 1);
 				SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(0,disabled?1:0));
 			}
 		}
-	} while(hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0));
+	} while(hContact = db_find_next(hContact));
 }
 
 
@@ -152,25 +143,23 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 						ResetListOptions(GetDlgItem(hwndDlg,IDC_LIST));
 						break;
 					case NM_CLICK:
-					{	HANDLE hItem;
+					{
 						NMCLISTCONTROL *nm=(NMCLISTCONTROL*)lParam;
 						DWORD hitFlags;
-						int iImage;
-						int itemType;
 
 						// Make sure we have an extra column
 						if (nm->iColumn == -1)
 							break;
 
 						// Find clicked item
-						hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_HITTEST, (WPARAM)&hitFlags, MAKELPARAM(nm->pt.x,nm->pt.y));
+						HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_HITTEST, (WPARAM)&hitFlags, MAKELPARAM(nm->pt.x,nm->pt.y));
 						// Nothing was clicked
 						if (hItem == NULL) break; 
 						// It was not a visbility icon
 						if (!(hitFlags & CLCHT_ONITEMEXTRA)) break;
 
 						// Get image in clicked column (0=none, 1=visible, 2=invisible)
-						iImage = SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn, 0));
+						int iImage = SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn, 0));
 						if (iImage == 0)
 							iImage=nm->iColumn + 1;
 						else
@@ -178,7 +167,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 								iImage = 0;
 
 						// Get item type (contact, group, etc...)
-						itemType = SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETITEMTYPE, (WPARAM)hItem, 0);
+						int itemType = SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETITEMTYPE, (WPARAM)hItem, 0);
 
 						// Update list, making sure that the options are mutually exclusive
 						if (itemType == CLCIT_CONTACT) { // A contact
@@ -206,24 +195,20 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				switch (((LPNMHDR)lParam)->code)
 				{
 					case PSN_APPLY:
-					{	HANDLE hContact,hItem;
-						int iImage;
-						char *proto;
-						bool chat_room;
-
-						hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0);
+					{
+						HANDLE hContact = db_find_first();
 						do {
-							proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
-							chat_room = (proto && DBGetContactSettingByte(hContact, proto, "ChatRoom", 0) != 0);
+							char *proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+							bool chat_room = (proto && DBGetContactSettingByte(hContact, proto, "ChatRoom", 0) != 0);
 					
 							if(!chat_room) {							
-								hItem=(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_FINDCONTACT,(WPARAM)hContact,0);
+								HANDLE hItem=(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_FINDCONTACT,(WPARAM)hContact,0);
 								if(hItem) {
-									iImage=SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(0,0));
+									int iImage=SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(0,0));
 									DBWriteContactSettingByte(hContact, MODULE, DBSETTING_REMOVE, iImage==1?1:0);
 								}
 							}
-						} while(hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0));
+						} while(hContact = db_find_next(hContact));
 
 						return TRUE;
 					}
@@ -242,24 +227,18 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 }
 
 int OptInit(WPARAM wParam, LPARAM lParam) {
-//#define OPTIONPAGE_OLD_SIZE2 60
-
 	OPTIONSDIALOGPAGE odp = { 0 };
 	odp.cbSize						= sizeof(odp);
-//	odp.cbSize						= OPTIONPAGE_OLD_SIZE2;
-	odp.flags						= ODPF_BOLDGROUPS;
-	//odp.flags |= ODPF_UNICODE;
+	odp.flags						= ODPF_BOLDGROUPS|ODPF_TCHAR;
 	odp.position					= -790000000;
 	odp.hInstance					= hInst;
 
 	odp.pszTemplate					= MAKEINTRESOURCEA(IDD_OPT);
-//	odp.pszTitle					= "NoHistory";
-	odp.pszTitle					= "History";
-	odp.pszGroup					= "Message Sessions";
-	odp.pszTab						= "Logging";
-	odp.nIDBottomSimpleControl		= 0;
+	odp.ptszTitle					= LPGENT("No History");
+	odp.ptszGroup					= LPGENT("History");
+	odp.ptszTab						= LPGENT("Logging");
 	odp.pfnDlgProc					= DlgProcOpts;
-	CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp );
+	Options_AddPage(wParam,&odp);
 
 	return 0;
 }
diff --git a/plugins/!NotAdopted/NoHistory/options.h b/plugins/NoHistory/options.h
index f9825ce47c..f9825ce47c 100644
--- a/plugins/!NotAdopted/NoHistory/options.h
+++ b/plugins/NoHistory/options.h
diff --git a/plugins/NoHistory/private.aps b/plugins/NoHistory/private.aps
new file mode 100644
index 0000000000..01a3adcadc
--- /dev/null
+++ b/plugins/NoHistory/private.aps
diff --git a/plugins/!NotAdopted/NoHistory/private.h b/plugins/NoHistory/private.h
index 535dd34c5f..535dd34c5f 100644
--- a/plugins/!NotAdopted/NoHistory/private.h
+++ b/plugins/NoHistory/private.h
diff --git a/plugins/!NotAdopted/NoHistory/private.rc b/plugins/NoHistory/private.rc
index 47bca39ef1..47bca39ef1 100644
--- a/plugins/!NotAdopted/NoHistory/private.rc
+++ b/plugins/NoHistory/private.rc
diff --git a/plugins/NoHistory/resource.aps b/plugins/NoHistory/resource.aps
new file mode 100644
index 0000000000..5d72483fde
--- /dev/null
+++ b/plugins/NoHistory/resource.aps
diff --git a/plugins/!NotAdopted/NoHistory/resource.h b/plugins/NoHistory/resource.h
index 5640d91b59..5640d91b59 100644
--- a/plugins/!NotAdopted/NoHistory/resource.h
+++ b/plugins/NoHistory/resource.h
diff --git a/plugins/!NotAdopted/NoHistory/resource.rc b/plugins/NoHistory/resource.rc
index 12fdadcee4..12fdadcee4 100644
--- a/plugins/!NotAdopted/NoHistory/resource.rc
+++ b/plugins/NoHistory/resource.rc