diff --git a/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/CodeGeneration/TileShapeCollectionCodeGenerator.cs b/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/CodeGeneration/TileShapeCollectionCodeGenerator.cs
index 0c2249f37..34a92c218 100644
--- a/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/CodeGeneration/TileShapeCollectionCodeGenerator.cs
+++ b/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/CodeGeneration/TileShapeCollectionCodeGenerator.cs
@@ -1,12 +1,15 @@
 using FlatRedBall.Glue.CodeGeneration;
 using FlatRedBall.Glue.CodeGeneration.CodeBuilder;
+using FlatRedBall.Glue.GuiDisplay;
 using FlatRedBall.Glue.Plugins.ICollidablePlugins;
 using FlatRedBall.Glue.SaveClasses;
 using FlatRedBall.Math;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using TileGraphicsPlugin.ViewModels;
@@ -79,12 +82,7 @@ public override ICodeBlock GenerateAddToManagers(ICodeBlock codeBlock, IElement
 
             foreach (var shapeCollection in tileShapeCollections)
             {
-                T Get<T>(string name)
-                {
-                    return shapeCollection.Properties.GetValue<T>(name);
-                }
-
-                var creationOptions = Get<CollisionCreationOptions>(
+                var creationOptions = Get<CollisionCreationOptions>(shapeCollection,
                     nameof(TileShapeCollectionPropertiesViewModel.CollisionCreationOptions));
 
                 var variable = shapeCollection.GetCustomVariable("Visible");
@@ -107,12 +105,7 @@ T Get<T>(string name)
 
         public static string GenerateConstructorFor(NamedObjectSave namedObjectSave)
         {
-            T Get<T>(string name)
-            {
-                return namedObjectSave.Properties.GetValue<T>(name);
-            }
-
-            var creationOptions = Get<CollisionCreationOptions>(
+            var creationOptions = Get<CollisionCreationOptions>(namedObjectSave,
                 nameof(TileShapeCollectionPropertiesViewModel.CollisionCreationOptions));
 
             bool comesFromLayer = creationOptions == CollisionCreationOptions.FromLayer;
@@ -120,9 +113,9 @@ T Get<T>(string name)
             if(comesFromLayer)
             {
                 var instanceName = namedObjectSave.FieldName;
-                var mapName = Get<string>(nameof(TileShapeCollectionPropertiesViewModel.SourceTmxName));
-                var layerName = Get<string>(nameof(TileShapeCollectionPropertiesViewModel.CollisionLayerName));
-                var typeNameInLayer = Get<string>(nameof(TileShapeCollectionPropertiesViewModel.CollisionLayerTileType));
+                var mapName = Get<string>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.SourceTmxName));
+                var layerName = Get<string>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.CollisionLayerName));
+                var typeNameInLayer = Get<string>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.CollisionLayerTileType));
 
                 var effectiveName = layerName;
                 if (!string.IsNullOrEmpty(typeNameInLayer))
@@ -159,11 +152,7 @@ T Get<T>(string name)
         private void GenerateInitializeCodeFor(NamedObjectSave namedObjectSave, ICodeBlock codeBlock)
         {
 
-            T Get<T>(string name)
-            {
-                return namedObjectSave.Properties.GetValue<T>(name);
-            }
-            var creationOptions = Get<CollisionCreationOptions>(
+            var creationOptions = Get<CollisionCreationOptions>(namedObjectSave,
                 nameof(TileShapeCollectionPropertiesViewModel.CollisionCreationOptions));
 
             // Victor Chelaru Sept 6 2021
@@ -248,8 +237,8 @@ T Get<T>(string name)
 
             void GenerateFromMapCollision(NamedObjectSave namedObjectSave, ICodeBlock codeBlock)
             {
-                var mapName = Get<string>(nameof(TileShapeCollectionPropertiesViewModel.SourceTmxName));
-                var tmxCollisionName = Get<string>(nameof(TileShapeCollectionPropertiesViewModel.TmxCollisionName));
+                var mapName = Get<string>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.SourceTmxName));
+                var tmxCollisionName = Get<string>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.TmxCollisionName));
 
                 var instanceName = namedObjectSave.FieldName;
                 // If we do FirstOrDefault this doesn't fail, but codegen will fail later on. This gives a more informative error
@@ -276,25 +265,44 @@ void GenerateFromMapCollision(NamedObjectSave namedObjectSave, ICodeBlock codeBl
         }
 
 
-        private void GenerateBorderOutline(NamedObjectSave namedObjectSave, ICodeBlock codeBlock)
+        static T Get<T>(NamedObjectSave namedObjectSave, string name)
         {
-
-            T Get<T>(string name)
+            var property = namedObjectSave.Properties.Find(item => item.Name == name);
+            if(property == null)
+            {
+                // go to the view model, get the default value:
+                var viewModelType = typeof(TileShapeCollectionPropertiesViewModel);
+                var propertyInfo = viewModelType.GetProperty(name);
+                var attribute = propertyInfo.GetCustomAttribute<DefaultValueAttribute>();
+                if(attribute != null)
+                {
+                    return (T)attribute.Value;
+                }
+                else
+                {
+                    return default;
+                }
+            }
+            else
             {
                 return namedObjectSave.Properties.GetValue<T>(name);
             }
+        }
+        private void GenerateBorderOutline(NamedObjectSave namedObjectSave, ICodeBlock codeBlock)
+        {
+
             string FloatString(float value) => value.ToString(CultureInfo.InvariantCulture) + "f";
 
-            var tileSize = Get<float>(nameof(TileShapeCollectionPropertiesViewModel.CollisionTileSize));
+            var tileSize = Get<float>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.CollisionTileSize));
             var tileSizeString = FloatString(tileSize);
 
