diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
index ff63712055..487dc74067 100644
--- a/.github/workflows/build_artifacts.yml
+++ b/.github/workflows/build_artifacts.yml
@@ -59,7 +59,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: Screenshots-${{ github.run_number }}
-          path: ${{ github.workspace }}/MaterialDesignThemes.UITests/bin/${{ inputs.build-configuration }}/net7.0-windows/Screenshots
+          path: ${{ github.workspace }}\MaterialDesignThemes.UITests\bin\${{ inputs.build-configuration }}\net6.0-windows\Screenshots
           if-no-files-found: ignore
 
       - name: Build NuGets
@@ -75,4 +75,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: DemoApp
-          path: "MainDemo.Wpf/bin/${{ env.buildConfiguration }}"
\ No newline at end of file
+          path: "MainDemo.Wpf/bin/${{ env.buildConfiguration }}"
diff --git a/MainDemo.Wpf/Buttons.xaml b/MainDemo.Wpf/Buttons.xaml
index 8945b66c7e..6315f3d2c0 100644
--- a/MainDemo.Wpf/Buttons.xaml
+++ b/MainDemo.Wpf/Buttons.xaml
@@ -399,7 +399,7 @@
                     Content="MID"
                     IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
                     Style="{StaticResource MaterialDesignFlatSecondaryMidBgButton}"
-                    ToolTip="MaterialDesignFlatAccentBackgroundButton" />
+                    ToolTip="MaterialDesignFlatSecondaryMidBgButton" />
           </smtx:XamlDisplay>
 
           <smtx:XamlDisplay Margin="8,0" UniqueKey="buttons_flat_bg_6">
@@ -464,8 +464,8 @@
                     materialDesign:RippleAssist.Feedback="#DD000000"
                     Content="CUSTOM RIPPLE"
                     IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
-                    Style="{StaticResource MaterialDesignRaisedAccentButton}"
-                    ToolTip="Resource name: MaterialDesignRaisedAccentButton" />
+                    Style="{StaticResource MaterialDesignRaisedSecondaryButton}"
+                    ToolTip="Resource name: MaterialDesignRaisedSecondaryButton" />
           </smtx:XamlDisplay>
 
           <smtx:XamlDisplay Margin="8,0" UniqueKey="buttons_22">
@@ -473,8 +473,8 @@
                     materialDesign:RippleAssist.IsDisabled="True"
                     Content="NO RIPPLE"
                     IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
-                    Style="{StaticResource MaterialDesignRaisedAccentButton}"
-                    ToolTip="Resource name: MaterialDesignRaisedAccentButton" />
+                    Style="{StaticResource MaterialDesignRaisedSecondaryButton}"
+                    ToolTip="Resource name: MaterialDesignRaisedSecondaryButton" />
           </smtx:XamlDisplay>
 
           <smtx:XamlDisplay Margin="8,0" UniqueKey="buttons_23">
@@ -572,8 +572,8 @@
           <Button Height="{StaticResource ButtonHeight}"
                   materialDesign:ButtonAssist.CornerRadius="25 25 0 0"
                   IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
-                  Style="{StaticResource MaterialDesignRaisedAccentButton}"
-                  ToolTip="MaterialDesignRaisedAccentButton with Round Top Corners">
+                  Style="{StaticResource MaterialDesignRaisedSecondaryButton}"
+                  ToolTip="MaterialDesignRaisedSecondaryButton with Round Top Corners">
             <TextBlock Text="25/50 Radius" />
           </Button>
         </Grid>
@@ -756,7 +756,7 @@
                   materialDesign:ButtonProgressAssist.Value="50"
                   Content="{materialDesign:PackIcon DotsHorizontal}"
                   IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
-                  Style="{StaticResource MaterialDesignFloatingActionAccentButton}" />
+                  Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}" />
         </smtx:XamlDisplay>
 
         <smtx:XamlDisplay Margin="8,0" UniqueKey="buttons_31">
@@ -894,10 +894,10 @@
       <smtx:XamlDisplay Margin="8,0,0,5" UniqueKey="buttons_11">
         <materialDesign:PopupBox IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
                                  PlacementMode="BottomAndAlignCentres"
-                                 Style="{StaticResource MaterialDesignMultiFloatingActionAccentPopupBox}"
+                                 Style="{StaticResource MaterialDesignMultiFloatingActionSecondaryPopupBox}"
                                  ToggleCheckedContentCommand="{Binding FloatingActionDemoCommand}"
                                  ToggleCheckedContentCommandParameter="wowsers"
-                                 ToolTip="PopupBox, Style MaterialDesignMultiFloatingActionAccentPopupBox">
+                                 ToolTip="PopupBox, Style MaterialDesignMultiFloatingActionSecondaryPopupBox">
           <materialDesign:PopupBox.ToggleCheckedContent>
             <materialDesign:PackIcon Width="24"
                                      Height="24"
@@ -949,9 +949,9 @@
 
     <StackPanel Grid.Row="13" Orientation="Horizontal">
       <smtx:XamlDisplay Margin="0,0,20,0" UniqueKey="button_duration_1">
-        <Button materialDesign:ShadowAssist.ShadowAnimationDuration="0:0:0" Style="{StaticResource MaterialDesignRaisedAccentButton}">
-          Instant Duration
-        </Button>
+        <Button materialDesign:ShadowAssist.ShadowAnimationDuration="0:0:0"
+                Style="{StaticResource MaterialDesignRaisedSecondaryButton}"
+                Content="Instant Duration" />
       </smtx:XamlDisplay>
       <smtx:XamlDisplay Margin="0,0,20,0" UniqueKey="button_duration_2">
         <Button>
@@ -965,4 +965,4 @@
       </smtx:XamlDisplay>
     </StackPanel>
   </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/MainDemo.Wpf/Cards.xaml b/MainDemo.Wpf/Cards.xaml
