diff --git a/Flow.Launcher/Resources/Controls/Card.xaml b/Flow.Launcher/Resources/Controls/Card.xaml
index 33c1299a9..e3c5f8194 100644
--- a/Flow.Launcher/Resources/Controls/Card.xaml
+++ b/Flow.Launcher/Resources/Controls/Card.xaml
@@ -38,21 +38,21 @@
                                 <Setter Property="Background" Value="Transparent" />
                             </DataTrigger>
 
-                            <DataTrigger Binding="{Binding (local:CardGroup.Position), RelativeSource={RelativeSource AncestorType=local:Card}}" Value="First">
+                            <DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:Card}}" Value="First">
                                 <Setter Property="Margin" Value="0" />
                                 <Setter Property="CornerRadius" Value="0" />
                                 <Setter Property="Background" Value="Transparent" />
                                 <Setter Property="BorderThickness" Value="0" />
                             </DataTrigger>
 
-                            <DataTrigger Binding="{Binding (local:CardGroup.Position), RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Middle">
+                            <DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Middle">
                                 <Setter Property="Margin" Value="0" />
                                 <Setter Property="CornerRadius" Value="0" />
                                 <Setter Property="Background" Value="Transparent" />
                                 <Setter Property="BorderThickness" Value="0 1 0 0" />
                             </DataTrigger>
 
-                            <DataTrigger Binding="{Binding (local:CardGroup.Position), RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Last">
+                            <DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Last">
                                 <Setter Property="Margin" Value="0" />
                                 <Setter Property="CornerRadius" Value="0" />
                                 <Setter Property="Background" Value="Transparent" />
diff --git a/Flow.Launcher/Resources/Controls/Card.xaml.cs b/Flow.Launcher/Resources/Controls/Card.xaml.cs
index c8f788aca..6a70dded2 100644
--- a/Flow.Launcher/Resources/Controls/Card.xaml.cs
+++ b/Flow.Launcher/Resources/Controls/Card.xaml.cs
@@ -9,7 +9,10 @@ namespace Flow.Launcher.Resources.Controls
         {
             Default,
             Inside,
-            InsideFit
+            InsideFit,
+            First,
+            Middle,
+            Last
         }
 
         public Card()
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index 7f8555d65..d114736d5 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -91,7 +91,10 @@
             </cc:Card>
 
             <cc:CardGroup Margin="0 4 0 0">
-                <cc:Card Title="{DynamicResource SearchWindowPosition}" Icon="&#xe7f4;">
+                <cc:Card
+                    Title="{DynamicResource SearchWindowPosition}"
+                    Icon="&#xe7f4;"
+                    Type="First">
                     <StackPanel Orientation="Horizontal">
                         <ComboBox
                             MinWidth="220"
@@ -116,6 +119,7 @@
                 <cc:Card
                     Title="{DynamicResource SearchWindowAlign}"
                     Icon="&#xe7f4;"
+                    Type="Last"
                     Visibility="{ext:CollapsedWhen {Binding Settings.SearchWindowScreen},
                                                    IsEqualTo={x:Static userSettings:SearchWindowScreens.RememberLastLaunchLocation}}">
                     <StackPanel Orientation="Horizontal">
@@ -196,7 +200,10 @@
             </cc:Card>
 
             <cc:CardGroup Margin="0 14 0 0">
-                <cc:Card Title="{DynamicResource querySearchPrecision}" Sub="{DynamicResource querySearchPrecisionToolTip}">
+                <cc:Card
+                    Title="{DynamicResource querySearchPrecision}"
+                    Sub="{DynamicResource querySearchPrecisionToolTip}"
+                    Type="First">
                     <ComboBox
                         MaxWidth="200"
                         DisplayMemberPath="Display"
@@ -205,7 +212,10 @@
                         SelectedValuePath="Value" />
                 </cc:Card>
 
-                <cc:Card Title="{DynamicResource lastQueryMode}" Sub="{DynamicResource lastQueryModeToolTip}">
+                <cc:Card
+                    Title="{DynamicResource lastQueryMode}"
+                    Sub="{DynamicResource lastQueryModeToolTip}"
+                    Type="Last">
                     <ComboBox
                         MinWidth="210"
                         DisplayMemberPath="Display"
@@ -375,7 +385,8 @@
                 <cc:Card
                     Title="{DynamicResource KoreanImeRegistry}"
                     Icon="&#xe88b;"
-                    Sub="{DynamicResource KoreanImeRegistryTooltip}">
+                    Sub="{DynamicResource KoreanImeRegistryTooltip}"
+                    Type="First">
                     <ui:ToggleSwitch
                         IsOn="{Binding LegacyKoreanIMEEnabled}"
                         OffContent="{DynamicResource disable}"
@@ -384,7 +395,8 @@
                 <cc:Card
                     Title="{DynamicResource KoreanImeOpenLink}"
                     Icon="&#xF210;"
-                    Sub="{DynamicResource KoreanImeOpenLinkToolTip}">
+                    Sub="{DynamicResource KoreanImeOpenLinkToolTip}"
+                    Type="Last">
                     <Button Command="{Binding OpenImeSettingsCommand}" Content="{DynamicResource KoreanImeOpenLinkButton}" />
                 </cc:Card>
             </cc:CardGroup>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
