diff --git a/usa-elections/Pages/ElectionBar.razor b/usa-elections/Pages/ElectionBar.razor
index a9eedd0..68db327 100644
--- a/usa-elections/Pages/ElectionBar.razor
+++ b/usa-elections/Pages/ElectionBar.razor
@@ -110,7 +110,7 @@
 
 @code {
 
-    RenderFragment CreateTooltip(DataContext context)
+    RenderFragment CreateTooltip(IgbDataContext context)
     { 
         var brush = "";
         var votes = "";
@@ -171,8 +171,8 @@
 
     public List<Candidate> DisplayCandidates { get; set; }
 
-    private DataChart BarChart;
-    public DataChart BarChartRef
+    private IgbDataChart BarChart;
+    public IgbDataChart BarChartRef
     {
         get { return BarChart; }
         set { BarChart = value; this.OnChanged(); }
@@ -236,16 +236,16 @@
         base.OnInitialized();
         Logger.WriteLine("ElectionBar OnInitialized");
 
-        DataChartCoreModule.Register(IgniteUIBlazor); //DataChartCategoryCoreModule.Register(IgniteUIBlazor);
-        DataChartCategoryModule.Register(IgniteUIBlazor);
-        DataChartInteractivityModule.Register(IgniteUIBlazor);
-        DataChartVerticalCategoryModule.Register(IgniteUIBlazor);
-        NumberAbbreviatorModule.Register(IgniteUIBlazor);
-        ItemToolTipLayerModule.Register(IgniteUIBlazor);
-        CategoryToolTipLayerModule.Register(IgniteUIBlazor);
+        IgbDataChartCoreModule.Register(IgniteUIBlazor); //DataChartCategoryCoreModule.Register(IgniteUIBlazor);
+        IgbDataChartCategoryModule.Register(IgniteUIBlazor);
+        IgbDataChartInteractivityModule.Register(IgniteUIBlazor);
+        IgbDataChartVerticalCategoryModule.Register(IgniteUIBlazor);
+        IgbNumberAbbreviatorModule.Register(IgniteUIBlazor);
+        IgbItemToolTipLayerModule.Register(IgniteUIBlazor);
+        IgbCategoryToolTipLayerModule.Register(IgniteUIBlazor);
 
-        LegendModule.Register(IgniteUIBlazor);
-        ItemLegendModule.Register(IgniteUIBlazor);
+        IgbLegendModule.Register(IgniteUIBlazor);
+        IgbItemLegendModule.Register(IgniteUIBlazor);
     }
 
     protected override async Task OnInitializedAsync()
diff --git a/usa-elections/Pages/ElectionBubbles.razor b/usa-elections/Pages/ElectionBubbles.razor
index 591dbd3..3e38b60 100644
--- a/usa-elections/Pages/ElectionBubbles.razor
+++ b/usa-elections/Pages/ElectionBubbles.razor
@@ -45,9 +45,9 @@
 
 
     private bool IsMapReady = false;
-    private GeographicSymbolSeries BubbleSeries;
-    private GeographicMap BubbleMap;
-    public GeographicMap BubbleMapRef
+    private IgbGeographicSymbolSeries BubbleSeries;
+    private IgbGeographicMap BubbleMap;
+    public IgbGeographicMap BubbleMapRef
     {
         get { return BubbleMap; }
         set { BubbleMap = value; this.OnChanged("BubbleMap"); }
@@ -112,8 +112,8 @@
     {
         Logger.WriteLine("ElectionBubbles OnInitialized");
 
-        DataChartInteractivityModule.Register(IgniteUIBlazor);
-        GeographicMapModule.Register(IgniteUIBlazor);
+        IgbDataChartInteractivityModule.Register(IgniteUIBlazor);
+        IgbGeographicMapModule.Register(IgniteUIBlazor);
     }
 
     public static Dictionary<string, StateLocation> StateLocations { get; set; }
@@ -183,7 +183,7 @@
             this.IsMapReady = true;
             if (this.BubbleMap != null)
             {
-                this.BubbleSeries = (GeographicSymbolSeries)this.BubbleMap.ActualSeries[0];
+                this.BubbleSeries = (IgbGeographicSymbolSeries)this.BubbleMap.ActualSeries[0];
             }
 
             OnChanged("RenderAsync");
diff --git a/usa-elections/Pages/ElectionChart.razor b/usa-elections/Pages/ElectionChart.razor
index 936fe3a..b0a82d9 100644
--- a/usa-elections/Pages/ElectionChart.razor
+++ b/usa-elections/Pages/ElectionChart.razor
@@ -128,7 +128,7 @@
 
 @code {
 
-    RenderFragment CreateTooltip(DataContext context)
+    RenderFragment CreateTooltip(IgbDataContext context)
     {
         var brush = "";
         var votes = "";
@@ -188,8 +188,8 @@
     public double DisplayMax { get { return DisplayMode == ElectionDisplayMode.Electoral ?
                 Election.TotalElectors : Election.TotalVotes; } }
 
-    private DataChart BarChart;
-    public DataChart BarChartRef
+    private IgbDataChart BarChart;
+    public IgbDataChart BarChartRef
     {
         get { return BarChart; }
         set { BarChart = value; this.OnChanged(); }
@@ -229,18 +229,18 @@
         base.OnInitialized();
         Logger.WriteLine("ElectionChart OnInitialized");
 
-        DataChartCoreModule.Register(IgniteUIBlazor);
-        DataChartCategoryModule.Register(IgniteUIBlazor);
-        DataChartInteractivityModule.Register(IgniteUIBlazor);
-        DataChartVerticalCategoryModule.Register(IgniteUIBlazor);
-        NumberAbbreviatorModule.Register(IgniteUIBlazor);
-        ItemToolTipLayerModule.Register(IgniteUIBlazor);
-        CategoryToolTipLayerModule.Register(IgniteUIBlazor);
+        IgbDataChartCoreModule.Register(IgniteUIBlazor);
+        IgbDataChartCategoryModule.Register(IgniteUIBlazor);
+        IgbDataChartInteractivityModule.Register(IgniteUIBlazor);
+        IgbDataChartVerticalCategoryModule.Register(IgniteUIBlazor);
+        IgbNumberAbbreviatorModule.Register(IgniteUIBlazor);
+        IgbItemToolTipLayerModule.Register(IgniteUIBlazor);
+        IgbCategoryToolTipLayerModule.Register(IgniteUIBlazor);
          
-        DataChartScatterModule.Register(IgniteUIBlazor);
+        IgbDataChartScatterModule.Register(IgniteUIBlazor);
 
-        LegendModule.Register(IgniteUIBlazor);
-        ItemLegendModule.Register(IgniteUIBlazor);
+        IgbLegendModule.Register(IgniteUIBlazor);
+        IgbItemLegendModule.Register(IgniteUIBlazor);
     }
 
     protected override async Task OnInitializedAsync()
diff --git a/usa-elections/Pages/ElectionGrid.razor b/usa-elections/Pages/ElectionGrid.razor
index 3909643..821d90b 100644
--- a/usa-elections/Pages/ElectionGrid.razor
+++ b/usa-elections/Pages/ElectionGrid.razor
@@ -12,7 +12,6 @@
         {
             <DataGrid Height="100%" Width="100%"
                       AutoGenerateColumns="false"
-                      SelectionMode="@GridSelectionMode.SingleRow"
                       ColumnShowingAnimationMode="@ColumnShowingAnimationMode.None"
                       ColumnAddingAnimationMode="@ColumnShowingAnimationMode.None"
                       ColumnMovingAnimationMode="@ColumnMovingAnimationMode.None"
@@ -91,14 +90,14 @@
     private DataSourceSummaryScope GridSummaryScope = DataSourceSummaryScope.Groups;
     private GroupSummaryDisplayMode GridGroupSummaryDisplayMode = GroupSummaryDisplayMode.Cells;
 
-    private DataGrid Grid;
-    private DataGrid GridRef
+    private IgbDataGrid Grid;
+    private IgbDataGrid GridRef
     {
         get { return Grid; }
         set { Grid = value; this.OnReferenced(); StateHasChanged(); }
     }
 
-    void OnGridSortChanged(GridSortDescriptionsChangedEventArgs args)
+    void OnGridSortChanged(IgbGridSortDescriptionsChangedEventArgs args)
     {
         var sortBy = Grid.SortDescriptions[0];
         //Logger.WriteLine("OnGridSortChanged " + sortBy.Name);
@@ -121,7 +120,7 @@
         }
     }
 
-    void OnCellClicked(GridCellEventArgs args)
+    void OnCellClicked(IgbDataGridCellEventArgs args)
     {
         //Logger.WriteLine("OnCellClicked " + args.Type);
     }
@@ -138,7 +137,7 @@
         Grid.SortDescriptionsChanged += OnGridSortChanged;
         Grid.CellClicked += OnCellClicked;
 
-        var ColumnGroup = new ColumnGroupDescription()
+        var ColumnGroup = new IgbColumnGroupDescription()
         {
             //Field = "State", DisplayName = "State"
             //Field = "CandidateName", DisplayName = "Candidate"
@@ -148,29 +147,31 @@
         this.Grid.IsGroupRowSticky = true;
         this.Grid.IsGroupExpandedDefault = false;
 
-        var SumVotes = new ColumnSummaryDescription()
+        var SumVotes = new IgbColumnSummaryDescription()
         {
-            Field = "V", DisplayName = "V", Operand = SummaryOperand.Sum
+            Field = "V", DisplayName = "V", Operand = DataSourceSummaryOperand.Sum
         };
-        var SumElectors = new ColumnSummaryDescription()
+        var SumElectors = new IgbColumnSummaryDescription()
         {
-            Field = "E", DisplayName = "E", Operand = SummaryOperand.Sum
+                Field = "E",
+                DisplayName = "E",
+                Operand = DataSourceSummaryOperand.Sum
         };
         //var SumPercentage = new ColumnSummaryDescription()
         //{
         //    Field = "TotalPercentage", DisplayName = "%", Operand = SummaryOperand.Sum
         //};
-        var SumVotesPerStatePercentage = new ColumnSummaryDescription()
+        var SumVotesPerStatePercentage = new IgbColumnSummaryDescription()
         {
             Field = "VotesPerStatePercentage",
-            Operand = SummaryOperand.Custom,
+            Operand = DataSourceSummaryOperand.Custom,
             ProvideCalculatorScript = "onCalculateVotesTotalPercentage"
         };
 
-        var CountStates = new ColumnSummaryDescription()
+        var CountStates = new IgbColumnSummaryDescription()
         {
             Field = "State",
-            Operand = SummaryOperand.Custom,
+            Operand = DataSourceSummaryOperand.Custom,
             ProvideCalculatorScript = "onCalculateState"
         };
         //var CountStates = new ColumnSummaryDescription()
@@ -178,10 +179,10 @@
         //    Field = "State", DisplayName = "State", Operand = SummaryOperand.Count
         //};
         
-        var SumParty = new ColumnSummaryDescription()
+        var SumParty = new IgbColumnSummaryDescription()
         {
             Field = "CandidateParty",
-            Operand = SummaryOperand.Custom,
+            Operand = DataSourceSummaryOperand.Custom,
             ProvideCalculatorScript = "onCalculateParty"
         };
         this.Grid.SummaryDescriptions.Add(CountStates);
@@ -206,7 +207,7 @@
         //Logger.WriteLine("App OnInit " + NavManager.BaseUri);
         //Logger.WriteLine("App OnInit " + NavManager.Uri);
 
-        DataGridModule.Register(IgniteUIBlazor);
+        IgbDataGridModule.Register(IgniteUIBlazor);
     }
 
     protected override async Task OnInitializedAsync()
diff --git a/usa-elections/Pages/ElectionHex.razor b/usa-elections/Pages/ElectionHex.razor
index cf15161..febd998 100644
--- a/usa-elections/Pages/ElectionHex.razor
+++ b/usa-elections/Pages/ElectionHex.razor
@@ -30,8 +30,8 @@
         base.OnInitialized();
         Logger.WriteLine("ElectionHex OnInitialized");
 
-        GeographicMapModule.Register(IgniteUIBlazor);
-        DataChartInteractivityModule.Register(IgniteUIBlazor);
+        IgbGeographicMapModule.Register(IgniteUIBlazor);
+        IgbDataChartInteractivityModule.Register(IgniteUIBlazor);
     }
 
     protected override async Task OnInitializedAsync()
@@ -42,9 +42,9 @@
         await Task.Delay(1);
     }
 
-    private GeographicMap         HexMap;
-    private GeographicShapeSeries HexSeries;
-    private ShapeDataSource       HexShapes;
+    private IgbGeographicMap HexMap;
+    private IgbGeographicShapeSeries HexSeries;
+    private IgbShapeDataSource HexShapes;
     private Dictionary<string, StateInfo> StatesLookup;
 
     protected override Task OnAfterRenderAsync(bool firstRender)
@@ -55,15 +55,15 @@
 
             if (this.HexMap != null)
             {
-                HexSeries = (GeographicShapeSeries)this.HexMap.ActualSeries[0];
+                HexSeries = (IgbGeographicShapeSeries)this.HexMap.ActualSeries[0];
                 HexSeries.ShapefileDataSource = (
-                    new ShapeDataSource() {
+                    new IgbShapeDataSource() {
                         Name="hexSeries",
                         //ImportCompletedScript = "onHexImportCompleted",
                         ShapefileSource = "shapes/usa_states_hex_map.shp",
                         DatabaseSource  = "shapes/usa_states_hex_map.dbf",
-                        ImportCompleted = new EventCallback<AsyncCompletedEventArgs>(null,
-                            (Func<AsyncCompletedEventArgs, Task>)OnImportCompleted)
+                            ImportCompleted = new EventCallback<IgbAsyncCompletedEventArgs>(null,
+                                (Func<IgbAsyncCompletedEventArgs, Task>)OnImportCompleted)
                     }
                 );
             }
@@ -71,7 +71,7 @@
         return base.OnAfterRenderAsync(firstRender);
     }
 
-    protected async Task OnImportCompleted(AsyncCompletedEventArgs args)
+    protected async Task OnImportCompleted(IgbAsyncCompletedEventArgs args)
     {
         Console.WriteLine("ElectionHex Shapes Importing... done");
 
@@ -265,7 +265,7 @@
         set { _DisplayMode = value; this.OnChanged("DisplayMode=" + value); }
     }
 
-    RenderFragment CreateTooltip(DataContext context)
+    RenderFragment CreateTooltip(IgbDataContext context)
     {
         return @<div class="ui-tooltip-content" >
                 <div>name</div>
diff --git a/usa-elections/Pages/ElectionSelector.razor b/usa-elections/Pages/ElectionSelector.razor
index c37b900..b154b70 100644
--- a/usa-elections/Pages/ElectionSelector.razor
+++ b/usa-elections/Pages/ElectionSelector.razor
@@ -8,7 +8,6 @@
     <DataGrid Height="100%" Width="100%" @ref="@GridRef"
               AutoGenerateColumns="false"
               DataSource="@Elections"
-              SelectionMode="@GridSelectionMode.SingleRow"
               HeaderHeight="32" RowHeight="40"
               IsColumnOptionsEnabled="false"
               ColumnMovingMode="@ColumnMovingMode.None"
@@ -28,7 +27,7 @@
 
 @code {     
 
-    private DataGrid GridRef;
+    private IgbDataGrid GridRef;
 
     private List<Election> elections;
     [Parameter]
@@ -56,7 +55,7 @@
         base.OnInitialized();
         Logger.WriteLine("ElectionSelector OnInitialized");
 
-        DataGridModule.Register(IgniteUIBlazor);
+        IgbDataGridModule.Register(IgniteUIBlazor);
 
         var allElections = new List<Election>();
         //allElections.Add(new Election { Year = 2022, Index = -1 } );
@@ -107,14 +106,14 @@
         return base.OnAfterRenderAsync(firstRender);
     }
 
-    protected void OnSelectedItemsChanged(GridSelectedItemsChangedEventArgs e)
+    protected void OnSelectedItemsChanged(IgbGridSelectedItemsChangedEventArgs e)
     {
         var election = e.CurrentItems[0] as Election;
         Console.WriteLine("Selector OnElectionChanged " + election.Year);
         this.Changed.InvokeAsync(election.Year);
     }
 
-    protected void OnSelectedCellsChanged(GridSelectedCellsChangedEventArgs e)
+    protected void OnSelectedCellsChanged(IgbGridSelectedCellsChangedEventArgs e)
     {
         var election = e.CurrentCells[0].RowItem as Election;
         Console.WriteLine("Selector OnElectionChanged " + election.Year);
diff --git a/usa-elections/Pages/ElectionTree.razor b/usa-elections/Pages/ElectionTree.razor
index 01aaf28..a87c74a 100644
--- a/usa-elections/Pages/ElectionTree.razor
+++ b/usa-elections/Pages/ElectionTree.razor
@@ -64,7 +64,7 @@
     public bool   TooltipVisible { get; set; }
     public string TooltipDisplay { get { return TooltipVisible ? "display: flex" : "display: none"; } }
 
-    void OnNodePointerOver(TreemapNodePointerEventArgs e)
+    void OnNodePointerOver(IgbTreemapNodePointerEventArgs e)
     {
         var position = e.Position;
         var x = e.Position.X;
@@ -101,14 +101,14 @@
         //Console.WriteLine("OnNodePointerOver " + item.StateSymbol + " " + TooltipPostion);
     }
 
-    void OnNodePointerEnter(TreemapNodePointerEventArgs e)
+    void OnNodePointerEnter(IgbTreemapNodePointerEventArgs e)
     {
         //if (e.IsOverHeader) return;
         //var item = e.Item as ResultsByState;
         //Console.WriteLine("OnNodePointerEnter " + item.StateSymbol + " " + e.Position.X);
     }
 
-    void OnNodePointerLeave(TreemapNodePointerEventArgs e)
+    void OnNodePointerLeave(IgbTreemapNodePointerEventArgs e)
     {
         TooltipVisible = false;
         StateHasChanged();
@@ -117,8 +117,8 @@
         //Console.WriteLine("OnNodePointerLeave " + item.StateSymbol + " " + e.Position.X);
     }
 
-    private Treemap Treemap;
-    public Treemap TreemapRef
+    private IgbTreemap Treemap;
+    public IgbTreemap TreemapRef
     {
         get { return Treemap; }
         set { Treemap = value; this.OnTreemap(); }
@@ -185,7 +185,7 @@
         TooltipVisible = false;
         Logger.WriteLine("ElectionTree OnInitialized");
 
-        TreemapModule.Register(IgniteUIBlazor);
+        IgbTreemapModule.Register(IgniteUIBlazor);
     }
 
     protected override async Task OnInitializedAsync()
diff --git a/usa-elections/Pages/MapShapesView.razor b/usa-elections/Pages/MapShapesView.razor
index cc32983..d4a9967 100644
--- a/usa-elections/Pages/MapShapesView.razor
+++ b/usa-elections/Pages/MapShapesView.razor
@@ -205,8 +205,8 @@
     private List<Election> AllElections;
     private Election SelectedElection;
 
-    private DataChart ElectionByStatesChart;
-    private DataChart ElectionByStatesChartRef
+    private IgbDataChart ElectionByStatesChart;
+    private IgbDataChart ElectionByStatesChartRef
     {
         get { return ElectionByStatesChart; }
         set { ElectionByStatesChart = value; this.OnElectionByStatesChartRef(); StateHasChanged(); }
@@ -278,16 +278,16 @@
         //ElectionByStatesChart.SizeChanged += ElectionChart;
     }
 
-    void OnChartSizeChanged(RectChangedEventArgs args)
+    void OnChartSizeChanged(IgbRectChangedEventArgs args)
     {
         //Logger.WriteLine("OnChartSizeChanged " + args.OldRect.Height + " " + args.OldRect.Width);
         //Logger.WriteLine("OnChartSizeChanged " + args.NewRect.Height + " " + args.NewRect.Width);
     }
 
     private List<ResultsByState>  ShapeLabels;
-    private ShapeDataSource       ShapeRecords;
-    private GeographicMap         ShapeMap;
-    private GeographicShapeSeries ShapeSeries;
+    private IgbShapeDataSource ShapeRecords;
+    private IgbGeographicMap         ShapeMap;
+    private IgbGeographicShapeSeries ShapeSeries;
 
     protected override void OnInitialized()
     {
@@ -297,16 +297,16 @@
         SplashVisible = true;
         VotesDisplayMode = ElectionDisplayMode.Electoral;
 
-        DataGridModule.Register(IgniteUIBlazor);
+        IgbDataGridModule.Register(IgniteUIBlazor);
 
-        GeographicMapModule.Register(IgniteUIBlazor);
+        IgbGeographicMapModule.Register(IgniteUIBlazor);
 
-        LegendModule.Register(IgniteUIBlazor);
-        DataChartCoreModule.Register(IgniteUIBlazor);
-        DataChartScatterModule.Register(IgniteUIBlazor);
-        DataChartScatterCoreModule.Register(IgniteUIBlazor);
-        DataChartInteractivityModule.Register(IgniteUIBlazor);
-        NumberAbbreviatorModule.Register(IgniteUIBlazor);
+        IgbLegendModule.Register(IgniteUIBlazor);
+        IgbDataChartCoreModule.Register(IgniteUIBlazor);
+        IgbDataChartScatterModule.Register(IgniteUIBlazor);
+        IgbDataChartScatterCoreModule.Register(IgniteUIBlazor);
+        IgbDataChartInteractivityModule.Register(IgniteUIBlazor);
+        IgbNumberAbbreviatorModule.Register(IgniteUIBlazor);
 
         StatesWithBoxes = new Dictionary<string, Point>();
         StatesWithSmallArea = new List<string> { "VT", "NH", "MA", "RI", "CT", "NJ", "DE", "DC", "MD"};
@@ -335,16 +335,16 @@
 
             if (this.ShapeMap != null)
             {
-                ShapeSeries = (GeographicShapeSeries)this.ShapeMap.ActualSeries[0];
+                ShapeSeries = (IgbGeographicShapeSeries)this.ShapeMap.ActualSeries[0];
                 ShapeSeries.ShapefileDataSource = (
-                    new ShapeDataSource() {
+                    new IgbShapeDataSource() {
                         Name="choroShapes",
                         //ShapefileSource = "shapes/usa_states_ak_below.shp",
                         //DatabaseSource  = "shapes/usa_states_ak_below.dbf",
                         ShapefileSource = "shapes/usa_states_centered.shp",
                         DatabaseSource  = "shapes/usa_states_centered.dbf",
-                        ImportCompleted = new EventCallback<AsyncCompletedEventArgs>(null,
-                            (Func<AsyncCompletedEventArgs, Task>)OnImportCompleted)
+                            ImportCompleted = new EventCallback<IgbAsyncCompletedEventArgs>(null,
+                                (Func<IgbAsyncCompletedEventArgs, Task>)OnImportCompleted)
                     }
                 );
             }
@@ -352,7 +352,7 @@
         return base.OnAfterRenderAsync(firstRender);
     }
 
-    protected async Task OnImportCompleted(AsyncCompletedEventArgs args)
+    protected async Task OnImportCompleted(IgbAsyncCompletedEventArgs args)
     {
         ElectionService.Http = Http;
         await ElectionService.Load();
diff --git a/usa-elections/USA-Elections.csproj b/usa-elections/USA-Elections.csproj
index 03e6552..81e913c 100644
--- a/usa-elections/USA-Elections.csproj
+++ b/usa-elections/USA-Elections.csproj
@@ -42,7 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IgniteUI.Blazor" Version="20.1.16" />
+    <PackageReference Include="IgniteUI.Blazor" Version="23.2.233" />
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.8" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" PrivateAssets="all" />