index bced80c523..067c7ca63e 100644
--- a/MainDemo.Wpf/Cards.xaml
+++ b/MainDemo.Wpf/Cards.xaml
@@ -38,7 +38,7 @@
                   Margin="0,0,16,-20"
                   HorizontalAlignment="Right"
                   VerticalAlignment="Bottom"
-                  Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}">
+                  Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}">
             <materialDesign:PackIcon Kind="Bike" />
           </Button>
           <StackPanel Grid.Row="1" Margin="8,24,8,0">
@@ -92,7 +92,7 @@
                   Margin="0,0,16,-20"
                   HorizontalAlignment="Right"
                   VerticalAlignment="Bottom"
-                  Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}">
+                  Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}">
             <materialDesign:PackIcon Kind="Bike" />
           </Button>
           <StackPanel Grid.Row="1" Margin="8,24,8,0">
@@ -148,7 +148,7 @@
                   Margin="0,0,16,-20"
                   HorizontalAlignment="Right"
                   VerticalAlignment="Bottom"
-                  Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}">
+                  Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}">
             <materialDesign:PackIcon Kind="ShareVariant" />
           </Button>
           <StackPanel Grid.Row="1" Margin="8,24,8,4">
diff --git a/MainDemo.Wpf/Chips.xaml b/MainDemo.Wpf/Chips.xaml
index 401540a2a0..88db5269e5 100644
--- a/MainDemo.Wpf/Chips.xaml
+++ b/MainDemo.Wpf/Chips.xaml
@@ -159,7 +159,7 @@
         </smtx:XamlDisplay>
 
         <smtx:XamlDisplay Margin="0,0,4,4" UniqueKey="chips_12">
-          <CheckBox IsChecked="True" Style="{StaticResource MaterialDesignFilterChipAccentCheckBox}">Secondary</CheckBox>
+          <CheckBox IsChecked="True" Style="{StaticResource MaterialDesignFilterChipSecondaryCheckBox}">Secondary</CheckBox>
         </smtx:XamlDisplay>
       </WrapPanel>
 
@@ -179,7 +179,7 @@
         <smtx:XamlDisplay Margin="0,0,4,4" UniqueKey="chips_15">
           <CheckBox Content="Secondary Outline"
                     IsChecked="True"
-                    Style="{StaticResource MaterialDesignFilterChipAccentOutlineCheckBox}" />
+                    Style="{StaticResource MaterialDesignFilterChipSecondaryOutlineCheckBox}" />
         </smtx:XamlDisplay>
       </WrapPanel>
 
@@ -208,7 +208,7 @@
 
         <materialDesign:Card Margin="4">
           <smtx:XamlDisplay Margin="4" UniqueKey="chips_18">
-            <ListBox Style="{StaticResource MaterialDesignFilterChipAccentListBox}">
+            <ListBox Style="{StaticResource MaterialDesignFilterChipSecondaryListBox}">
               <ListBoxItem Content="Mercury" />
               <ListBoxItem Content="Venus" IsSelected="True" />
               <ListBoxItem Content="Earth" />
@@ -243,7 +243,7 @@
 
         <materialDesign:Card Margin="4">
           <smtx:XamlDisplay Margin="4" UniqueKey="chips_21">
-            <ListBox Style="{StaticResource MaterialDesignFilterChipAccentOutlineListBox}">
+            <ListBox Style="{StaticResource MaterialDesignFilterChipSecondaryOutlineListBox}">
               <ListBoxItem Content="Mercury" />
               <ListBoxItem Content="Venus" IsSelected="True" />
               <ListBoxItem Content="Earth" />
@@ -279,7 +279,7 @@
         <smtx:XamlDisplay Margin="0,0,4,4" UniqueKey="chips_24">
           <RadioButton Content="Secondary"
                        GroupName="GroupChoiceChip"
-                       Style="{StaticResource MaterialDesignChoiceChipAccentRadioButton}" />
+                       Style="{StaticResource MaterialDesignChoiceChipSecondaryRadioButton}" />
         </smtx:XamlDisplay>
       </WrapPanel>
 
@@ -300,7 +300,7 @@
         <smtx:XamlDisplay Margin="0,0,4,4" UniqueKey="chips_27">
           <RadioButton Content="Secondary Outline"
                        GroupName="GroupChoiceChipOutline"
-                       Style="{StaticResource MaterialDesignChoiceChipAccentOutlineRadioButton}" />
+                       Style="{StaticResource MaterialDesignChoiceChipSecondaryOutlineRadioButton}" />
         </smtx:XamlDisplay>
       </WrapPanel>
 
@@ -329,7 +329,8 @@
 
         <materialDesign:Card Margin="4">
           <smtx:XamlDisplay Margin="0,0,6,4" UniqueKey="chips_30">
-            <ListBox x:Name="RadioButtonGroupChoiceChipAccent" Style="{StaticResource MaterialDesignChoiceChipAccentListBox}">
+            <ListBox x:Name="RadioButtonGroupChoiceChipSecondary"
+                     Style="{StaticResource MaterialDesignChoiceChipSecondaryListBox}">
               <ListBoxItem Content="Mercury" />
               <ListBoxItem Content="Venus" IsSelected="True" />
               <ListBoxItem Content="Earth" />
@@ -364,7 +365,8 @@
 
         <materialDesign:Card Margin="4">
           <smtx:XamlDisplay Margin="0,0,6,4" UniqueKey="chips_33">
-            <ListBox x:Name="RadioButtonGroupChoiceChipAccentOutline" Style="{StaticResource MaterialDesignChoiceChipAccentOutlineListBox}">
+            <ListBox x:Name="RadioButtonGroupChoiceChipSecondaryOutline"
+                     Style="{StaticResource MaterialDesignChoiceChipSecondaryOutlineListBox}">
               <ListBoxItem Content="Mercury" />
               <ListBoxItem Content="Venus" IsSelected="True" />
               <ListBoxItem Content="Earth" />
