diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# git-brunch [![Travis](https://travis-ci.org/andys8/git-brunch.svg?branch=master)](https://travis-ci.org/andys8/git-brunch) ![Actions](https://github.com/andys8/git-brunch/workflows/CI/badge.svg)
+# git-brunch ![Actions](https://github.com/andys8/git-brunch/workflows/CI/badge.svg)
 
 A git command-line tool to work with branches
 
@@ -65,7 +65,7 @@
 `git-brunch` can installed with the Haskell build tool stack
 
 ```sh
-stack install git-brunch # --resolver=lts-17.11
+stack install git-brunch # --resolver=lts-lts-20.4
 ```
 
 ### Install from source
diff --git a/app/GitBrunch.hs b/app/GitBrunch.hs
--- a/app/GitBrunch.hs
+++ b/app/GitBrunch.hs
@@ -34,6 +34,8 @@
   = Local
   | Remote
   | Filter
+  | DialogConfirm
+  | DialogCancel
   deriving (Ord, Eq, Show)
 
 data RemoteName
@@ -58,7 +60,7 @@
   , _branches :: [Branch]
   , _localBranches :: L.List Name Branch
   , _remoteBranches :: L.List Name Branch
-  , _dialog :: Maybe (D.Dialog DialogOption)
+  , _dialog :: Maybe (D.Dialog DialogOption Name)
   , _filter :: E.Editor Text Name
   , _isEditingFilter :: Bool
   }
@@ -75,8 +77,8 @@
   state <- M.defaultMain app $ syncBranchLists emptyState{_branches = branches}
   let execGit = gitFunction (_gitCommand state)
   exitCode <- maybe noBranchErr execGit (selectedBranch state)
-  when (exitCode /= ExitSuccess) $
-    die ("Failed to " ++ show (_gitCommand state) ++ ".")
+  when (exitCode /= ExitSuccess)
+    $ die ("Failed to " ++ show (_gitCommand state) ++ ".")
  where
   gitFailed :: SomeException -> IO a
   gitFailed _ = exitFailure
@@ -133,8 +135,8 @@
       , C.hCenter $ toBranchList RRemote remoteBranchesL
       ]
   instructions =
-    maxWidth 100 $
-      hBox
+    maxWidth 100
+      $ hBox
         [ drawInstruction "Enter" "checkout"
         , drawInstruction "/" "filter"
         , drawInstruction "F" "fetch"
@@ -150,7 +152,7 @@
   editor = E.renderEditor (txt . T.unlines) True (state ^. filterL)
   label = str " Filter: "
 
-drawDialog :: State -> Widget n
+drawDialog :: State -> Widget Name
 drawDialog state = case _dialog state of
   Nothing -> emptyWidget
   Just dialog -> D.renderDialog dialog $ C.hCenter $ padAll 1 content
@@ -166,9 +168,9 @@
 
 drawBranchList :: Bool -> L.List Name Branch -> Widget Name
 drawBranchList hasFocus list =
-  withBorderStyle BS.unicodeBold $
-    B.borderWithLabel (drawTitle list) $
-      L.renderList drawListElement hasFocus list
+  withBorderStyle BS.unicodeBold
+    $ B.borderWithLabel (drawTitle list)
+    $ L.renderList drawListElement hasFocus list
  where
   attr = withAttr $ if hasFocus then attrTitleFocus else attrTitle
   drawTitle = attr . str . map toUpper . show . L.listName
@@ -277,9 +279,9 @@
       EvKey KEnter [] -> do
         dialog <- gets _dialog
         case D.dialogSelection =<< dialog of
-          Just (Confirm cmd) -> confirmDialog cmd
-          Just Cancel -> cancelDialog
-          Nothing -> pure ()
+          Just (DialogConfirm, Confirm cmd) -> confirmDialog cmd
+          Just (DialogCancel, Cancel) -> cancelDialog
+          _ -> pure ()
       EvKey KEsc [] -> cancelDialog
       EvKey (KChar 'q') [] -> cancelDialog
       ev -> zoom (dialogL . _Just) $ D.handleDialogEvent ev
@@ -305,8 +307,8 @@
 listOffsetDiff target = do
   offLocal <- getOffset Local
   offRemote <- getOffset Remote
-  pure $
-    if target == RLocal
+  pure
+    $ if target == RLocal
       then offRemote - offLocal
       else offLocal - offRemote
  where
@@ -328,9 +330,12 @@
 syncBranchLists :: State -> State
 syncBranchLists state =
   state
-    & localBranchesL .~ mkList Local local
-    & remoteBranchesL .~ mkList Remote remote
-    & focusL %~ toggleFocus (local, remote)
+    & localBranchesL
+    .~ mkList Local local
+    & remoteBranchesL
+    .~ mkList Remote remote
+    & focusL
+    %~ toggleFocus (local, remote)
  where
   mkList name xs = L.list name (Vec.fromList xs) rowHeight
   filterText = T.toLower $ T.unwords $ E.getEditContents $ _filter state
@@ -347,13 +352,16 @@
 selectedBranch state =
   snd <$> L.listSelectedElement (state ^. focussedBranchesL)
 
-createDialog :: GitCommand -> D.Dialog DialogOption
-createDialog cmd = D.dialog (Just title) (Just (0, choices)) 80
+createDialog :: GitCommand -> D.Dialog DialogOption Name
+createDialog cmd = D.dialog (Just $ str title) (Just (DialogConfirm, choices)) 80
  where
-  choices = [(btnText $ show cmd, Confirm cmd), ("Cancel", Cancel)]
   title = map toUpper $ show cmd
   btnText (x : xs) = toUpper x : xs
   btnText x = x
+  choices =
+    [ (btnText $ show cmd, DialogConfirm, Confirm cmd)
+    , ("Cancel", DialogCancel, Cancel)
+    ]
 
 mapKey :: (Char -> Key) -> Event -> Event
 mapKey f (EvKey (KChar k) []) = EvKey (f k) []
@@ -402,7 +410,7 @@
 isEditingFilterL :: Lens' State Bool
 isEditingFilterL = lens _isEditingFilter (\s f -> s{_isEditingFilter = f})
 
-dialogL :: Lens' State (Maybe (D.Dialog DialogOption))
+dialogL :: Lens' State (Maybe (D.Dialog DialogOption Name))
 dialogL = lens _dialog (\s v -> s{_dialog = v})
 
 gitCommandL :: Lens' State GitCommand
diff --git a/git-brunch.cabal b/git-brunch.cabal
--- a/git-brunch.cabal
+++ b/git-brunch.cabal
@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.35.1.
 --
 -- see: https://github.com/sol/hpack
 
 name:           git-brunch
-version:        1.6.0.0
+version:        1.7.2.0
 synopsis:       git checkout command-line tool
 description:    Please see the README on GitHub at <https://github.com/andys8/git-brunch>
 category:       Git