diff --git a/ArcFormats/ArcWILL.cs b/ArcFormats/ArcWILL.cs
index 38709ab9..d7cf81e9 100644
--- a/ArcFormats/ArcWILL.cs
+++ b/ArcFormats/ArcWILL.cs
@@ -111,12 +111,12 @@ namespace GameRes.Formats.Will
 
         public override ResourceOptions GetDefaultOptions ()
         {
-            return new ArcOptions { NameLength = Settings.Default.WARCNameLength };
+            return new ArcOptions { NameLength = Settings.Default.ARCNameLength };
         }
 
         public override object GetCreationWidget ()
         {
-            return new GUI.CreateWARCWidget();
+            return new GUI.CreateARCWidget();
         }
 
         internal class ArcEntry : Entry
diff --git a/ArcFormats/CreateWARCWidget.xaml b/ArcFormats/CreateARCWidget.xaml
similarity index 87%
rename from ArcFormats/CreateWARCWidget.xaml
rename to ArcFormats/CreateARCWidget.xaml
index 2360976b..d6b6ca0c 100644
--- a/ArcFormats/CreateWARCWidget.xaml
+++ b/ArcFormats/CreateARCWidget.xaml
@@ -1,4 +1,4 @@
-<Grid x:Class="GameRes.Formats.GUI.CreateWARCWidget"
+<Grid x:Class="GameRes.Formats.GUI.CreateARCWidget"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:s="clr-namespace:GameRes.Formats.Strings"
@@ -9,7 +9,7 @@
     </Grid.ColumnDefinitions>
     <Label Content="{x:Static s:arcStrings.WARCLabelLength}" Target="{Binding ElementName=NameLength}" Grid.Column="0" Margin="0"/>
     <ComboBox Name="NameLength" Width="40" SelectedValuePath="Content" Grid.Column="1" Margin="8"
-              SelectedValue="{Binding Source={x:Static p:Settings.Default}, Path=WARCNameLength, Mode=TwoWay}">
+              SelectedValue="{Binding Source={x:Static p:Settings.Default}, Path=ARCNameLength, Mode=TwoWay}">
         <ComboBoxItem Content="8"/>
         <ComboBoxItem Content="12"/>
     </ComboBox>
diff --git a/ArcFormats/CreateWARCWidget.xaml.cs b/ArcFormats/CreateARCWidget.xaml.cs
similarity index 56%
rename from ArcFormats/CreateWARCWidget.xaml.cs
rename to ArcFormats/CreateARCWidget.xaml.cs
index 6fd5e086..f5ad19b8 100644
--- a/ArcFormats/CreateWARCWidget.xaml.cs
+++ b/ArcFormats/CreateARCWidget.xaml.cs
@@ -3,11 +3,11 @@
 namespace GameRes.Formats.GUI
 {
     /// <summary>
-    /// Interaction logic for CreateWARCWidget.xaml
+    /// Interaction logic for CreateARCWidget.xaml
     /// </summary>
-    public partial class CreateWARCWidget : Grid
+    public partial class CreateARCWidget : Grid
     {
-        public CreateWARCWidget ()
+        public CreateARCWidget ()
         {
             InitializeComponent ();
         }
diff --git a/ArcFormats/Properties/Settings.Designer.cs b/ArcFormats/Properties/Settings.Designer.cs
index 32919615..4bb9c0db 100644
--- a/ArcFormats/Properties/Settings.Designer.cs
+++ b/ArcFormats/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.34209
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -241,12 +241,12 @@ namespace GameRes.Formats.Properties {
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("8")]
-        public int WARCNameLength {
+        public int ARCNameLength {
             get {
-                return ((int)(this["WARCNameLength"]));
+                return ((int)(this["ARCNameLength"]));
             }
             set {
-                this["WARCNameLength"] = value;
+                this["ARCNameLength"] = value;
             }
         }
         
@@ -273,5 +273,17 @@ namespace GameRes.Formats.Properties {
                 this["KCAPScheme"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string WARCScheme {
+            get {
+                return ((string)(this["WARCScheme"]));
+            }
+            set {
+                this["WARCScheme"] = value;
+            }
+        }
     }
 }
diff --git a/ArcFormats/Properties/Settings.settings b/ArcFormats/Properties/Settings.settings
index 8de3d844..2fbe6117 100644
--- a/ArcFormats/Properties/Settings.settings
+++ b/ArcFormats/Properties/Settings.settings
@@ -56,7 +56,7 @@
     <Setting Name="NPAKey2" Type="System.UInt32" Scope="User">
       <Value Profile="(Default)">555831124</Value>
     </Setting>
-    <Setting Name="WARCNameLength" Type="System.Int32" Scope="User">
+    <Setting Name="ARCNameLength" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">8</Value>
     </Setting>
     <Setting Name="KCAPPassPhrase" Type="System.String" Scope="User">
@@ -65,5 +65,8 @@
     <Setting Name="KCAPScheme" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="WARCScheme" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/ArcFormats/app.config b/ArcFormats/app.config
index 8de64b13..37c500e8 100644
--- a/ArcFormats/app.config
+++ b/ArcFormats/app.config
@@ -58,7 +58,7 @@
             <setting name="NPAKey2" serializeAs="String">
                 <value>555831124</value>
             </setting>
-            <setting name="WARCNameLength" serializeAs="String">
+            <setting name="ARCNameLength" serializeAs="String">
                 <value>8</value>
             </setting>
             <setting name="KCAPPassPhrase" serializeAs="String">
@@ -67,6 +67,9 @@
             <setting name="KCAPScheme" serializeAs="String">
                 <value />
             </setting>
+            <setting name="WARCScheme" serializeAs="String">
+                <value />
+            </setting>
         </GameRes.Formats.Properties.Settings>
     </userSettings>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>