diff --git a/MainDemo.Wpf/ColorZones.xaml b/MainDemo.Wpf/ColorZones.xaml
index f478a07f7e..5d570af0d5 100644
--- a/MainDemo.Wpf/ColorZones.xaml
+++ b/MainDemo.Wpf/ColorZones.xaml
@@ -76,7 +76,7 @@
         <DockPanel>
           <ToggleButton VerticalAlignment="Center"
                         DockPanel.Dock="Right"
-                        Style="{StaticResource MaterialDesignSwitchAccentToggleButton}" />
+                        Style="{StaticResource MaterialDesignSwitchSecondaryToggleButton}" />
 
           <StackPanel materialDesign:RippleAssist.IsCentered="True" Orientation="Horizontal">
             <ToggleButton Style="{StaticResource MaterialDesignHamburgerToggleButton}" />
diff --git a/MainDemo.Wpf/Dialogs.xaml b/MainDemo.Wpf/Dialogs.xaml
index ae9dc83269..c5353e01b5 100644
--- a/MainDemo.Wpf/Dialogs.xaml
+++ b/MainDemo.Wpf/Dialogs.xaml
@@ -124,7 +124,7 @@
                       Command="{x:Static materialDesign:DialogHost.OpenDialogCommand}"
                       Content="{materialDesign:PackIcon Kind=Plus,
                                                         Size=22}"
-                      Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}" />
+                      Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}" />
             </Grid>
           </Border>
         </materialDesign:DialogHost>
@@ -324,7 +324,7 @@
                       Command="{x:Static materialDesign:DialogHost.OpenDialogCommand}"
                       Content="{materialDesign:PackIcon Kind=Plus,
                                                         Size=22}"
-                      Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}" />
+                      Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}" />
             </Grid>
           </Border>
         </materialDesign:DialogHost>
diff --git a/MainDemo.Wpf/Drawers.xaml b/MainDemo.Wpf/Drawers.xaml
index 49daec536d..ef9834ccef 100644
--- a/MainDemo.Wpf/Drawers.xaml
+++ b/MainDemo.Wpf/Drawers.xaml
@@ -187,7 +187,7 @@
                   Margin="4"
                   Command="{x:Static materialDesign:DrawerHost.OpenDrawerCommand}"
                   Content="{materialDesign:PackIcon Kind=ArrowAll}"
-                  Style="{StaticResource MaterialDesignRaisedAccentButton}" />
+                  Style="{StaticResource MaterialDesignRaisedSecondaryButton}" />
         </Grid>
 
       </materialDesign:DrawerHost>
diff --git a/MainDemo.Wpf/GroupBoxes.xaml b/MainDemo.Wpf/GroupBoxes.xaml
index 3039b58a57..1cbf84ca6c 100644
--- a/MainDemo.Wpf/GroupBoxes.xaml
+++ b/MainDemo.Wpf/GroupBoxes.xaml
@@ -68,7 +68,7 @@
                       UniqueKey="groupbox_4">
       <GroupBox Margin="16"
                 materialDesign:ColorZoneAssist.Mode="SecondaryMid"
-                Header="Accent Header"
+                Header="Secondary Header"
                 Style="{StaticResource MaterialDesignGroupBox}">
         <TextBlock Text="My Content" />
       </GroupBox>
@@ -120,7 +120,7 @@
                       UniqueKey="groupbox_7">
       <GroupBox Margin="16"
                 materialDesign:ColorZoneAssist.Mode="SecondaryMid"
-                Header="Card Group Box Accent"
+                Header="Card Group Box Secondary"
                 Style="{StaticResource MaterialDesignCardGroupBox}">
         <GroupBox.HeaderTemplate>
           <DataTemplate>
diff --git a/MainDemo.Wpf/NavigationRail.xaml b/MainDemo.Wpf/NavigationRail.xaml
index 685f607a65..b1a7bb878e 100644
--- a/MainDemo.Wpf/NavigationRail.xaml
+++ b/MainDemo.Wpf/NavigationRail.xaml
@@ -36,7 +36,7 @@
             <materialDesign:NavigationRailAssist.FloatingContent>
               <Button Margin="8"
                       Content="{materialDesign:PackIcon Kind=Plus}"
-                      Style="{StaticResource MaterialDesignFloatingActionAccentButton}" />
+                      Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}" />
             </materialDesign:NavigationRailAssist.FloatingContent>
             <TabItem>
               <TabItem.Header>
@@ -399,7 +399,7 @@
                     Style="{StaticResource MaterialDesignNavigationRailTabControl}"
                     TabStripPlacement="Top">
           <materialDesign:NavigationRailAssist.FloatingContent>
-            <Button Margin="8" Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
+            <Button Margin="8" Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}">
               <materialDesign:PackIcon Width="24"
                                        Height="24"
                                        Kind="Plus" />
diff --git a/MainDemo.Wpf/Snackbars.xaml b/MainDemo.Wpf/Snackbars.xaml
index ec3829962e..c4c7e4f9c2 100644
--- a/MainDemo.Wpf/Snackbars.xaml
+++ b/MainDemo.Wpf/Snackbars.xaml
@@ -236,7 +236,7 @@
 
         <smtx:XamlDisplay Margin="0,8,0,0" UniqueKey="snackbar_6">
           <materialDesign:Snackbar IsActive="True">
-            <materialDesign:SnackbarMessage ActionContent="ACCENT" Content="Default - accent" />
+            <materialDesign:SnackbarMessage ActionContent="SECONDARY" Content="Default - secondary" />
           </materialDesign:Snackbar>
         </smtx:XamlDisplay>
         <smtx:XamlDisplay Margin="0,8,0,0" UniqueKey="snackbar_7">
