module.exports = {
  deactivate: function () {
    if (this.pkg) this.pkg.removeItems()
  },

  consumeToolBar: function (toolBar) {
    this.pkg = toolBar('tool-bar-custom')
    const pkg = this.pkg

    pkg.addButton({
      icon: 'document-text',
      iconset: 'ion',
      tooltip: 'Open File',
      callback: 'application:open-file'
    })
    pkg.addButton({
      icon: 'close-round',
      iconset: 'ion',
      tooltip: 'Close All Tabs',
      callback: 'tabs:close-all-tabs'
    })

    pkg.addSpacer()

    pkg.addButton({
      icon: 'columns',
      iconset: 'fa',
      tooltip: 'Split Right',
      callback: 'pane:split-right'
    })
    const paneDown = pkg.addButton({
      icon: 'columns',
      iconset: 'fa',
      tooltip: 'Split Down',
      callback: 'pane:split-down'
    })
    paneDown.element.classList.add('fa-rotate-270')

    if (atom.packages.isPackageLoaded('outline-ui')) {
      pkg.addSpacer()
      pkg.addButton({
        icon: 'sitemap',
        iconset: 'fa',
        tooltip: 'Toggle Outline',
        callback: 'outline-ui:toggle'
      })
    }

    pkg.addSpacer()

    pkg.addButton({
      icon: 'refresh',
      iconset: 'ion',
      tooltip: 'Reload Window',
      callback: 'window:reload'
    })
    pkg.addButton({
      icon: 'bug',
      tooltip: 'Developer Tools',
      callback: 'window:toggle-dev-tools'
    })

    pkg.addSpacer()

    if (atom.packages.isPackageLoaded('git-plus')) {
      pkg.addButton({
        icon: 'git-plain',
        iconset: 'devicon',
        tooltip: 'Git Plus (Run)',
        callback: 'git-plus:run'
      })
    }
    pkg.addButton({
      icon: 'github-plain',
      iconset: 'devicon',
      tooltip: 'Fetch',
      callback: 'github:fetch'
    })
    pkg.addButton({
      icon: 'arrow-down',
      tooltip: 'Pull',
      callback: 'github:pull'
    })
    pkg.addButton({
      icon: 'arrow-up',
      tooltip: 'Push',
      callback: 'github:push'
    })

    pkg.addSpacer()

    pkg.addButton({
      icon: 'markdown',
      tooltip: 'Markdown Preview',
      callback: 'markdown-preview:toggle'
    })

    pkg.addSpacer()

    pkg.addButton({
      icon: 'cloud-upload',
      iconset: 'icomoon',
      tooltip: 'Backup',
      callback: 'sync-settings:backup'
    })
    pkg.addButton({
      icon: 'new-tab',
      iconset: 'icomoon',
      tooltip: 'View Backup',
      callback: 'sync-settings:view-backup'
    })

    pkg.addSpacer()

    pkg.addButton({
      icon: 'navicon-round',
      iconset: 'ion',
      tooltip: 'Command Palette',
      callback: 'command-palette:toggle'
    })
    pkg.addButton({
      icon: 'gear',
      tooltip: 'Preferences',
      callback: 'settings-view:open'
    })

    pkg.addSpacer()

    pkg.addButton({
      icon: 'atom-original',
      iconset: 'devicon',
      tooltip: 'About Atom',
      callback: 'application:about'
    })
  }
}

@@ -1772,18 +1772,23 @@
 n: '
-arrow-down
+repo-force-push
 ',%0A 
@@ -1806,12 +1806,18 @@
 p: '
-Pull
+Force Push
 ',%0A 
@@ -1843,12 +1843,18 @@
 hub:
-pull
+force-push
 '%0A  
@@ -1895,16 +1895,17 @@
 n: '
-arrow-up
+repo-push
 ',%0A 
@@ -1954,32 +1954,137 @@
 hub:push'%0A    %7D)
+%0A    pkg.addButton(%7B%0A      icon: 'repo-pull',%0A      tooltip: 'Pull',%0A      callback: 'github:pull'%0A    %7D)
 %0A%0A    pkg.addSpa

Update git operations' icons