diff --git a/KeyBindings/Custom.mac-kb.xml b/KeyBindings/Custom.mac-kb.xml
index 969a290..548217f 100644
--- a/KeyBindings/Custom.mac-kb.xml
+++ b/KeyBindings/Custom.mac-kb.xml
@@ -80,5 +80,6 @@
     <binding command="MonoDevelop.Refactoring.RefactoryCommands.ImportSymbol" shortcut="Control+Alt+Space" />
     <binding command="MonoDevelop.AnalysisCore.AnalysisCommands.ShowFixes" shortcut="Control+." />
     <binding command="MonoDevelop.Ide.Commands.EditCommands.FoldDefinitions" shortcut="Control+Meta+Up" />
+    <binding command="MonoDevelop.Ide.CodeFormatting.CodeFormattingCommands.FormatBuffer" shortcut="Control+`" />
   </scheme>
 </schemes>
\ No newline at end of file
diff --git a/Policies/Default.mdpolicy.xml b/Policies/Default.mdpolicy.xml
index 1b18433..3d84c4c 100644
--- a/Policies/Default.mdpolicy.xml
+++ b/Policies/Default.mdpolicy.xml
@@ -3,32 +3,37 @@
   <PolicySet name="Default" id="Default">
     <DotNetNamingPolicy>
       <DirectoryNamespaceAssociation>PrefixedHierarchical</DirectoryNamespaceAssociation>
-      <ResourceNamePolicy>FileFormatDefault</ResourceNamePolicy>
+      <ResourceNamePolicy>FileName</ResourceNamePolicy>
     </DotNetNamingPolicy>
     <VersionControlPolicy inheritsSet="Mono" />
     <TextStylePolicy inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/plain" />
     <TextStylePolicy inheritsSet="Mono" inheritsScope="text/plain" scope="text/x-csharp">
       <FileWidth>120</FileWidth>
       <TabWidth>4</TabWidth>
+      <NoTabsAfterNonTabs>True</NoTabsAfterNonTabs>
     </TextStylePolicy>
     <CSharpFormattingPolicy inheritsSet="Mono" inheritsScope="text/x-csharp" scope="text/x-csharp">
       <IndentSwitchBody>True</IndentSwitchBody>
+      <PropertyBraceStyle>NextLine</PropertyBraceStyle>
       <PropertyGetBraceStyle>NextLine</PropertyGetBraceStyle>
       <PropertySetBraceStyle>NextLine</PropertySetBraceStyle>
+      <EventBraceStyle>NextLine</EventBraceStyle>
+      <EventAddBraceStyle>NextLine</EventAddBraceStyle>
+      <EventRemoveBraceStyle>NextLine</EventRemoveBraceStyle>
+      <StatementBraceStyle>NextLine</StatementBraceStyle>
       <ForBraceForcement>AddBraces</ForBraceForcement>
-      <WhileBraceForcement>AddBraces</WhileBraceForcement>
-      <UsingBraceForcement>AddBraces</UsingBraceForcement>
       <ElseNewLinePlacement>NewLine</ElseNewLinePlacement>
       <ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement>
       <CatchNewLinePlacement>NewLine</CatchNewLinePlacement>
       <FinallyNewLinePlacement>NewLine</FinallyNewLinePlacement>
+      <WhileNewLinePlacement>NewLine</WhileNewLinePlacement>
       <BeforeMethodDeclarationParentheses>False</BeforeMethodDeclarationParentheses>
       <BeforeMethodCallParentheses>False</BeforeMethodCallParentheses>
       <BeforeConstructorDeclarationParentheses>False</BeforeConstructorDeclarationParentheses>
       <BeforeIndexerDeclarationBracket>False</BeforeIndexerDeclarationBracket>
       <BeforeDelegateDeclarationParentheses>False</BeforeDelegateDeclarationParentheses>
-      <AfterDelegateDeclarationParameterComma>True</AfterDelegateDeclarationParameterComma>
       <NewParentheses>False</NewParentheses>