diff --git a/MainDemo.Wpf/Toggles.xaml b/MainDemo.Wpf/Toggles.xaml
index 01e43c6012..101202fcc5 100644
--- a/MainDemo.Wpf/Toggles.xaml
+++ b/MainDemo.Wpf/Toggles.xaml
@@ -60,8 +60,8 @@
       <smtx:XamlDisplay Margin="0,5,8,8" UniqueKey="buttons_36">
         <ToggleButton Content="C"
                       IsChecked="True"
-                      Style="{StaticResource MaterialDesignActionAccentToggleButton}"
-                      ToolTip="MaterialDesignActionAccentToggleButton" />
+                      Style="{StaticResource MaterialDesignActionSecondaryToggleButton}"
+                      ToolTip="MaterialDesignActionSecondaryToggleButton" />
       </smtx:XamlDisplay>
 
       <smtx:XamlDisplay Margin="0,5,8,8" UniqueKey="buttons_37">
@@ -173,9 +173,9 @@
       </smtx:XamlDisplay>
 
       <smtx:XamlDisplay Margin="8,0,0,0" UniqueKey="buttons_67">
-        <RadioButton Content="Accent"
+        <RadioButton Content="Secondary"
                      IsChecked="True"
-                     Style="{StaticResource MaterialDesignAccentRadioButton}" />
+                     Style="{StaticResource MaterialDesignSecondaryRadioButton}" />
       </smtx:XamlDisplay>
 
       <smtx:XamlDisplay Margin="8,0,0,0" UniqueKey="buttons_68">
@@ -191,9 +191,9 @@
       </smtx:XamlDisplay>
 
       <smtx:XamlDisplay Margin="8,0,0,0" UniqueKey="buttons_70">
-        <CheckBox Content="Accent"
+        <CheckBox Content="Secondary"
                   IsChecked="True"
-                  Style="{StaticResource MaterialDesignAccentCheckBox}" />
+                  Style="{StaticResource MaterialDesignSecondaryCheckBox}" />
       </smtx:XamlDisplay>
     </StackPanel>
 
@@ -241,8 +241,8 @@
                         VerticalAlignment="Center"
                         UniqueKey="buttons_51">
         <ToggleButton IsChecked="True"
-                      Style="{StaticResource MaterialDesignSwitchAccentToggleButton}"
-                      ToolTip="MaterialDesignSwitchAccentToggleButton" />
+                      Style="{StaticResource MaterialDesignSwitchSecondaryToggleButton}"
+                      ToolTip="MaterialDesignSwitchSecondaryToggleButton" />
       </smtx:XamlDisplay>
 
       <smtx:XamlDisplay Margin="8,0,0,0"
diff --git a/MainDemo.Wpf/TransitionsDemo/Slide2_Intro.xaml b/MainDemo.Wpf/TransitionsDemo/Slide2_Intro.xaml
index 4ea7795f49..64d87ee4cb 100644
--- a/MainDemo.Wpf/TransitionsDemo/Slide2_Intro.xaml
+++ b/MainDemo.Wpf/TransitionsDemo/Slide2_Intro.xaml
@@ -34,7 +34,7 @@
       <Button Grid.Row="1"
               HorizontalAlignment="Right"
               Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
-              Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
+              Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}">
         <materialDesign:PackIcon Kind="StepForward" />
       </Button>
     </Grid>
diff --git a/MainDemo.Wpf/TransitionsDemo/Slide3_Intro.xaml b/MainDemo.Wpf/TransitionsDemo/Slide3_Intro.xaml
index c46b7aa8e0..f05e98171c 100644
--- a/MainDemo.Wpf/TransitionsDemo/Slide3_Intro.xaml
+++ b/MainDemo.Wpf/TransitionsDemo/Slide3_Intro.xaml
@@ -28,7 +28,7 @@
         </Button>
         <Button Margin="16"
                 Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
-                Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
+                Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}">
           <materialDesign:PackIcon Kind="StepForward" />
         </Button>
       </StackPanel>
diff --git a/MainDemo.Wpf/TransitionsDemo/Slide4_CombineTransitions.xaml b/MainDemo.Wpf/TransitionsDemo/Slide4_CombineTransitions.xaml
index 7151aacc27..af4a336f0f 100644
--- a/MainDemo.Wpf/TransitionsDemo/Slide4_CombineTransitions.xaml
+++ b/MainDemo.Wpf/TransitionsDemo/Slide4_CombineTransitions.xaml
@@ -33,7 +33,7 @@
         <Button Margin="16"
                 VerticalAlignment="Top"
                 Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
-                Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
+                Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}">
           <materialDesign:PackIcon Kind="StepForward" />
         </Button>
       </StackPanel>
diff --git a/MainDemo.Wpf/TransitionsDemo/Slide5_TransitioningContent.xaml b/MainDemo.Wpf/TransitionsDemo/Slide5_TransitioningContent.xaml
index d0b5aa9749..fce7d50661 100644
--- a/MainDemo.Wpf/TransitionsDemo/Slide5_TransitioningContent.xaml
+++ b/MainDemo.Wpf/TransitionsDemo/Slide5_TransitioningContent.xaml
@@ -141,7 +141,7 @@
       <Button Margin="16"
               VerticalAlignment="Top"
               Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
-              Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
+              Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}">
         <materialDesign:PackIcon Kind="StepForward" />
       </Button>
     </StackPanel>