index 89eb2dccd..0bf4ed8ce 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
@@ -51,7 +51,10 @@
             </cc:Card>
 
             <cc:CardGroup Margin="0 12 0 0">
-                <cc:Card Title="{DynamicResource openResultModifiers}" Sub="{DynamicResource openResultModifiersToolTip}">
+                <cc:Card
+                    Title="{DynamicResource openResultModifiers}"
+                    Sub="{DynamicResource openResultModifiersToolTip}"
+                    Type="First">
                     <ComboBox
                         Width="120"
                         FontSize="14"
@@ -59,7 +62,10 @@
                         SelectedValue="{Binding Settings.OpenResultModifiers}" />
                 </cc:Card>
 
-                <cc:Card Title="{DynamicResource showOpenResultHotkey}" Sub="{DynamicResource showOpenResultHotkeyToolTip}">
+                <cc:Card
+                    Title="{DynamicResource showOpenResultHotkey}"
+                    Sub="{DynamicResource showOpenResultHotkeyToolTip}"
+                    Type="Last">
                     <ui:ToggleSwitch
                         IsOn="{Binding Settings.ShowOpenResultHotkey}"
                         OffContent="{DynamicResource disable}"
@@ -204,6 +210,15 @@
                             <cc:HotkeyDisplay Margin="4 0 0 0" Keys="Ctrl+Minus" />
                         </StackPanel>
                     </cc:Card>
+                    <cc:Card
+                        Title="{DynamicResource RenameFileHotkey}"
+                        Icon="&#xe70f;"
+                        Type="Inside">
+                        <flowlauncher:HotkeyControl
+                            DefaultHotkey="F2"
+                            Type="RenameFileHotkey"
+                            ValidateKeyGesture="True" />
+                    </cc:Card>
                 </StackPanel>
             </cc:ExCard>
 
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml
index f429a6e29..7d894e1b3 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml
@@ -32,35 +32,35 @@
                 TextAlignment="left" />
 
             <cc:CardGroup>
-                <cc:Card Title="{DynamicResource enableProxy}">
+                <cc:Card Title="{DynamicResource enableProxy}" Type="First">
                     <ui:ToggleSwitch
                         IsOn="{Binding Settings.Proxy.Enabled}"
                         OffContent="{DynamicResource disable}"
                         OnContent="{DynamicResource enable}" />
                 </cc:Card>
 
-                <cc:Card Title="{DynamicResource server}">
+                <cc:Card Title="{DynamicResource server}" Type="Middle">
                     <TextBox
                         Width="300"
                         IsEnabled="{Binding Settings.Proxy.Enabled}"
                         Text="{Binding Settings.Proxy.Server}" />
                 </cc:Card>
 
-                <cc:Card Title="{DynamicResource port}">
+                <cc:Card Title="{DynamicResource port}" Type="Middle">
                     <TextBox
                         Width="100"
                         IsEnabled="{Binding Settings.Proxy.Enabled}"
                         Text="{Binding Settings.Proxy.Port, TargetNullValue={x:Static sys:String.Empty}}" />
                 </cc:Card>
 
-                <cc:Card Title="{DynamicResource userName}">
+                <cc:Card Title="{DynamicResource userName}" Type="Middle">
                     <TextBox
                         Width="200"
                         IsEnabled="{Binding Settings.Proxy.Enabled}"
                         Text="{Binding Settings.Proxy.UserName}" />
                 </cc:Card>
 
-                <cc:Card Title="{DynamicResource password}">
+                <cc:Card Title="{DynamicResource password}" Type="Last">
                     <TextBox
                         Width="200"
                         IsEnabled="{Binding Settings.Proxy.Enabled}"
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index 6e16012ac..05aa43d4c 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -489,7 +489,8 @@
                     Title="{DynamicResource BackdropType}"
                     Margin="0 0 0 0"
                     Icon="&#xeb42;"
-                    Sub="{Binding BackdropSubText}">
+                    Sub="{Binding BackdropSubText}"
+                    Type="First">
                     <ComboBox
                         MinWidth="160"
                         VerticalAlignment="Center"
@@ -505,7 +506,8 @@
                 <cc:Card
                     Title="{DynamicResource queryWindowShadowEffect}"
                     Margin="0 0 0 0"
-                    Icon="&#xeb91;">
+                    Icon="&#xeb91;"
+                    Type="Last">
                     <ui:ToggleSwitch
                         IsEnabled="{Binding IsDropShadowEnabled}"
                         IsOn="{Binding DropShadowEffect}"
@@ -546,7 +548,10 @@
 
             <!--  Time and date  -->
             <cc:CardGroup Margin="0 14 0 0">
-                <cc:Card Title="{DynamicResource Clock}" Icon="&#xec92;">
+                <cc:Card
+                    Title="{DynamicResource Clock}"
+                    Icon="&#xec92;"
+                    Type="First">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             VerticalAlignment="Center"
@@ -567,7 +572,10 @@
                     </StackPanel>
                 </cc:Card>
 
-                <cc:Card Title="{DynamicResource Date}" Icon="&#xe787;">
+                <cc:Card
+                    Title="{DynamicResource Date}"
+                    Icon="&#xe787;"
+                    Type="Last">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             VerticalAlignment="Center"