diff --git a/hayamiki_lib b/hayamiki_lib
index f9fd3a1..121721e 160000
--- a/hayamiki_lib
+++ b/hayamiki_lib
@@ -1 +1 @@
-Subproject commit f9fd3a1bf6706094fb2050a2ab138f0b38cac84d
+Subproject commit 121721e07c35734855b53c726dad24f43dfcae67
diff --git a/minimal_web_site.aproj b/minimal_web_site.aproj
index ebeb13a..9d40c74 100644
--- a/minimal_web_site.aproj
+++ b/minimal_web_site.aproj
@@ -146,35 +146,6 @@
     <Compile Include="xlib\web\color\color.anubis" />
     <Compile Include="xlib\web\controllers_web_site.anubis" />
     <Compile Include="xlib\web\counter.anubis" />
-    <Compile Include="xlib\web\CXM_common.anubis" />
-    <Compile Include="xlib\web\CXM_cookies.anubis" />
-    <Compile Include="xlib\web\CXM_dojo.anubis" />
-    <Compile Include="xlib\web\CXM_dropzone.anubis" />
-    <Compile Include="xlib\web\CXM_form.anubis" />
-    <Compile Include="xlib\web\CXM_generic_form.anubis" />
-    <Compile Include="xlib\web\CXM_generic_login.anubis" />
-    <Compile Include="xlib\web\CXM_generic_table.anubis" />
-    <Compile Include="xlib\web\CXM_html_tooltip.anubis" />
-    <Compile Include="xlib\web\CXM_https_get.anubis" />
-    <Compile Include="xlib\web\CXM_http_get.anubis" />
-    <Compile Include="xlib\web\CXM_http_get_common.anubis" />
-    <Compile Include="xlib\web\CXM_jquery.anubis" />
-    <Compile Include="xlib\web\CXM_json.anubis" />
-    <Compile Include="xlib\web\CXM_making_a_web_site.anubis" />
-    <Compile Include="xlib\web\CXM_mime.anubis" />
-    <Compile Include="xlib\web\CXM_multihost_http_server.anubis" />
-    <Compile Include="xlib\web\CXM_page_message.anubis" />
-    <Compile Include="xlib\web\CXM_style_tools.anubis" />
-    <Compile Include="xlib\web\CXM_urllib.anubis" />
-    <Compile Include="xlib\web\CXM_web_action.anubis" />
-    <Compile Include="xlib\web\CXM_web_arg_encode.anubis" />
-    <Compile Include="xlib\web\CXM_web_arg_utils.anubis" />
-    <Compile Include="xlib\web\CXM_web_dump.anubis" />
-    <Compile Include="xlib\web\CXM_web_session.anubis" />
-    <Compile Include="xlib\web\CXM_widgets.anubis" />
-    <Compile Include="xlib\web\CXM_xml_rpc.anubis" />
-    <Compile Include="xlib\web\CXM_xml_rpc_parser.anubis" />
-    <Compile Include="xlib\web\CXM_xml_rpc_types.anubis" />
     <Compile Include="xlib\web\fonts\awesome.anubis" />
     <Compile Include="xlib\web\jQuery\CXM_jquery_animate.anubis" />
     <Compile Include="xlib\web\jQuery\CXM_jquery_button.anubis" />
@@ -200,6 +171,7 @@
     <Compile Include="xlib\web\jQuery\ui-addon\datetimepicker.anubis" />
     <Compile Include="xlib\web\js_tools.anubis" />
     <Compile Include="xlib\web\load_content.anubis" />
+    <Compile Include="xlib\web\making_a_web_site.anubis" />
     <Compile Include="xlib\web\piwik\CXM_piwik.anubis" />
     <Compile Include="xlib\web\plugin\plugin.anubis" />
     <Compile Include="xlib\web\types\controllers_web_site.anubis" />