diff --git a/MainDemo.Wpf/TransitionsDemo/Slide7_MVVM.xaml b/MainDemo.Wpf/TransitionsDemo/Slide7_MVVM.xaml
index a11de0e454..19293a3b22 100644
--- a/MainDemo.Wpf/TransitionsDemo/Slide7_MVVM.xaml
+++ b/MainDemo.Wpf/TransitionsDemo/Slide7_MVVM.xaml
@@ -34,7 +34,7 @@
           <materialDesign:PackIcon Kind="StepBackward" />
         </Button>
         <!--
-                <Button Style="{StaticResource MaterialDesignFloatingActionAccentButton}"
+                <Button Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}"
                     Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
                     VerticalAlignment="Top"
                     Margin="16">
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.ToggleButton.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.ToggleButton.xaml
index 2d9a725f99..385ca10cd9 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.ToggleButton.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.ToggleButton.xaml
@@ -220,7 +220,7 @@
     <Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkForegroundBrush}" />
   </Style>
 
-  <Style x:Key="MaterialDesignActionAccentToggleButton"
+  <Style x:Key="MaterialDesignActionSecondaryToggleButton"
          TargetType="{x:Type ToggleButton}"
          BasedOn="{StaticResource MaterialDesignActionToggleButton}">
     <Setter Property="Background" Value="{DynamicResource SecondaryHueMidBrush}" />
@@ -228,6 +228,11 @@
     <Setter Property="Foreground" Value="{DynamicResource SecondaryHueMidForegroundBrush}" />
   </Style>
 
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignActionAccentToggleButton"
+         TargetType="{x:Type ToggleButton}"
+         BasedOn="{StaticResource MaterialDesignActionSecondaryToggleButton}"/>
+
   <Style x:Key="MaterialDesignFlatToggleButton" TargetType="{x:Type ToggleButton}">
     <Setter Property="Background" Value="{DynamicResource MaterialDesignToolBackground}" />
     <Setter Property="FontSize" Value="18" />
@@ -646,7 +651,12 @@
     <Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkForegroundBrush}" />
   </Style>
 
+  <!-- Obsolete -->
   <Style x:Key="MaterialDesignSwitchAccentToggleButton"
+         TargetType="{x:Type ToggleButton}"
+         BasedOn="{StaticResource MaterialDesignSwitchSecondaryToggleButton}"/>
+
+  <Style x:Key="MaterialDesignSwitchSecondaryToggleButton"
          TargetType="{x:Type ToggleButton}"
          BasedOn="{StaticResource MaterialDesignSwitchToggleButton}">
     <Setter Property="Background" Value="{DynamicResource SecondaryHueMidBrush}" />
@@ -931,5 +941,4 @@
     <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="Width" Value="37" />
   </Style>
-
 </ResourceDictionary>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml
index ae8d45a569..90234f72d7 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml
@@ -168,6 +168,7 @@
     <Setter Property="Foreground" Value="{DynamicResource SecondaryHueDarkForegroundBrush}" />
   </Style>
 
+  <!-- Obsolete -->
   <Style x:Key="MaterialDesignRaisedAccentButton"
          TargetType="{x:Type ButtonBase}"
          BasedOn="{StaticResource MaterialDesignRaisedSecondaryButton}" />
@@ -295,6 +296,7 @@
     <Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource SecondaryHueDarkBrush}" />
   </Style>
 
+  <!-- Obsolete -->
   <Style x:Key="MaterialDesignFlatAccentButton"
          TargetType="{x:Type ButtonBase}"
          BasedOn="{StaticResource MaterialDesignFlatSecondaryButton}" />
@@ -338,6 +340,7 @@
     <Setter Property="wpf:ElevationAssist.Elevation" Value="Dp0" />
   </Style>
 
+  <!-- Obsolete -->
   <Style x:Key="MaterialDesignFlatAccentBgButton"
          TargetType="{x:Type ButtonBase}"
          BasedOn="{StaticResource MaterialDesignFlatSecondaryMidBgButton}" />
@@ -673,6 +676,7 @@
     <Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource SecondaryHueLightBrush}" />
   </Style>
 
+  <!-- Obsolete -->
   <Style x:Key="MaterialDesignFloatingActionMiniAccentButton"
          TargetType="{x:Type ButtonBase}"
          BasedOn="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}" />
@@ -722,6 +726,7 @@
     <Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource SecondaryHueLightBrush}" />
   </Style>
 
+  <!-- Obsolete -->
   <Style x:Key="MaterialDesignFloatingActionAccentButton"
          TargetType="{x:Type ButtonBase}"
          BasedOn="{StaticResource MaterialDesignFloatingActionSecondaryButton}" />
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.CheckBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.CheckBox.xaml
index 77aaa371eb..4d3de4f8c8 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.CheckBox.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.CheckBox.xaml
@@ -58,7 +58,7 @@
     <Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkForegroundBrush}" />
   </Style>
 
-  <Style x:Key="MaterialDesignActionAccentCheckBox"
+  <Style x:Key="MaterialDesignActionSecondaryCheckBox"
          TargetType="{x:Type CheckBox}"
          BasedOn="{StaticResource MaterialDesignActionCheckBox}">
     <Setter Property="Background" Value="{DynamicResource SecondaryHueMidBrush}" />
@@ -66,6 +66,12 @@
     <Setter Property="Foreground" Value="{DynamicResource SecondaryHueMidForegroundBrush}" />
   </Style>
 
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignActionAccentCheckBox"
+         TargetType="{x:Type CheckBox}"
+         BasedOn="{StaticResource MaterialDesignActionSecondaryCheckBox}"/>
+
+
   <Style x:Key="MaterialDesignCheckBox" TargetType="{x:Type CheckBox}">
     <Setter Property="Background" Value="{DynamicResource PrimaryHueMidBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
@@ -196,13 +202,18 @@
     <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueDarkBrush}" />
   </Style>
 