+      <BeforeNewParameterComma>True</BeforeNewParameterComma>
       <SpacesBeforeBrackets>False</SpacesBeforeBrackets>
     </CSharpFormattingPolicy>
     <StandardHeader>
@@ -116,7 +121,7 @@
         <NamingRule>
           <Name>Fields (Non Private)</Name>
           <AffectedEntity>Field</AffectedEntity>
-          <VisibilityMask>Internal, Public</VisibilityMask>
+          <VisibilityMask>Internal, Protected, Public</VisibilityMask>
           <NamingStyle>PascalCase</NamingStyle>
           <IncludeInstanceMembers>True</IncludeInstanceMembers>
           <IncludeStaticEntities>True</IncludeStaticEntities>
@@ -131,22 +136,20 @@
         </NamingRule>
         <NamingRule>
           <Name>Fields (Private)</Name>
-          <RequiredPrefixes>
+          <AllowedPrefixes>
             <String>_</String>
-          </RequiredPrefixes>
+            <String>m_</String>
+          </AllowedPrefixes>
           <AffectedEntity>Field, ReadonlyField</AffectedEntity>
-          <VisibilityMask>Private, Protected</VisibilityMask>
+          <VisibilityMask>Private</VisibilityMask>
           <NamingStyle>CamelCase</NamingStyle>
           <IncludeInstanceMembers>True</IncludeInstanceMembers>
           <IncludeStaticEntities>False</IncludeStaticEntities>
         </NamingRule>
         <NamingRule>
           <Name>Static Fields (Private)</Name>
-          <RequiredPrefixes>
-            <String>_</String>
-          </RequiredPrefixes>
           <AffectedEntity>Field</AffectedEntity>
-          <VisibilityMask>Private, Protected</VisibilityMask>
+          <VisibilityMask>Private</VisibilityMask>
           <NamingStyle>CamelCase</NamingStyle>
           <IncludeInstanceMembers>False</IncludeInstanceMembers>
           <IncludeStaticEntities>True</IncludeStaticEntities>
@@ -214,6 +217,14 @@
           <IncludeInstanceMembers>True</IncludeInstanceMembers>
           <IncludeStaticEntities>True</IncludeStaticEntities>
         </NamingRule>
+        <NamingRule>
+          <Name>Local Variables</Name>
+          <AffectedEntity>LocalVariable</AffectedEntity>
+          <VisibilityMask>VisibilityMask</VisibilityMask>
+          <NamingStyle>CamelCase</NamingStyle>
+          <IncludeInstanceMembers>True</IncludeInstanceMembers>
+          <IncludeStaticEntities>True</IncludeStaticEntities>
+        </NamingRule>
       </Rules>
     </NameConventionPolicy>
   </PolicySet>
diff --git a/Snippets/ctor.template.xml b/Snippets/ctor.template.xml
new file mode 100644
index 0000000..2e1bb25
--- /dev/null
+++ b/Snippets/ctor.template.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CodeTemplates version="3.0">
+  <CodeTemplate version="2.0">
+    <Header>
+      <_Group>C#</_Group>
+      <Version>1.0</Version>
+      <MimeType>text/x-csharp</MimeType>
+      <Shortcut>ctor</Shortcut>
+      <_Description>Template for constructor</_Description>
+      <TemplateType>Expansion</TemplateType>
+    </Header>
+    <Variables>
+      <Variable name="classname" isEditable="false">
+        <_ToolTip>Class name</_ToolTip>
+        <Function>GetCurrentClassName()</Function>
+      </Variable>
+      <Variable name="modifier" isEditable="false">
+        <Function>GetConstructorModifier()</Function>
+      </Variable>
+    </Variables>
+    <Code><![CDATA[$modifier$$classname$()
+{
+	$end$
+}]]></Code>
+  </CodeTemplate>
+</CodeTemplates>
\ No newline at end of file