diff --git a/xlib b/xlib
index 1cfeb79..aa085f2 160000
--- a/xlib
+++ b/xlib
@@ -1 +1 @@
-Subproject commit 1cfeb79a339090ab869238df96d267371ea1118d
+Subproject commit aa085f22010ed8ef6db6be69e8a354322609dd01
diff --git a/xlib_language_web_controller.aproj b/xlib_language_web_controller.aproj
new file mode 100644
index 0000000..a0498eb
--- /dev/null
+++ b/xlib_language_web_controller.aproj
@@ -0,0 +1,39 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{7FD79E96-A0AA-4BE4-97D5-151C56A47059}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>xlib_web_controllers</RootNamespace>
+    <AssemblyName>xlib_language_web_controller</AssemblyName>
+    <StartupObject>xlib_web_controllers\language\controller.anubis</StartupObject>
+    <IncludePaths>./</IncludePaths>
+    <MakeUsedFile>False</MakeUsedFile>
+    <MakeUnusedFile>False</MakeUnusedFile>
+    <AnubiscVerbosity>False</AnubiscVerbosity>
+    <AnubisPath>c:\anubis\1.19\</AnubisPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DebugSymbols>False</DebugSymbols>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <Import Project="$(AnubisBinPath)\Anubis.Build.targets" />
+  <ItemGroup>
+    <Folder Include="xlib" />
+    <Folder Include="xlib\web_controllers" />
+    <Folder Include="xlib\web_controllers\language" />
+    <Folder Include="xlib_web_controllers" />
+    <Folder Include="xlib_web_controllers\language" />
+    <Compile Include="xlib\web_controllers\language\language_management.anubis" />
+    <Compile Include="xlib_web_controllers\language\controller.anubis" />
+    <Compile Include="xlib_web_controllers\language\language_web_action_name.anubis" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/xlib_language_web_controller.ide b/xlib_language_web_controller.ide
new file mode 100644
index 0000000..16ef8b5
--- /dev/null
+++ b/xlib_language_web_controller.ide
@@ -0,0 +1,18 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+# SharpDevelop 1.0.12.108
+Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "xlib_language_web_controller", "xlib_language_web_controller.aproj", "{7FD79E96-A0AA-4BE4-97D5-151C56A47059}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7FD79E96-A0AA-4BE4-97D5-151C56A47059}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FD79E96-A0AA-4BE4-97D5-151C56A47059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FD79E96-A0AA-4BE4-97D5-151C56A47059}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7FD79E96-A0AA-4BE4-97D5-151C56A47059}.Release|Any CPU.ActiveCfg = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/xlib_web_controllers.aproj b/xlib_web_controllers.aproj
deleted file mode 100644
index 1dfecd4..0000000
--- a/xlib_web_controllers.aproj
+++ /dev/null
@@ -1,39 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{7FD79E96-A0AA-4BE4-97D5-151C56A47059}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>xlib_web_controllers</RootNamespace>
-    <AssemblyName>xlib_web_controllers</AssemblyName>
-    <StartupObject>xlib_web_controllers\language\controller.anubis</StartupObject>
-    <IncludePaths>./</IncludePaths>
-    <MakeUsedFile>False</MakeUsedFile>
-    <MakeUnusedFile>False</MakeUnusedFile>
-    <AnubiscVerbosity>False</AnubiscVerbosity>
-    <AnubisPath>c:\anubis\1.19\</AnubisPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <Optimize>False</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <DebugSymbols>False</DebugSymbols>
-    <DebugType>None</DebugType>
-    <Optimize>True</Optimize>
-  </PropertyGroup>
-  <Import Project="$(AnubisBinPath)\Anubis.Build.targets" />
-  <ItemGroup>
-    <Folder Include="xlib" />
-    <Folder Include="xlib\web_controllers" />
-    <Folder Include="xlib\web_controllers\language" />
-    <Folder Include="xlib_web_controllers" />
-    <Folder Include="xlib_web_controllers\language" />
-    <Compile Include="xlib\web_controllers\language\language_management.anubis" />
-    <Compile Include="xlib_web_controllers\language\controller.anubis" />
-    <Compile Include="xlib_web_controllers\language\language_web_action_name.anubis" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/xlib_web_controllers.ide b/xlib_web_controllers.ide
deleted file mode 100644
index 9e85c92..0000000
--- a/xlib_web_controllers.ide
+++ /dev/null
@@ -1,18 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-# SharpDevelop 1.0.12.108
-Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "xlib_web_controllers", "xlib_web_controllers.aproj", "{7FD79E96-A0AA-4BE4-97D5-151C56A47059}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7FD79E96-A0AA-4BE4-97D5-151C56A47059}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7FD79E96-A0AA-4BE4-97D5-151C56A47059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7FD79E96-A0AA-4BE4-97D5-151C56A47059}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7FD79E96-A0AA-4BE4-97D5-151C56A47059}.Release|Any CPU.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-EndGlobal
--
libgit2 0.21.4