-  <Style x:Key="MaterialDesignAccentCheckBox"
+  <Style x:Key="MaterialDesignSecondaryCheckBox"
          TargetType="{x:Type CheckBox}"
          BasedOn="{StaticResource MaterialDesignCheckBox}">
     <Setter Property="Background" Value="{DynamicResource SecondaryHueMidBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource SecondaryHueMidBrush}" />
   </Style>
 
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignAccentCheckBox"
+         TargetType="{x:Type CheckBox}"
+         BasedOn="{StaticResource MaterialDesignSecondaryCheckBox}" />
+
   <Style x:Key="MaterialDesignUserForegroundCheckBox" TargetType="{x:Type CheckBox}">
     <Setter Property="BorderThickness" Value="1" />
     <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
@@ -691,7 +702,7 @@
     </Style.Triggers>
   </Style>
 
-  <Style x:Key="MaterialDesignFilterChipAccentCheckBox"
+  <Style x:Key="MaterialDesignFilterChipSecondaryCheckBox"
          TargetType="CheckBox"
          BasedOn="{StaticResource MaterialDesignFilterChipCheckBox}">
     <Setter Property="Background" Value="{DynamicResource SecondaryHueLightBrush}" />
@@ -710,6 +721,10 @@
     </Style.Triggers>
   </Style>
 
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignFilterChipAccentCheckBox"
+         TargetType="CheckBox"
+         BasedOn="{StaticResource MaterialDesignFilterChipSecondaryCheckBox}" />
 
   <Style x:Key="MaterialDesignFilterChipPrimaryOutlineCheckBox"
          TargetType="CheckBox"
@@ -731,7 +746,7 @@
     </Style.Triggers>
   </Style>
 
-  <Style x:Key="MaterialDesignFilterChipAccentOutlineCheckBox"
+  <Style x:Key="MaterialDesignFilterChipSecondaryOutlineCheckBox"
          TargetType="CheckBox"
          BasedOn="{StaticResource MaterialDesignFilterChipOutlineCheckBox}">
     <Setter Property="Background" Value="{DynamicResource SecondaryHueLightBrush}" />
@@ -750,4 +765,10 @@
       </MultiDataTrigger>
     </Style.Triggers>
   </Style>
-</ResourceDictionary>
\ No newline at end of file
+
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignFilterChipAccentOutlineCheckBox"
+         TargetType="CheckBox"
+         BasedOn="{StaticResource MaterialDesignFilterChipSecondaryOutlineCheckBox}" />
+  
+</ResourceDictionary>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ListBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ListBox.xaml
index c71631973f..332b34c380 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ListBox.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ListBox.xaml
@@ -541,7 +541,7 @@
 
   </Style>
 
-  <Style x:Key="MaterialDesignNavigationAccentListBoxItem"
+  <Style x:Key="MaterialDesignNavigationSecondaryListBoxItem"
          TargetType="{x:Type ListBoxItem}"
          BasedOn="{StaticResource MaterialDesignNavigationListBoxItem}">
     <Setter Property="Background" Value="{DynamicResource SecondaryHueMidBrush}" />
@@ -562,6 +562,11 @@
 
   </Style>
 
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignNavigationAccentListBoxItem"
+         TargetType="{x:Type ListBoxItem}"
+         BasedOn="{StaticResource MaterialDesignNavigationSecondaryListBoxItem}" />
+
   <Style x:Key="MaterialDesignNavigationListBox"
          TargetType="{x:Type ListBox}"
          BasedOn="{StaticResource MaterialDesignListBox}">
@@ -574,12 +579,17 @@
     <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignNavigationPrimaryListBoxItem}" />
   </Style>
 
-  <Style x:Key="MaterialDesignNavigationAccentListBox"
+  <Style x:Key="MaterialDesignNavigationSecondaryListBox"
          TargetType="{x:Type ListBox}"
          BasedOn="{StaticResource MaterialDesignListBox}">
-    <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignNavigationAccentListBoxItem}" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignNavigationSecondaryListBoxItem}" />
   </Style>
 
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignNavigationAccentListBox"
+         TargetType="{x:Type ListBox}"
+         BasedOn="{StaticResource MaterialDesignNavigationSecondaryListBox}" />
+
   <!--#endregion-->
 
   <!--#region Filter Chip-->
@@ -682,7 +692,7 @@
     <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignFilterChipPrimaryListBoxItem}" />
   </Style>
 
-  <Style x:Key="MaterialDesignFilterChipAccentListBoxItem" TargetType="{x:Type ListBoxItem}">
+  <Style x:Key="MaterialDesignFilterChipSecondaryListBoxItem" TargetType="{x:Type ListBoxItem}">
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ListBoxItem}">
@@ -696,18 +706,28 @@
                     FontStyle="{TemplateBinding FontStyle}"
                     FontWeight="{TemplateBinding FontWeight}"
                     IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
-                    Style="{StaticResource MaterialDesignFilterChipAccentCheckBox}" />
+                    Style="{StaticResource MaterialDesignFilterChipSecondaryCheckBox}" />
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
 
-  <Style x:Key="MaterialDesignFilterChipAccentListBox"
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignFilterChipAccentListBoxItem"
+         TargetType="{x:Type ListBoxItem}"
+         BasedOn="{StaticResource MaterialDesignFilterChipSecondaryListBoxItem}" />
+
+  <Style x:Key="MaterialDesignFilterChipSecondaryListBox"
          TargetType="{x:Type ListBox}"
          BasedOn="{StaticResource MaterialDesignFilterChipListBox}">
-    <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignFilterChipAccentListBoxItem}" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignFilterChipSecondaryListBoxItem}" />
   </Style>
 
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignFilterChipAccentListBox"
+         TargetType="{x:Type ListBox}"
+         BasedOn="{StaticResource MaterialDesignFilterChipSecondaryListBox}" />
+
   <Style x:Key="MaterialDesignFilterChipOutlineListBoxItem" TargetType="{x:Type ListBoxItem}">
     <Setter Property="Template">
       <Setter.Value>
