diff --git a/Policies/Touchin.mdpolicy.xml b/Policies/Touchin.mdpolicy.xml
index c78bff9..52a5413 100644
--- a/Policies/Touchin.mdpolicy.xml
+++ b/Policies/Touchin.mdpolicy.xml
@@ -9,6 +9,7 @@
     <VersionControlPolicy inheritsSet="Mono" />
     <CSharpFormattingPolicy inheritsSet="Mono" inheritsScope="text/x-csharp" scope="text/x-csharp">
       <IndentSwitchBody>True</IndentSwitchBody>
+      <AnonymousMethodBraceStyle>NextLine</AnonymousMethodBraceStyle>
       <PropertyBraceStyle>NextLine</PropertyBraceStyle>
       <PropertyGetBraceStyle>NextLine</PropertyGetBraceStyle>
       <PropertySetBraceStyle>NextLine</PropertySetBraceStyle>
@@ -17,6 +18,7 @@
       <EventRemoveBraceStyle>NextLine</EventRemoveBraceStyle>
       <StatementBraceStyle>NextLine</StatementBraceStyle>
       <ForBraceForcement>AddBraces</ForBraceForcement>
+      <WhileBraceForcement>AddBraces</WhileBraceForcement>
       <ElseNewLinePlacement>NewLine</ElseNewLinePlacement>
       <ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement>
       <CatchNewLinePlacement>NewLine</CatchNewLinePlacement>
@@ -101,59 +103,11 @@
           <IncludeInstanceMembers>True</IncludeInstanceMembers>
           <IncludeStaticEntities>True</IncludeStaticEntities>
         </NamingRule>
-        <NamingRule>
-          <Name>Static Readonly Fields</Name>
-          <AffectedEntity>ReadonlyField</AffectedEntity>
-          <VisibilityMask>Internal, Protected, Public</VisibilityMask>
-          <NamingStyle>PascalCase</NamingStyle>
-          <IncludeInstanceMembers>False</IncludeInstanceMembers>
-          <IncludeStaticEntities>True</IncludeStaticEntities>
-        </NamingRule>
         <NamingRule>
           <Name>Fields (Non Private)</Name>
-          <AffectedEntity>Field</AffectedEntity>
-          <VisibilityMask>Internal, Protected, Public</VisibilityMask>
-          <NamingStyle>PascalCase</NamingStyle>
-          <IncludeInstanceMembers>True</IncludeInstanceMembers>
-          <IncludeStaticEntities>True</IncludeStaticEntities>
-        </NamingRule>
-        <NamingRule>
-          <Name>ReadOnly Fields (Non Private)</Name>
-          <AffectedEntity>ReadonlyField</AffectedEntity>
-          <VisibilityMask>Internal, Protected, Public</VisibilityMask>
-          <NamingStyle>PascalCase</NamingStyle>
-          <IncludeInstanceMembers>True</IncludeInstanceMembers>
-          <IncludeStaticEntities>False</IncludeStaticEntities>
-        </NamingRule>
-        <NamingRule>
-          <Name>Fields (Private)</Name>
-          <AllowedPrefixes>
-            <String>_</String>
-            <String>m_</String>
-          </AllowedPrefixes>
           <AffectedEntity>Field, ReadonlyField</AffectedEntity>
-          <VisibilityMask>Private</VisibilityMask>
-          <NamingStyle>CamelCase</NamingStyle>
-          <IncludeInstanceMembers>True</IncludeInstanceMembers>
-          <IncludeStaticEntities>False</IncludeStaticEntities>
-        </NamingRule>
-        <NamingRule>
-          <Name>Static Fields (Private)</Name>
-          <AffectedEntity>Field</AffectedEntity>
-          <VisibilityMask>Private</VisibilityMask>
-          <NamingStyle>CamelCase</NamingStyle>
-          <IncludeInstanceMembers>False</IncludeInstanceMembers>
-          <IncludeStaticEntities>True</IncludeStaticEntities>
-        </NamingRule>
-        <NamingRule>
-          <Name>ReadOnly Fields (Private)</Name>
-          <AllowedPrefixes>
-            <String>_</String>
-            <String>m_</String>
-          </AllowedPrefixes>
-          <AffectedEntity>ReadonlyField</AffectedEntity>
-          <VisibilityMask>Private</VisibilityMask>
-          <NamingStyle>CamelCase</NamingStyle>
+          <VisibilityMask>Internal, Public</VisibilityMask>
+          <NamingStyle>PascalCase</NamingStyle>
           <IncludeInstanceMembers>True</IncludeInstanceMembers>
           <IncludeStaticEntities>False</IncludeStaticEntities>
         </NamingRule>
@@ -216,6 +170,25 @@
           <IncludeInstanceMembers>True</IncludeInstanceMembers>
           <IncludeStaticEntities>True</IncludeStaticEntities>
         </NamingRule>
+        <NamingRule>
+          <Name>Fields (Private, Protected)</Name>
+          <RequiredPrefixes>
+            <String>_</String>
+          </RequiredPrefixes>
+          <AffectedEntity>Field</AffectedEntity>
+          <VisibilityMask>Private, Protected</VisibilityMask>
+          <NamingStyle>CamelCase</NamingStyle>
+          <IncludeInstanceMembers>True</IncludeInstanceMembers>
+          <IncludeStaticEntities>False</IncludeStaticEntities>
+        </NamingRule>
+        <NamingRule>
+          <Name>Static Fields</Name>
+          <AffectedEntity>Field, ReadonlyField</AffectedEntity>
+          <VisibilityMask>VisibilityMask</VisibilityMask>
+          <NamingStyle>PascalCase</NamingStyle>
+          <IncludeInstanceMembers>False</IncludeInstanceMembers>
+          <IncludeStaticEntities>True</IncludeStaticEntities>
+        </NamingRule>
       </Rules>
     </NameConventionPolicy>
     <ChangeLogPolicy inheritsSet="Mono" />