-            var leftFill = Get<float>(nameof(TileShapeCollectionPropertiesViewModel.CollisionFillLeft));
+            var leftFill = Get<float>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.CollisionFillLeft));
             var leftFillString = FloatString(leftFill);
 
-            var topFill = Get<float>(nameof(TileShapeCollectionPropertiesViewModel.CollisionFillTop));
+            var topFill = Get<float>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.CollisionFillTop));
             var topFillString = FloatString(topFill);
 
-            var borderOutlineType = (BorderOutlineType)Get<int>(
+            var borderOutlineType = (BorderOutlineType)Get<int>(namedObjectSave,
                 nameof(TileShapeCollectionPropertiesViewModel.BorderOutlineType));
 
             var remainderX = leftFill % tileSize;
@@ -313,15 +321,15 @@ T Get<T>(string name)
             codeBlock.Line($"{instanceName}.SortAxis = FlatRedBall.Math.Axis.X;");
             //TileShapeCollectionInstance.SortAxis = FlatRedBall.Math.Axis.X;
 
-            var widthFill = Get<int>(nameof(TileShapeCollectionPropertiesViewModel.CollisionFillWidth));
-            var heightFill = Get<int>(nameof(TileShapeCollectionPropertiesViewModel.CollisionFillHeight));
+            var widthFill = Get<int>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.CollisionFillWidth));
+            var heightFill = Get<int>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.CollisionFillHeight));
 
             if(borderOutlineType == BorderOutlineType.InnerSize)
             {
-                var innerWidth = Get<float>(
+                var innerWidth = Get<float>(namedObjectSave,
                     nameof(TileShapeCollectionPropertiesViewModel.InnerSizeWidth));
 
-                var innerHeight = Get<float>(
+                var innerHeight = Get<float>(namedObjectSave,
                     nameof(TileShapeCollectionPropertiesViewModel.InnerSizeHeight));
 
                 var additionalWidth = 2 * tileSize;
@@ -365,22 +373,18 @@ T Get<T>(string name)
 
         private void GenerateFillCompletely(NamedObjectSave namedObjectSave, ICodeBlock codeBlock)
         {
-            T Get<T>(string name)
-            {
-                return namedObjectSave.Properties.GetValue<T>(name);
-            }
 
-            var tileSize = Get<float>(nameof(TileShapeCollectionPropertiesViewModel.CollisionTileSize));
+            var tileSize = Get<float>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.CollisionTileSize));
             var tileSizeString = tileSize.ToString(CultureInfo.InvariantCulture) + "f";
 
-            var leftFill = Get<float>(nameof(TileShapeCollectionPropertiesViewModel.CollisionFillLeft));
+            var leftFill = Get<float>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.CollisionFillLeft));
             var leftFillString = leftFill.ToString(CultureInfo.InvariantCulture) + "f";
 
-            var topFill = Get<float>(nameof(TileShapeCollectionPropertiesViewModel.CollisionFillTop));
+            var topFill = Get<float>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.CollisionFillTop));
             var topFillString = topFill.ToString(CultureInfo.InvariantCulture) + "f";
 
-            var widthFill = Get<int>(nameof(TileShapeCollectionPropertiesViewModel.CollisionFillWidth));
-            var heightFill = Get<int>(nameof(TileShapeCollectionPropertiesViewModel.CollisionFillHeight));
+            var widthFill = Get<int>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.CollisionFillWidth));
+            var heightFill = Get<int>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.CollisionFillHeight));
 
             var remainderX = leftFill % tileSize;
             var remainderY = topFill % tileSize;