@@ -760,7 +780,7 @@
     <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignFilterChipPrimaryOutlineListBoxItem}" />
   </Style>
 
-  <Style x:Key="MaterialDesignFilterChipAccentOutlineListBoxItem" TargetType="{x:Type ListBoxItem}">
+  <Style x:Key="MaterialDesignFilterChipSecondaryOutlineListBoxItem" TargetType="{x:Type ListBoxItem}">
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ListBoxItem}">
@@ -774,18 +794,27 @@
                     FontStyle="{TemplateBinding FontStyle}"
                     FontWeight="{TemplateBinding FontWeight}"
                     IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
-                    Style="{StaticResource MaterialDesignFilterChipAccentOutlineCheckBox}" />
+                    Style="{StaticResource MaterialDesignFilterChipSecondaryOutlineCheckBox}" />
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
 
-  <Style x:Key="MaterialDesignFilterChipAccentOutlineListBox"
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignFilterChipAccentOutlineListBoxItem"
+         TargetType="{x:Type ListBoxItem}"
+         BasedOn="{StaticResource MaterialDesignFilterChipSecondaryOutlineListBoxItem}" />
+
+  <Style x:Key="MaterialDesignFilterChipSecondaryOutlineListBox"
          TargetType="{x:Type ListBox}"
          BasedOn="{StaticResource MaterialDesignFilterChipListBox}">
-    <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignFilterChipAccentOutlineListBoxItem}" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignFilterChipSecondaryOutlineListBoxItem}" />
   </Style>
 
+  <Style x:Key="MaterialDesignFilterChipAccentOutlineListBox"
+         TargetType="{x:Type ListBox}"
+         BasedOn="{StaticResource MaterialDesignFilterChipSecondaryOutlineListBox}"/>
+
   <!--#endregion-->
 
   <!--#region Choice Chip-->
@@ -844,7 +873,7 @@
     <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignChoiceChipPrimaryListBoxItem}" />
   </Style>
 
-  <Style x:Key="MaterialDesignChoiceChipAccentListBoxItem" TargetType="{x:Type ListBoxItem}">
+  <Style x:Key="MaterialDesignChoiceChipSecondaryListBoxItem" TargetType="{x:Type ListBoxItem}">
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ListBoxItem}">
@@ -859,18 +888,28 @@
                        FontWeight="{TemplateBinding FontWeight}"
                        GroupName="{Binding Name, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"
                        IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
-                       Style="{StaticResource MaterialDesignChoiceChipAccentRadioButton}" />
+                       Style="{StaticResource MaterialDesignChoiceChipSecondaryRadioButton}" />
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
 
-  <Style x:Key="MaterialDesignChoiceChipAccentListBox"
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignChoiceChipAccentListBoxItem"
+         TargetType="{x:Type ListBoxItem}"
+         BasedOn="{StaticResource MaterialDesignChoiceChipSecondaryListBoxItem}"/>
+
+  <Style x:Key="MaterialDesignChoiceChipSecondaryListBox"
          TargetType="{x:Type ListBox}"
          BasedOn="{StaticResource MaterialDesignChoiceChipListBox}">
-    <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignChoiceChipAccentListBoxItem}" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignChoiceChipSecondaryListBoxItem}" />
   </Style>
 
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignChoiceChipAccentListBox"
+         TargetType="{x:Type ListBox}"
+         BasedOn="{StaticResource MaterialDesignChoiceChipSecondaryListBox}"/>
+
   <Style x:Key="MaterialDesignChoiceChipOutlineListBoxItem" TargetType="{x:Type ListBoxItem}">
     <Setter Property="Template">
       <Setter.Value>
@@ -925,7 +964,7 @@
     <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBoxItem}" />
   </Style>
 
-  <Style x:Key="MaterialDesignChoiceChipAccentOutlineListBoxItem" TargetType="{x:Type ListBoxItem}">
+  <Style x:Key="MaterialDesignChoiceChipSecondaryOutlineListBoxItem" TargetType="{x:Type ListBoxItem}">
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ListBoxItem}">
@@ -940,17 +979,27 @@
                        FontWeight="{TemplateBinding FontWeight}"
                        GroupName="{Binding Name, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"
                        IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
-                       Style="{StaticResource MaterialDesignChoiceChipAccentOutlineRadioButton}" />
+                       Style="{StaticResource MaterialDesignChoiceChipSecondaryOutlineRadioButton}" />
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
 
-  <Style x:Key="MaterialDesignChoiceChipAccentOutlineListBox"
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignChoiceChipAccentOutlineListBoxItem"
+         TargetType="{x:Type ListBoxItem}"
+         BasedOn="{StaticResource MaterialDesignChoiceChipSecondaryOutlineListBoxItem}"/>
+
+  <Style x:Key="MaterialDesignChoiceChipSecondaryOutlineListBox"
          TargetType="{x:Type ListBox}"
          BasedOn="{StaticResource MaterialDesignChoiceChipListBox}">
-    <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignChoiceChipAccentOutlineListBoxItem}" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignChoiceChipSecondaryOutlineListBoxItem}" />
   </Style>
 
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignChoiceChipAccentOutlineListBox"
+         TargetType="{x:Type ListBox}"
+         BasedOn="{StaticResource MaterialDesignChoiceChipSecondaryOutlineListBox}" />
+
   <!--#endregion-->
 </ResourceDictionary>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml
index 73bd3e29de..ae76295fcd 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml
@@ -479,7 +479,7 @@
     <Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkForegroundBrush}" />
   </Style>
 
