diff --git a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
index 2016cf93b..8361b2224 100644
--- a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
+++ b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
@@ -57,9 +57,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ICSharpCode.AvalonEdit, Version=4.4.2.9744, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
+    <Reference Include="ICSharpCode.AvalonEdit, Version=5.0.1.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\AvalonEdit.4.4.2.9744\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
+      <HintPath>..\packages\AvalonEdit.5.0.2\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
diff --git a/ILSpy.BamlDecompiler/packages.config b/ILSpy.BamlDecompiler/packages.config
index 5ce5fa7e9..9bfa26afc 100644
--- a/ILSpy.BamlDecompiler/packages.config
+++ b/ILSpy.BamlDecompiler/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AvalonEdit" version="4.4.2.9744" targetFramework="net45" />
+  <package id="AvalonEdit" version="5.0.2" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
index 230acd57c..85cb63a96 100644
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@@ -69,8 +69,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ICSharpCode.AvalonEdit">
-      <HintPath>..\packages\AvalonEdit.4.4.2.9744\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
+    <Reference Include="ICSharpCode.AvalonEdit, Version=5.0.1.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\AvalonEdit.5.0.2\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
diff --git a/ILSpy/packages.config b/ILSpy/packages.config
index 9377aefc0..eb52af863 100644
--- a/ILSpy/packages.config
+++ b/ILSpy/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AvalonEdit" version="4.4.2.9744" targetFramework="net45" />
+  <package id="AvalonEdit" version="5.0.2" targetFramework="net45" />
   <package id="Microsoft.Bcl.Immutable" version="1.1.22-beta" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Rebracer.xml b/Rebracer.xml
index b855aecd6..bd0a77e01 100644
--- a/Rebracer.xml
+++ b/Rebracer.xml
@@ -24,9 +24,13 @@
       <ToolsOptionsSubCategory name="CSharp-Specific">
         <PropertyValue name="AutoComment">1</PropertyValue>
         <PropertyValue name="BringUpOnIdentifier">1</PropertyValue>
+        <PropertyValue name="CodeDefinitionWindow_DocumentationComment_IndentBase">1</PropertyValue>
+        <PropertyValue name="CodeDefinitionWindow_DocumentationComment_IndentOffset">2</PropertyValue>
+        <PropertyValue name="CodeDefinitionWindow_DocumentationComment_WrapLength">80</PropertyValue>
         <PropertyValue name="Formatting_TriggerOnBlockCompletion">1</PropertyValue>
         <PropertyValue name="Formatting_TriggerOnPaste">1</PropertyValue>
         <PropertyValue name="Formatting_TriggerOnStatementCompletion">1</PropertyValue>
+        <PropertyValue name="ImplementInterface_InsertRegionTags">0</PropertyValue>
         <PropertyValue name="Indent_BlockContents">1</PropertyValue>
         <PropertyValue name="Indent_Braces">0</PropertyValue>
         <PropertyValue name="Indent_CaseContents">1</PropertyValue>
@@ -37,6 +41,7 @@
         <PropertyValue name="NewLines_AnonymousTypeInitializer_EachMember">1</PropertyValue>
         <PropertyValue name="NewLines_Braces_AnonymousMethod">0</PropertyValue>
         <PropertyValue name="NewLines_Braces_AnonymousTypeInitializer">0</PropertyValue>
+        <PropertyValue name="NewLines_Braces_ArrayInitializer">0</PropertyValue>
         <PropertyValue name="NewLines_Braces_CollectionInitializer">0</PropertyValue>
         <PropertyValue name="NewLines_Braces_ControlFlow">0</PropertyValue>
         <PropertyValue name="NewLines_Braces_LambdaExpressionBody">0</PropertyValue>
@@ -48,13 +53,16 @@
         <PropertyValue name="NewLines_Keywords_Finally">0</PropertyValue>
         <PropertyValue name="NewLines_ObjectInitializer_EachMember">1</PropertyValue>
         <PropertyValue name="NewLines_QueryExpression_EachClause">1</PropertyValue>
+        <PropertyValue name="RemoveUnusedUsings">1</PropertyValue>
         <PropertyValue name="ShowKeywords">1</PropertyValue>
         <PropertyValue name="ShowSnippets">1</PropertyValue>
+        <PropertyValue name="SortUsings">1</PropertyValue>
         <PropertyValue name="SortUsings_PlaceSystemFirst">1</PropertyValue>
         <PropertyValue name="Space_AfterBasesColon">1</PropertyValue>
         <PropertyValue name="Space_AfterCast">0</PropertyValue>
         <PropertyValue name="Space_AfterComma">1</PropertyValue>
         <PropertyValue name="Space_AfterDot">0</PropertyValue>
+        <PropertyValue name="Space_AfterLambdaArrow">1</PropertyValue>
         <PropertyValue name="Space_AfterMethodCallName">0</PropertyValue>
         <PropertyValue name="Space_AfterMethodDeclarationName">0</PropertyValue>
         <PropertyValue name="Space_AfterSemicolonsInForStatement">1</PropertyValue>
@@ -62,18 +70,22 @@
         <PropertyValue name="Space_BeforeBasesColon">1</PropertyValue>
         <PropertyValue name="Space_BeforeComma">0</PropertyValue>
         <PropertyValue name="Space_BeforeDot">0</PropertyValue>
+        <PropertyValue name="Space_BeforeLambdaArrow">1</PropertyValue>
         <PropertyValue name="Space_BeforeOpenSquare">0</PropertyValue>
         <PropertyValue name="Space_BeforeSemicolonsInForStatement">0</PropertyValue>
         <PropertyValue name="Space_BetweenEmptyMethodCallParentheses">0</PropertyValue>
         <PropertyValue name="Space_BetweenEmptyMethodDeclarationParentheses">0</PropertyValue>
         <PropertyValue name="Space_BetweenEmptySquares">0</PropertyValue>
         <PropertyValue name="Space_InControlFlowConstruct">1</PropertyValue>
+        <PropertyValue name="Space_Normalize">0</PropertyValue>
         <PropertyValue name="Space_WithinCastParentheses">0</PropertyValue>
         <PropertyValue name="Space_WithinExpressionParentheses">0</PropertyValue>
         <PropertyValue name="Space_WithinMethodCallParentheses">0</PropertyValue>
         <PropertyValue name="Space_WithinMethodDeclarationParentheses">0</PropertyValue>
         <PropertyValue name="Space_WithinOtherParentheses">0</PropertyValue>
         <PropertyValue name="Space_WithinSquares">0</PropertyValue>
+        <PropertyValue name="WarnOnBuildErrors">1</PropertyValue>
+        <PropertyValue name="WarnWhenMembersCauseCompilerGeneratedReferences">1</PropertyValue>
         <PropertyValue name="Wrapping_IgnoreSpacesAroundBinaryOperators">0</PropertyValue>
         <PropertyValue name="Wrapping_IgnoreSpacesAroundVariableDeclaration">0</PropertyValue>
         <PropertyValue name="Wrapping_KeepStatementsOnSingleLine">1</PropertyValue>