@@ -417,13 +421,9 @@ T Get<T>(string name)
 
         private void GenerateFromProperties(NamedObjectSave namedObjectSave, ICodeBlock codeBlock)
         {
-            T Get<T>(string name)
-            {
-                return namedObjectSave.Properties.GetValue<T>(name);
-            }
 
-            var mapName = Get<string>(nameof(TileShapeCollectionPropertiesViewModel.SourceTmxName));
-            var propertyName = Get<string>(nameof(TileShapeCollectionPropertiesViewModel.CollisionPropertyName));
+            var mapName = Get<string>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.SourceTmxName));
+            var propertyName = Get<string>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.CollisionPropertyName));
 
             if(!string.IsNullOrEmpty(mapName) && !string.IsNullOrEmpty(propertyName))
             {
@@ -441,15 +441,11 @@ T Get<T>(string name)
 
         private void GenerateFromTileType(NamedObjectSave namedObjectSave, ICodeBlock codeBlock)
         {
-            T Get<T>(string name)
-            {
-                return namedObjectSave.Properties.GetValue<T>(name);
-            }
 
-            var mapName = Get<string>(nameof(TileShapeCollectionPropertiesViewModel.SourceTmxName));
-            var typeName = Get<string>(nameof(TileShapeCollectionPropertiesViewModel.CollisionTileTypeName));
-            var removeTiles = Get<bool>(nameof(TileShapeCollectionPropertiesViewModel.RemoveTilesAfterCreatingCollision));
-            var isMerged = Get<bool>(nameof(TileShapeCollectionPropertiesViewModel.IsCollisionMerged));
+            var mapName = Get<string>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.SourceTmxName));
+            var typeName = Get<string>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.CollisionTileTypeName));
+            var removeTiles = Get<bool>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.RemoveTilesAfterCreatingCollision));
+            var isMerged = Get<bool>(namedObjectSave, nameof(TileShapeCollectionPropertiesViewModel.IsCollisionMerged));
             if (!string.IsNullOrEmpty(mapName) && !string.IsNullOrEmpty(typeName))
             {
                 string method = "AddCollisionFromTilesWithType";
@@ -478,11 +474,7 @@ public override ICodeBlock GenerateAdditionalMethods(ICodeBlock codeBlock, IElem
                 else
                 {
                     // override it if it's an outline:
-                    T Get<T>(string name)
-                    {
-                        return tileShapeCollection.Properties.GetValue<T>(name);
-                    }
-                    var creationOptions = Get<CollisionCreationOptions>(
+                    var creationOptions = Get<CollisionCreationOptions>(tileShapeCollection,
                         nameof(TileShapeCollectionPropertiesViewModel.CollisionCreationOptions));
 
                     if(creationOptions == CollisionCreationOptions.BorderOutline)
diff --git a/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/Views/TileNodeNetworkProperties.xaml b/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/Views/TileNodeNetworkProperties.xaml
index c93d0f36f..e4d107551 100644
--- a/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/Views/TileNodeNetworkProperties.xaml
+++ b/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/Views/TileNodeNetworkProperties.xaml
@@ -9,46 +9,46 @@
     <ScrollViewer VerticalScrollBarVisibility="Auto">
 
         <StackPanel IsEnabled="{Binding IsEntireViewEnabled}">
-            <GroupBox Header="{x:Static localization:Texts.LinksPerNode}">
+            <GroupBox Header="Links Per Node">
                 <StackPanel Orientation="Horizontal" >
-                    <RadioButton IsChecked="{Binding IsFourDirectionalTypeChecked}" Content="{x:Static localization:Texts.Four}" />
-                    <RadioButton IsChecked="{Binding IsEightDirectionalTypeChecked}" Margin="10,0,0,0" Content="{x:Static localization:Texts.Eight}" />
+                    <RadioButton IsChecked="{Binding IsFourDirectionalTypeChecked}" Content="Four" />
+                    <RadioButton IsChecked="{Binding IsEightDirectionalTypeChecked}" Margin="10,0,0,0" Content="Eight" />
                 </StackPanel>
             </GroupBox>
-            <CheckBox IsChecked="{Binding EliminateCutCorners}" VerticalContentAlignment="Center"  Content="{x:Static localization:Texts.EliminateCutCorners}" />
-            <GroupBox Header="{x:Static localization:Texts.CreationOptions}" Grid.Row="1">
+            <CheckBox IsChecked="{Binding EliminateCutCorners}" VerticalContentAlignment="Center"  Content="Eliminate Cut Corners" />
+            <GroupBox Header="Creation Options" Grid.Row="1">
                 <StackPanel>
                     <RadioButton 
                              Margin="0,10,0,0"
                              VerticalContentAlignment="Center"
-                             IsChecked="{Binding IsEmptyChecked}" Content="{x:Static localization:Texts.Empty}" />
+                             IsChecked="{Binding IsEmptyChecked}" Content="Empty" />
                     <RadioButton VerticalContentAlignment="Center" Margin="0,5,0,0"
-                             IsChecked="{Binding IsFillCompletelyChecked}"  Content="{x:Static localization:Texts.FillCompletely}" />
+                             IsChecked="{Binding IsFillCompletelyChecked}"  Content="Fill Completely" />
                     <StackPanel Margin="10, 0, 0, 0" Visibility="{Binding FillDimensionsVisibility}">
 
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Width="60" Text="{x:Static localization:Texts.TileSize}" />
+                            <TextBlock Width="60" Text="Tile Size:" />
                             <TextBox Width="100" Text="{Binding NodeNetworkTileSize}"
                                  KeyUp="TextBox_KeyEnterUpdate"></TextBox>
                         </StackPanel>
 
                         <StackPanel Orientation="Horizontal" Margin="0,3,0,0">
-                            <TextBlock Width="40" Text="{x:Static localization:Texts.Left}" />
+                            <TextBlock Width="40" Text="Left:" />
                             <TextBox Width="100" Text="{Binding NodeNetworkFillLeft}"
                                  KeyUp="TextBox_KeyEnterUpdate"></TextBox>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Width="40" Text="{x:Static localization:Texts.Top}" />
+                            <TextBlock Width="40" Text="Top:" />
                             <TextBox Width="100" Text="{Binding NodeNetworkFillTop}"
                                  KeyUp="TextBox_KeyEnterUpdate"></TextBox>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal" Margin="0,3,0,0">
-                            <TextBlock Width="60"  Text="{x:Static localization:Texts.TilesWide}" />
+                            <TextBlock Width="60"  Text="Tiles wide:" />
                             <TextBox Width="100" Text="{Binding NodeNetworkFillWidth}"
                                  KeyUp="TextBox_KeyEnterUpdate"></TextBox>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Width="60"  Text="{x:Static localization:Texts.TilesHigh}" />
+                            <TextBlock Width="60"  Text="Tiles high:" />
                             <TextBox Width="100" Text="{Binding NodeNetworkFillHeight}"
                                  KeyUp="TextBox_KeyEnterUpdate"></TextBox>
                         </StackPanel>
@@ -56,14 +56,14 @@
 
 
                     <RadioButton VerticalContentAlignment="Center" Margin="0,5,0,0"
-                             IsChecked="{Binding IsFromTypeChecked}" Content="{x:Static localization:Texts.TypeFrom}" />
+                             IsChecked="{Binding IsFromTypeChecked}" Content="From Type:" />
                     <StackPanel x:Name="Types" Margin="10, 0, 0, 0" 
                             Visibility="{Binding FromTypeVisibility}">
-                        <TextBlock  Text="{x:Static localization:Texts.SourceTmxFileObject}" />
+                        <TextBlock  Text="Source TMX File/Object" />
                         <ComboBox Width="200" HorizontalAlignment="Left"
                               ItemsSource="{Binding TmxObjectNames}"
                               SelectedItem="{Binding SourceTmxName}"></ComboBox>
-                        <TextBlock Margin="0,5,0,0"  Text="{x:Static localization:Texts.Type}" />
+                        <TextBlock Margin="0,5,0,0"  Text="Type" />
                         <ComboBox x:Name="CollisionTileTypeComboBox" 
                               IsEditable="True"
                               HorizontalAlignment="Left" Width="200" 
@@ -90,7 +90,7 @@
 
 
                     <RadioButton VerticalContentAlignment="Center" Margin="0,5,0,0"
-                             IsChecked="{Binding IsFromLayerChecked}" Content="{x:Static localization:Texts.LayerFrom}" />
+                             IsChecked="{Binding IsFromLayerChecked}" Content="From Layer:" />
                     <StackPanel Margin="10,0,0,0" Visibility="{Binding FromLayerVisibility}">
                         <TextBlock  Text="{x:Static localization:Texts.SourceTmxFileObject}" />
                         <ComboBox Width="200" HorizontalAlignment="Left"
diff --git a/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/Views/TileShapeCollectionProperties.xaml b/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/Views/TileShapeCollectionProperties.xaml
index 54ed23a2d..722d0b39c 100644
--- a/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/Views/TileShapeCollectionProperties.xaml
+++ b/FRBDK/Glue/TileGraphicsPlugin/TileGraphicsPlugin/Views/TileShapeCollectionProperties.xaml
@@ -16,19 +16,19 @@
             </Grid.RowDefinitions>
             <GroupBox Header="{x:Static localization:Texts.CreationOptions}" Grid.Row="1">
                 <StackPanel>
-                    <TextBlock TextWrapping="Wrap" Visibility="{Binding MessageAboutInheritanceVisibility}" Text="{x:Static localization:Texts.HintTileShapeCollection}" />
+          <TextBlock TextWrapping="Wrap" Visibility="{Binding MessageAboutInheritanceVisibility}" Text="This TileShapeCollection is defined in a base Screen. Changes must be made in the base screen." />
                     <RadioButton VerticalContentAlignment="Center"
                                  HorizontalAlignment="Left"
                                  IsEnabled="{Binding IsEntireViewEnabled}"
-                                 IsChecked="{Binding IsEmptyChecked}" Content="{x:Static localization:Texts.Empty}" />
+                                 IsChecked="{Binding IsEmptyChecked}" Content="Empty" />
                     <RadioButton VerticalContentAlignment="Center" Margin="0,5,0,0"
                                  HorizontalAlignment="Left"
                                  IsEnabled="{Binding IsEntireViewEnabled}"
-                                 IsChecked="{Binding IsFillCompletelyChecked}" Content="{x:Static localization:Texts.FillCompletely}" />
+                                 IsChecked="{Binding IsFillCompletelyChecked}" Content="Fill Completely" />
                     <StackPanel Margin="10, 0, 0, 0" Visibility="{Binding FillDimensionsVisibility}" IsEnabled="{Binding IsEntireViewEnabled}">
 
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Width="60" Text="{x:Static localization:Texts.TileSize}" />
+                            <TextBlock Width="60" Text="Tile Size:" />
                             <TextBox Width="100" Text="{Binding CollisionTileSize}"
                                      KeyUp="TextBox_KeyEnterUpdate"></TextBox>
                         </StackPanel>
@@ -61,7 +61,7 @@
                     <StackPanel Margin="10, 0, 0, 0" Visibility="{Binding BorderOutlineVisibility}">
 
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Width="90" Text="{x:Static localization:Texts.TileSize}" />
+                            <TextBlock Width="90" Text="Tile Size:" />
                             <TextBox Width="100" Text="{Binding CollisionTileSize}"
                                      KeyUp="TextBox_KeyEnterUpdate"></TextBox>
                         </StackPanel>
@@ -190,7 +190,7 @@
                     <RadioButton VerticalContentAlignment="Center" Margin="0,5,0,0"
                                  HorizontalAlignment="Left"
                                  IsEnabled="{Binding IsEntireViewEnabled}"
-                                 IsChecked="{Binding IsFromLayerChecked}" Content="{x:Static localization:Texts.LayerFrom}" />
+                                 IsChecked="{Binding IsFromLayerChecked}" Content="From Layer:" />
                     <StackPanel Margin="10,0,0,0" Visibility="{Binding FromLayerVisibility}" IsEnabled="{Binding IsEntireViewEnabled}">
                         <TextBlock Text="{x:Static localization:Texts.SourceTmxFileObject}" />
                         <ComboBox Width="200" HorizontalAlignment="Left"
diff --git a/FRBDK/Localization/Texts.Designer.cs b/FRBDK/Localization/Texts.Designer.cs
index ee202da42..12bfdfdfe 100644
--- a/FRBDK/Localization/Texts.Designer.cs
+++ b/FRBDK/Localization/Texts.Designer.cs
@@ -60,24 +60,6 @@ internal Texts() {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Activate.
-        /// </summary>
-        public static string Activate {
-            get {
-                return ResourceManager.GetString("Activate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Add.
-        /// </summary>
-        public static string Add {
-            get {
-                return ResourceManager.GetString("Add", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Add FRB Source.
         /// </summary>
@@ -1491,15 +1473,6 @@ public static string EmbedNAudioClasses {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Empty.
-        /// </summary>
-        public static string Empty {
-            get {
-                return ResourceManager.GetString("Empty", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to All empty.
         /// </summary>
@@ -2454,15 +2427,6 @@ public static string FileXNotRelativeToContentFolder {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Fill Completely.
-        /// </summary>
-        public static string FillCompletely {
-            get {
-                return ResourceManager.GetString("FillCompletely", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Fill values from default?.
         /// </summary>
@@ -3868,15 +3832,6 @@ public static string HintThisWillReplacePoints {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to This TileShapeCollection is defined in a base Screen. Changes must be made in the base screen..
-        /// </summary>
-        public static string HintTileShapeCollection {
-            get {
-                return ResourceManager.GetString("HintTileShapeCollection", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to The amount of time that the player can hold the jump button to jump higher. While the button is held, gravity is disabled..
         /// </summary>
@@ -4300,15 +4255,6 @@ public static string LayeredTileMapAdd {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to From layer:.
-        /// </summary>
-        public static string LayerFrom {
-            get {
-                return ResourceManager.GetString("LayerFrom", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Layer name:.
         /// </summary>
@@ -4381,15 +4327,6 @@ public static string LinkGameToFrbSource {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Links Per Node.
-        /// </summary>
-        public static string LinksPerNode {
-            get {
-                return ResourceManager.GetString("LinksPerNode", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to .
         /// </summary>
@@ -7090,15 +7027,6 @@ public static string TilesHigh {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Tile Size:.
-        /// </summary>
-        public static string TileSize {
-            get {
-                return ResourceManager.GetString("TileSize", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Remove Tiles.
         /// </summary>
diff --git a/FRBDK/Localization/Texts.de.resx b/FRBDK/Localization/Texts.de.resx
index a7a84b396..eb61aff3e 100644
--- a/FRBDK/Localization/Texts.de.resx
+++ b/FRBDK/Localization/Texts.de.resx
@@ -1116,9 +1116,6 @@
   <data name="To" xml:space="preserve">
     <value>Zu:</value>
   </data>
-  <data name="Activate" xml:space="preserve">
-    <value>Aktivieren</value>
-  </data>
   <data name="Execute" xml:space="preserve">
     <value>Ausführen</value>
   </data>
@@ -1506,9 +1503,6 @@
   <data name="Height" xml:space="preserve">
     <value>Höhe:</value>
   </data>
-  <data name="Add" xml:space="preserve">
-    <value>Hinzufügen</value>
-  </data>
   <data name="Remove" xml:space="preserve">
     <value>Entfernen</value>
   </data>
@@ -1779,33 +1773,21 @@
   <data name="ViewTiledObjectsXml" xml:space="preserve">
     <value>XML für gekachelte Objekte anzeigen</value>
   </data>
-  <data name="LinksPerNode" xml:space="preserve">
-    <value>Links pro Knoten</value>
-  </data>
   <data name="Four" xml:space="preserve">
     <value>Vier</value>
   </data>
   <data name="Eight" xml:space="preserve">
     <value>Acht</value>
   </data>
-  <data name="Empty" xml:space="preserve">
-    <value>Leer</value>
-  </data>
   <data name="CreationOptions" xml:space="preserve">
     <value>Erstellungsoptionen</value>
   </data>
-  <data name="FillCompletely" xml:space="preserve">
-    <value>Vollständig ausfüllen</value>
-  </data>
   <data name="EliminateCutCorners" xml:space="preserve">
     <value>Eliminieren Sie abgeschnittene Ecken</value>
   </data>
   <data name="Left" xml:space="preserve">
     <value>Links:</value>
   </data>
-  <data name="TileSize" xml:space="preserve">
-    <value>Fliesengröße:</value>
-  </data>
   <data name="Top" xml:space="preserve">
     <value>Spitze:</value>
   </data>
@@ -1827,18 +1809,12 @@
   <data name="Property" xml:space="preserve">
     <value>Eigenschaft:</value>
   </data>
-  <data name="LayerFrom" xml:space="preserve">
-    <value>Von der schicht:</value>
-  </data>
   <data name="Layer" xml:space="preserve">
     <value>Schicht:</value>
   </data>
   <data name="EmptyAll" xml:space="preserve">
     <value>Alles leer</value>
   </data>
-  <data name="HintTileShapeCollection" xml:space="preserve">
-    <value>Diese TileShapeCollection wird in einem Basisbildschirm definiert. Änderungen müssen im Basisbildschirm vorgenommen werden.</value>
-  </data>
   <data name="BorderOutline" xml:space="preserve">
     <value>Grenzumriss</value>
   </data>
diff --git a/FRBDK/Localization/Texts.fr.resx b/FRBDK/Localization/Texts.fr.resx
index ac665ef57..f296160db 100644
--- a/FRBDK/Localization/Texts.fr.resx
+++ b/FRBDK/Localization/Texts.fr.resx
@@ -1116,9 +1116,6 @@
   <data name="To" xml:space="preserve">
     <value>Vers:</value>
   </data>
-  <data name="Activate" xml:space="preserve">
-    <value>Activer</value>
-  </data>
   <data name="Execute" xml:space="preserve">
     <value>Exécuter</value>
   </data>
@@ -1506,9 +1503,6 @@
   <data name="Height" xml:space="preserve">
     <value>Hauteur:</value>
   </data>
-  <data name="Add" xml:space="preserve">
-    <value>Ajouter</value>
-  </data>
   <data name="Remove" xml:space="preserve">
     <value>Supprimer</value>
   </data>
@@ -1779,33 +1773,21 @@
   <data name="ViewTiledObjectsXml" xml:space="preserve">
     <value>Afficher les objets en mosaïque XML</value>
   </data>
-  <data name="LinksPerNode" xml:space="preserve">
-    <value>Liens par nœud</value>
-  </data>
   <data name="Four" xml:space="preserve">
     <value>Quatre</value>
   </data>
   <data name="Eight" xml:space="preserve">
     <value>Huit</value>
   </data>
-  <data name="Empty" xml:space="preserve">
-    <value>Vide</value>
-  </data>
   <data name="CreationOptions" xml:space="preserve">
     <value>Options de création</value>
   </data>
-  <data name="FillCompletely" xml:space="preserve">
-    <value>Remplissez complètement</value>
-  </data>
   <data name="EliminateCutCorners" xml:space="preserve">
     <value>Éliminez les coins coupés</value>
   </data>
   <data name="Left" xml:space="preserve">
     <value>Gauche:</value>
   </data>
-  <data name="TileSize" xml:space="preserve">
-    <value>Taille des carreaux :</value>
-  </data>
   <data name="Top" xml:space="preserve">
     <value>Haut:</value>
   </data>
@@ -1827,18 +1809,12 @@
   <data name="Property" xml:space="preserve">
     <value>Propriété:</value>
   </data>
-  <data name="LayerFrom" xml:space="preserve">
-    <value>À partir du calque :</value>
-  </data>
   <data name="Layer" xml:space="preserve">
     <value>Couche:</value>
   </data>
   <data name="EmptyAll" xml:space="preserve">
     <value>Tout vide</value>
   </data>
-  <data name="HintTileShapeCollection" xml:space="preserve">
-    <value>Cette TileShapeCollection est définie dans un écran de base. Les modifications doivent être apportées dans l'écran de base.</value>
-  </data>
   <data name="BorderOutline" xml:space="preserve">
     <value>Contour de la frontière</value>
   </data>
diff --git a/FRBDK/Localization/Texts.nl.resx b/FRBDK/Localization/Texts.nl.resx
index 8ad69c8b7..1136c2483 100644
--- a/FRBDK/Localization/Texts.nl.resx
+++ b/FRBDK/Localization/Texts.nl.resx
@@ -1116,9 +1116,6 @@
   <data name="To" xml:space="preserve">
     <value>Tot:</value>
   </data>
-  <data name="Activate" xml:space="preserve">
-    <value>Activeren</value>
-  </data>
   <data name="Execute" xml:space="preserve">
     <value>Uitvoeren</value>
   </data>
@@ -1506,9 +1503,6 @@
   <data name="Height" xml:space="preserve">
     <value>Hoogte:</value>
   </data>
-  <data name="Add" xml:space="preserve">
-    <value>Toevoegen</value>
-  </data>
   <data name="Remove" xml:space="preserve">
     <value>Verwijderen</value>
   </data>
@@ -1779,33 +1773,21 @@
   <data name="ViewTiledObjectsXml" xml:space="preserve">
     <value>Bekijk betegelde objecten XML</value>
   </data>
-  <data name="LinksPerNode" xml:space="preserve">
-    <value>Links per knooppunt</value>
-  </data>
   <data name="Four" xml:space="preserve">
     <value>Vier</value>
   </data>
   <data name="Eight" xml:space="preserve">
     <value>Acht</value>
   </data>
-  <data name="Empty" xml:space="preserve">
-    <value>Leeg</value>
-  </data>
   <data name="CreationOptions" xml:space="preserve">
     <value>Creatie opties</value>
   </data>
-  <data name="FillCompletely" xml:space="preserve">
-    <value>Vul volledig</value>
-  </data>
   <data name="EliminateCutCorners" xml:space="preserve">
     <value>Elimineer snijhoeken</value>
   </data>
   <data name="Left" xml:space="preserve">
     <value>Links:</value>
   </data>
-  <data name="TileSize" xml:space="preserve">
-    <value>Tegelgrootte:</value>
-  </data>
   <data name="Top" xml:space="preserve">
     <value>Boven:</value>
   </data>
@@ -1827,18 +1809,12 @@
   <data name="Property" xml:space="preserve">
     <value>Eigenschap:</value>
   </data>
-  <data name="LayerFrom" xml:space="preserve">
-    <value>Van laag:</value>
-  </data>
   <data name="Layer" xml:space="preserve">
     <value>Laag:</value>
   </data>
   <data name="EmptyAll" xml:space="preserve">
     <value>Allemaal leeg</value>
   </data>
-  <data name="HintTileShapeCollection" xml:space="preserve">
-    <value>Deze TileShapeCollection wordt gedefinieerd in een basisscherm. Wijzigingen moeten in het basisscherm worden aangebracht.</value>
-  </data>
   <data name="BorderOutline" xml:space="preserve">
     <value>Randlijn</value>
   </data>
diff --git a/FRBDK/Localization/Texts.resx b/FRBDK/Localization/Texts.resx
index 6dd857b70..652ce4aea 100644
--- a/FRBDK/Localization/Texts.resx
+++ b/FRBDK/Localization/Texts.resx
@@ -1117,9 +1117,6 @@ for {1}?</value>
   <data name="To" xml:space="preserve">
     <value>To</value>
   </data>
-  <data name="Activate" xml:space="preserve">
-    <value>Activate</value>
-  </data>
   <data name="Execute" xml:space="preserve">
     <value>Execute</value>
   </data>
@@ -1507,9 +1504,6 @@ for {1}?</value>
   <data name="Height" xml:space="preserve">
     <value>Height:</value>
   </data>
-  <data name="Add" xml:space="preserve">
-    <value>Add</value>
-  </data>
   <data name="Remove" xml:space="preserve">
     <value>Remove</value>
   </data>
@@ -1780,33 +1774,21 @@ for {1}?</value>
   <data name="ViewTiledObjectsXml" xml:space="preserve">
     <value>View Tiled Objects XML</value>
   </data>
-  <data name="LinksPerNode" xml:space="preserve">
-    <value>Links Per Node</value>
-  </data>
   <data name="Four" xml:space="preserve">
     <value>Four</value>
   </data>
   <data name="Eight" xml:space="preserve">
     <value>Eight</value>
   </data>
-  <data name="Empty" xml:space="preserve">
-    <value>Empty</value>
-  </data>
   <data name="CreationOptions" xml:space="preserve">
     <value>Creation Options</value>
   </data>
-  <data name="FillCompletely" xml:space="preserve">
-    <value>Fill Completely</value>
-  </data>
   <data name="EliminateCutCorners" xml:space="preserve">
     <value>Eliminate Cut Corners</value>
   </data>
   <data name="Left" xml:space="preserve">
     <value>Left:</value>
   </data>
-  <data name="TileSize" xml:space="preserve">
-    <value>Tile Size:</value>
-  </data>
   <data name="Top" xml:space="preserve">
     <value>Top:</value>
   </data>
@@ -1828,18 +1810,12 @@ for {1}?</value>
   <data name="Property" xml:space="preserve">
     <value>Property:</value>
   </data>
-  <data name="LayerFrom" xml:space="preserve">
-    <value>From layer:</value>
-  </data>
   <data name="Layer" xml:space="preserve">
     <value>Layer:</value>
   </data>
   <data name="EmptyAll" xml:space="preserve">
     <value>All empty</value>
   </data>
-  <data name="HintTileShapeCollection" xml:space="preserve">
-    <value>This TileShapeCollection is defined in a base Screen. Changes must be made in the base screen.</value>
-  </data>
   <data name="BorderOutline" xml:space="preserve">
     <value>Border Outline</value>
   </data>
@@ -2716,4 +2692,4 @@ for {1}?</value>
   <data name="EntityAddDerived" xml:space="preserve">
     <value />
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/Tests/TestProjectDesktopNet6/TestProjectDesktopNet6/Screens/CollisionScreen.glsj b/Tests/TestProjectDesktopNet6/TestProjectDesktopNet6/Screens/CollisionScreen.glsj
index c4471574c..ab11b8d9e 100644
--- a/Tests/TestProjectDesktopNet6/TestProjectDesktopNet6/Screens/CollisionScreen.glsj
+++ b/Tests/TestProjectDesktopNet6/TestProjectDesktopNet6/Screens/CollisionScreen.glsj
@@ -677,6 +677,78 @@
       "SourceFile": "FlatRedBall.Math.Collision.ListVsListRelationship<Entities.CollisionEntity, Entities.CollisionEntity>",
       "AttachToContainer": true,
       "GenerateTimedEmit": true
+    },
+    {
+      "InstanceName": "FillCompletelyWithDefaultValues",
+      "SourceClassType": "FlatRedBall.TileCollisions.TileShapeCollection",
+      "Properties": [
+        {
+          "Name": "AssociateWithFactory",
+          "Value": true,
+          "Type": "bool"
+        },
+        {
+          "Name": "CollisionCreationOptions",
+          "Value": 1,
+          "Type": "int"
+        }
+      ],
+      "InstructionSaves": [],
+      "SourceType": 2,
+      "SourceFile": "TileShapeCollection",
+      "AttachToContainer": true,
+      "GenerateTimedEmit": true
+    },
+    {
+      "InstanceName": "CollidableListVsFillCompletelyWithDefaultValues",
+      "SourceClassType": "FlatRedBall.Math.Collision.CollidableListVsTileShapeCollectionRelationship<Entities.CollidableEntity>",
+      "Properties": [
+        {
+          "Name": "AssociateWithFactory",
+          "Value": true,
+          "Type": "bool"
+        },
+        {
+          "Name": "IsAutoNameEnabled",
+          "Value": true,
+          "Type": "bool"
+        },
+        {
+          "Name": "FirstCollisionName",
+          "Value": "CollidableList",
+          "Type": "String"
+        },
+        {
+          "Name": "SecondCollisionName",
+          "Value": "FillCompletelyWithDefaultValues",
+          "Type": "String"
+        },
+        {
+          "Name": "CollisionType",
+          "Value": 2,
+          "Type": "int"
+        },
+        {
+          "Name": "IsDealDamageChecked",
+          "Value": true,
+          "Type": "Object"
+        },
+        {
+          "Name": "FirstCollisionMass",
+          "Value": 0.0,
+          "Type": "float"
+        },
+        {
+          "Name": "SecondCollisionMass",
+          "Value": 1.0,
+          "Type": "float"
+        }
+      ],
+      "InstructionSaves": [],
+      "SourceType": 2,
+      "SourceFile": "FlatRedBall.Math.Collision.CollidableListVsTileShapeCollectionRelationship<Entities.CollidableEntity>",
+      "AttachToContainer": true,
+      "GenerateTimedEmit": true
     }
   ],
   "Name": "Screens\\CollisionScreen",
diff --git a/Tests/TestProjectDesktopNet6/TestProjectDesktopNet6/Screens/TileShapeCollectionScreen.glsj b/Tests/TestProjectDesktopNet6/TestProjectDesktopNet6/Screens/TileShapeCollectionScreen.glsj
index ec18b6fda..07708795e 100644
--- a/Tests/TestProjectDesktopNet6/TestProjectDesktopNet6/Screens/TileShapeCollectionScreen.glsj
+++ b/Tests/TestProjectDesktopNet6/TestProjectDesktopNet6/Screens/TileShapeCollectionScreen.glsj
@@ -235,6 +235,62 @@
       "AttachToContainer": true,
       "GenerateTimedEmit": true,
       "IndependentOfCamera": true
+    },
+    {
+      "InstanceName": "DefaultEmpty",
+      "SourceClassType": "FlatRedBall.TileCollisions.TileShapeCollection",
+      "Properties": [
+        {
+          "Name": "AssociateWithFactory",
+          "Value": true,
+          "Type": "bool"
+        }
+      ],
+      "InstructionSaves": [],
+      "SourceType": 2,
+      "SourceFile": "TileShapeCollection",
+      "AttachToContainer": true,
+      "GenerateTimedEmit": true
+    },
+    {
+      "InstanceName": "DefaultFillCompletely",
+      "SourceClassType": "FlatRedBall.TileCollisions.TileShapeCollection",
+      "Properties": [
+        {
+          "Name": "AssociateWithFactory",
+          "Value": true,
+          "Type": "bool"
+        },
+        {
+          "Name": "CollisionCreationOptions",
+          "Value": 1,
+          "Type": "int"
+        }
+      ],
+      "InstructionSaves": [],
+      "SourceType": 2,
+      "SourceFile": "TileShapeCollection",
+      "GenerateTimedEmit": true
+    },
+    {
+      "InstanceName": "DefaultBorderOutline",
+      "SourceClassType": "FlatRedBall.TileCollisions.TileShapeCollection",
+      "Properties": [
+        {
+          "Name": "AssociateWithFactory",
+          "Value": true,
+          "Type": "bool"
+        },
+        {
+          "Name": "CollisionCreationOptions",
+          "Value": 2,
+          "Type": "int"
+        }
+      ],
+      "InstructionSaves": [],
+      "SourceType": 2,
+      "SourceFile": "TileShapeCollection",
+      "GenerateTimedEmit": true
     }
   ],
   "Name": "Screens\\TileShapeCollectionScreen",