-  <Style x:Key="MaterialDesignMultiFloatingActionAccentPopupBox"
+  <Style x:Key="MaterialDesignMultiFloatingActionSecondaryPopupBox"
          TargetType="{x:Type wpf:PopupBox}"
          BasedOn="{StaticResource MaterialDesignMultiFloatingActionPopupBox}">
     <Setter Property="Background" Value="{DynamicResource SecondaryHueMidBrush}" />
@@ -487,4 +487,9 @@
     <Setter Property="Foreground" Value="{DynamicResource SecondaryHueMidForegroundBrush}" />
   </Style>
 
-</ResourceDictionary>
\ No newline at end of file
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignMultiFloatingActionAccentPopupBox"
+         TargetType="{x:Type wpf:PopupBox}"
+         BasedOn="{StaticResource MaterialDesignMultiFloatingActionSecondaryPopupBox}"/>
+
+</ResourceDictionary>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml
index 2962d597c7..1994dce411 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml
@@ -160,13 +160,18 @@
     <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueDarkBrush}" />
   </Style>
 
-  <Style x:Key="MaterialDesignAccentRadioButton"
+  <Style x:Key="MaterialDesignSecondaryRadioButton"
          TargetType="{x:Type RadioButton}"
          BasedOn="{StaticResource MaterialDesignRadioButton}">
     <Setter Property="Background" Value="{DynamicResource SecondaryHueMidBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource SecondaryHueMidBrush}" />
   </Style>
 
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignAccentRadioButton"
+         TargetType="{x:Type RadioButton}"
+         BasedOn="{StaticResource MaterialDesignSecondaryRadioButton}" />
+
   <Style x:Key="MaterialDesignUserForegroundRadioButton" TargetType="{x:Type RadioButton}">
     <Setter Property="BorderThickness" Value="1" />
     <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
@@ -809,7 +814,7 @@
     </Style.Triggers>
   </Style>
 
-  <Style x:Key="MaterialDesignChoiceChipAccentRadioButton"
+  <Style x:Key="MaterialDesignChoiceChipSecondaryRadioButton"
          TargetType="{x:Type RadioButton}"
          BasedOn="{StaticResource MaterialDesignChoiceChipRadioButton}">
     <Setter Property="Background" Value="{DynamicResource SecondaryHueLightBrush}" />
@@ -828,6 +833,11 @@
     </Style.Triggers>
   </Style>
 
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignChoiceChipAccentRadioButton"
+         TargetType="{x:Type RadioButton}"
+         BasedOn="{StaticResource MaterialDesignChoiceChipSecondaryRadioButton}" />
+
   <Style x:Key="MaterialDesignChoiceChipPrimaryOutlineRadioButton"
          TargetType="{x:Type RadioButton}"
          BasedOn="{StaticResource MaterialDesignChoiceChipOutlineRadioButton}">
@@ -848,7 +858,7 @@
     </Style.Triggers>
   </Style>
 
-  <Style x:Key="MaterialDesignChoiceChipAccentOutlineRadioButton"
+  <Style x:Key="MaterialDesignChoiceChipSecondaryOutlineRadioButton"
          TargetType="{x:Type RadioButton}"
          BasedOn="{StaticResource MaterialDesignChoiceChipOutlineRadioButton}">
     <Setter Property="Background" Value="{DynamicResource SecondaryHueLightBrush}" />
@@ -868,4 +878,9 @@
     </Style.Triggers>
   </Style>
 
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignChoiceChipAccentOutlineRadioButton"
+         TargetType="{x:Type RadioButton}"
+         BasedOn="{StaticResource MaterialDesignChoiceChipSecondaryOutlineRadioButton}" />
+
 </ResourceDictionary>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml
index eab4bd0b64..2e233cbe5d 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml
@@ -212,7 +212,7 @@
     <Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkForegroundBrush}" />
   </Style>
 
-  <Style x:Key="MaterialDesignActionAccentToggleButton"
+  <Style x:Key="MaterialDesignActionSecondaryToggleButton"
          TargetType="{x:Type ToggleButton}"
          BasedOn="{StaticResource MaterialDesignActionToggleButton}">
     <Setter Property="Background" Value="{DynamicResource SecondaryHueMidBrush}" />
@@ -220,6 +220,11 @@
     <Setter Property="Foreground" Value="{DynamicResource SecondaryHueMidForegroundBrush}" />
   </Style>
 
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignActionAccentToggleButton"
+         TargetType="{x:Type ToggleButton}"
+         BasedOn="{StaticResource MaterialDesignActionSecondaryToggleButton}" />
+
   <Style x:Key="MaterialDesignFlatToggleButton" TargetType="{x:Type ToggleButton}">
     <Setter Property="Background" Value="{DynamicResource MaterialDesignToolBackground}" />
     <Setter Property="FontSize" Value="18" />
@@ -544,12 +549,17 @@
     <Setter Property="Background" Value="{DynamicResource PrimaryHueDarkBrush}" />
   </Style>
 
-  <Style x:Key="MaterialDesignSwitchAccentToggleButton"
+  <Style x:Key="MaterialDesignSwitchSecondaryToggleButton"
          TargetType="{x:Type ToggleButton}"
          BasedOn="{StaticResource MaterialDesignSwitchToggleButton}">
     <Setter Property="Background" Value="{DynamicResource SecondaryHueMidBrush}" />
   </Style>
 
+  <!-- Obsolete -->
+  <Style x:Key="MaterialDesignSwitchAccentToggleButton"
+         TargetType="{x:Type ToggleButton}"
+         BasedOn="{StaticResource MaterialDesignSwitchSecondaryToggleButton}" />
+
   <Style x:Key="MaterialDesignHamburgerToggleButton" TargetType="{x:Type ToggleButton}">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="BorderThickness" Value="1" />