diff --git a/.travis.yml b/.travis.yml
index d9267f77..90548ee9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,10 @@
 language: node_js
 node_js:
-  - 7
+  - 8
 script:
   - npm run lint && npm run test
   - yarn jest
-  - 'if [[ ${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} = "master" ]]; then npm install -g grunt npm@5.2 && grunt pre-build; fi'
+  - 'if [[ ${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} = "master" ]]; then npm install -g grunt npm@6.4 && grunt pre-build; fi'
 after_success:
   - openssl aes-256-cbc -K $encrypted_440d7f9a3c38_key -iv $encrypted_440d7f9a3c38_iv
     -in .snapcraft/travis_snapcraft.cfg -out .snapcraft/snapcraft.cfg -d
diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 54354efa..2f2b1551 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -14,18 +14,17 @@ import {
 import TextEditorInterface from 'browser/lib/TextEditorInterface'
 import eventEmitter from 'browser/main/lib/eventEmitter'
 import iconv from 'iconv-lite'
-import crypto from 'crypto'
-import consts from 'browser/lib/consts'
+
+import { isMarkdownTitleURL } from 'browser/lib/utils'
 import styles from '../components/CodeEditor.styl'
-import fs from 'fs'
 const { ipcRenderer, remote, clipboard } = require('electron')
 import normalizeEditorFontFamily from 'browser/lib/normalizeEditorFontFamily'
 const spellcheck = require('browser/lib/spellcheck')
 const buildEditorContextMenu = require('browser/lib/contextMenuBuilder')
 import TurndownService from 'turndown'
-import {
-  gfm
-} from 'turndown-plugin-gfm'
+import {languageMaps} from '../lib/CMLanguageList'
+import snippetManager from '../lib/SnippetManager'
+import {generateInEditor, tocExistsInEditor} from 'browser/lib/markdown-toc-generator'
 import markdownlint from 'markdownlint'
 
 CodeMirror.modeURL = '../node_modules/codemirror/mode/%N/%N.js'
@@ -39,85 +38,6 @@ function translateHotkey (hotkey) {
   return hotkey.replace(/\s*\+\s*/g, '-').replace(/Command/g, 'Cmd').replace(/Control/g, 'Ctrl')
 }
 
-const languageMaps = {
-  brainfuck: 'Brainfuck',
-  cpp: 'C++',
-  cs: 'C#',
-  clojure: 'Clojure',
-  'clojure-repl': 'ClojureScript',
-  cmake: 'CMake',
-  coffeescript: 'CoffeeScript',
-  crystal: 'Crystal',
-  css: 'CSS',
-  d: 'D',
-  dart: 'Dart',
-  delphi: 'Pascal',
-  diff: 'Diff',
-  django: 'Django',
-  dockerfile: 'Dockerfile',
-  ebnf: 'EBNF',
-  elm: 'Elm',
-  erlang: 'Erlang',
-  'erlang-repl': 'Erlang',
-  fortran: 'Fortran',
-  fsharp: 'F#',
-  gherkin: 'Gherkin',
-  go: 'Go',
-  groovy: 'Groovy',
-  haml: 'HAML',
-  haskell: 'Haskell',
-  haxe: 'Haxe',
-  http: 'HTTP',
-  ini: 'toml',
-  java: 'Java',
-  javascript: 'JavaScript',
-  json: 'JSON',
-  julia: 'Julia',
-  kotlin: 'Kotlin',
-  less: 'LESS',
-  livescript: 'LiveScript',
-  lua: 'Lua',
-  markdown: 'Markdown',
-  mathematica: 'Mathematica',
-  nginx: 'Nginx',
-  nsis: 'NSIS',
-  objectivec: 'Objective-C',
-  ocaml: 'Ocaml',
-  perl: 'Perl',
-  php: 'PHP',
-  powershell: 'PowerShell',
-  properties: 'Properties files',
-  protobuf: 'ProtoBuf',
-  python: 'Python',
-  puppet: 'Puppet',
-  q: 'Q',
-  r: 'R',
-  ruby: 'Ruby',
-  rust: 'Rust',
-  sas: 'SAS',
-  scala: 'Scala',
-  scheme: 'Scheme',
-  scss: 'SCSS',
-  shell: 'Shell',
-  smalltalk: 'Smalltalk',
-  sml: 'SML',
-  sql: 'SQL',
-  stylus: 'Stylus',
-  swift: 'Swift',
-  tcl: 'Tcl',
-  tex: 'LaTex',
-  typescript: 'TypeScript',
-  twig: 'Twig',
-  vbnet: 'VB.NET',
-  vbscript: 'VBScript',
-  verilog: 'Verilog',
-  vhdl: 'VHDL',
-  xml: 'HTML',
-  xquery: 'XQuery',
-  yaml: 'YAML',
-  elixir: 'Elixir'
-}
-
 const validatorOfMarkdown = (text, updateLinting) => {
   const lintOptions = {
     'strings': {
@@ -261,7 +181,8 @@ export default class CodeEditor extends React.Component {
 
   updateDefaultKeyMap () {
     const { hotkey } = this.props
-    const expandSnippet = this.expandSnippet.bind(this)
+    const self = this
+    const expandSnippet = snippetManager.expandSnippet
 
     this.defaultKeyMap = CodeMirror.normalizeKeyMap({
       Tab: function (cm) {
@@ -285,10 +206,12 @@ export default class CodeEditor extends React.Component {
             cursor.ch > 1
           ) {
             // text expansion on tab key if the char before is alphabet
-            const snippets = JSON.parse(
-              fs.readFileSync(consts.SNIPPET_FILE, 'utf8')
+            const wordBeforeCursor = self.getWordBeforeCursor(
+              line,
+              cursor.line,
+              cursor.ch
             )
-            if (expandSnippet(line, cursor, cm, snippets) === false) {
+            if (expandSnippet(wordBeforeCursor, cursor, cm) === false) {
               if (tabs) {
                 cm.execCommand('insertTab')
               } else {
@@ -310,6 +233,26 @@ export default class CodeEditor extends React.Component {
       'Cmd-T': function (cm) {
         // Do nothing
       },
+      'Ctrl-/': function (cm) {
+        if (global.process.platform === 'darwin') { return }
+        const dateNow = new Date()
+        cm.replaceSelection(dateNow.toLocaleDateString())
+      },
+      'Cmd-/': function (cm) {
+        if (global.process.platform !== 'darwin') { return }
+        const dateNow = new Date()
+        cm.replaceSelection(dateNow.toLocaleDateString())
+      },
+      'Shift-Ctrl-/': function (cm) {
+        if (global.process.platform === 'darwin') { return }
+        const dateNow = new Date()
+        cm.replaceSelection(dateNow.toLocaleString())
+      },
+      'Shift-Cmd-/': function (cm) {
+        if (global.process.platform !== 'darwin') { return }
+        const dateNow = new Date()
+        cm.replaceSelection(dateNow.toLocaleString())
+      },
       Enter: 'boostNewLineAndIndentContinueMarkdownList',
       'Ctrl-C': cm => {
         if (cm.getOption('keyMap').substr(0, 3) === 'vim') {
@@ -343,22 +286,7 @@ export default class CodeEditor extends React.Component {
     const { rulers, enableRulers } = this.props
     eventEmitter.on('line:jump', this.scrollToLineHandeler)
 
-    const defaultSnippet = [
-      {
-        id: crypto.randomBytes(16).toString('hex'),
-        name: 'Dummy text',
-        prefix: ['lorem', 'ipsum'],
-        content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
-      }
-    ]
-    if (!fs.existsSync(consts.SNIPPET_FILE)) {
-      fs.writeFileSync(
-        consts.SNIPPET_FILE,
-        JSON.stringify(defaultSnippet, null, 4),
-        'utf8'
-      )
-    }
-
+    snippetManager.init()
     this.updateDefaultKeyMap()
 
     const checkMarkdownNoteIsOpening = this.props.mode === 'Boost Flavored Markdown'
@@ -558,61 +486,12 @@ export default class CodeEditor extends React.Component {
     this.initialHighlighting()
   }
 
-  expandSnippet (line, cursor, cm, snippets) {
-    const wordBeforeCursor = this.getWordBeforeCursor(
-      line,
-      cursor.line,
-      cursor.ch
-    )
-    const templateCursorString = ':{}'
-    for (let i = 0; i < snippets.length; i++) {
-      if (snippets[i].prefix.indexOf(wordBeforeCursor.text) !== -1) {
-        if (snippets[i].content.indexOf(templateCursorString) !== -1) {
-          const snippetLines = snippets[i].content.split('\n')
-          let cursorLineNumber = 0
-          let cursorLinePosition = 0
-
-          let cursorIndex
-          for (let j = 0; j < snippetLines.length; j++) {
-            cursorIndex = snippetLines[j].indexOf(templateCursorString)
-
-            if (cursorIndex !== -1) {
-              cursorLineNumber = j
-              cursorLinePosition = cursorIndex
-
-              break
-            }
-          }
-
-          cm.replaceRange(
-            snippets[i].content.replace(templateCursorString, ''),
-            wordBeforeCursor.range.from,
-            wordBeforeCursor.range.to
-          )
-          cm.setCursor({
-            line: cursor.line + cursorLineNumber,
-            ch: cursorLinePosition + cursor.ch - wordBeforeCursor.text.length
-          })
-        } else {
-          cm.replaceRange(
-            snippets[i].content,
-            wordBeforeCursor.range.from,
-            wordBeforeCursor.range.to
-          )
-        }
-        return true
-      }
-    }
-
-    return false
-  }
-
   getWordBeforeCursor (line, lineNumber, cursorPosition) {
     let wordBeforeCursor = ''
     const originCursorPosition = cursorPosition
     const emptyChars = /\t|\s|\r|\n/
 
-    // to prevent the word to expand is long that will crash the whole app
+    // to prevent the word is long that will crash the whole app
     // the safeStop is there to stop user to expand words that longer than 20 chars
     const safeStop = 20
 
@@ -622,7 +501,7 @@ export default class CodeEditor extends React.Component {
       if (!emptyChars.test(currentChar)) {
         wordBeforeCursor = currentChar + wordBeforeCursor
       } else if (wordBeforeCursor.length >= safeStop) {
-        throw new Error('Your snippet trigger is too long !')
+        throw new Error('Stopped after 20 loops for safety reason !')
       } else {
         break
       }
@@ -776,6 +655,34 @@ export default class CodeEditor extends React.Component {
   handleChange (editor, changeObject) {
     spellcheck.handleChange(editor, changeObject)
 
+    // The current note contains an toc. We'll check for changes on headlines.
+    // origin is undefined when markdownTocGenerator replace the old tod
+    if (tocExistsInEditor(editor) && changeObject.origin !== undefined) {
+      let requireTocUpdate
+
+      // Check if one of the changed lines contains a headline
+      for (let line = 0; line < changeObject.text.length; line++) {
+        if (this.linePossibleContainsHeadline(editor.getLine(changeObject.from.line + line))) {
+          requireTocUpdate = true
+          break
+        }
+      }
+
+      if (!requireTocUpdate) {
+        // Check if one of the removed lines contains a headline
+        for (let line = 0; line < changeObject.removed.length; line++) {
+          if (this.linePossibleContainsHeadline(changeObject.removed[line])) {
+            requireTocUpdate = true
+            break
+          }
+        }
+      }
+
+      if (requireTocUpdate) {
+        generateInEditor(editor)
+      }
+    }
+
     this.updateHighlight(editor, changeObject)
 
     this.value = editor.getValue()
@@ -784,15 +691,21 @@ export default class CodeEditor extends React.Component {
     }
   }
 
+  linePossibleContainsHeadline (currentLine) {
+    // We can't check if the line start with # because when some write text before
+    // the # we also need to update the toc
+    return currentLine.includes('# ')
+  }
+
   incrementLines (start, linesAdded, linesRemoved, editor) {
-    let highlightedLines = editor.options.linesHighlighted
+    const highlightedLines = editor.options.linesHighlighted
 
     const totalHighlightedLines = highlightedLines.length
 
-    let offset = linesAdded - linesRemoved
+    const offset = linesAdded - linesRemoved
 
     // Store new items to be added as we're changing the lines
-    let newLines = []
+    const newLines = []
 
     let i = totalHighlightedLines
 
@@ -873,6 +786,9 @@ export default class CodeEditor extends React.Component {
       ch: 1
     }
     this.editor.setCursor(cursor)
+    const top = this.editor.charCoords({line: num, ch: 0}, 'local').top
+    const middleHeight = this.editor.getScrollerElement().offsetHeight / 2
+    this.editor.scrollTo(null, top - middleHeight - 5)
   }
 
   focus () {
@@ -988,6 +904,8 @@ export default class CodeEditor extends React.Component {
 
     if (isInFencedCodeBlock(editor)) {
       this.handlePasteText(editor, pastedTxt)
+    } else if (fetchUrlTitle && isMarkdownTitleURL(pastedTxt) && !isInLinkTag(editor)) {
+      this.handlePasteUrl(editor, pastedTxt)
     } else if (fetchUrlTitle && isURL(pastedTxt) && !isInLinkTag(editor)) {
       this.handlePasteUrl(editor, pastedTxt)
     } else if (attachmentManagement.isAttachmentLink(pastedTxt)) {
@@ -1029,7 +947,17 @@ export default class CodeEditor extends React.Component {
   }
 
   handlePasteUrl (editor, pastedTxt) {
-    const taggedUrl = `<${pastedTxt}>`
+    let taggedUrl = `<${pastedTxt}>`
+    let urlToFetch = pastedTxt
+    let titleMark = ''
+
+    if (isMarkdownTitleURL(pastedTxt)) {
+      const pastedTxtSplitted = pastedTxt.split(' ')
+      titleMark = `${pastedTxtSplitted[0]} `
+      urlToFetch = pastedTxtSplitted[1]
+      taggedUrl = `<${urlToFetch}>`
+    }
+
     editor.replaceSelection(taggedUrl)
 
     const isImageReponse = response => {
@@ -1041,22 +969,23 @@ export default class CodeEditor extends React.Component {
     const replaceTaggedUrl = replacement => {
       const value = editor.getValue()
       const cursor = editor.getCursor()
-      const newValue = value.replace(taggedUrl, replacement)
+      const newValue = value.replace(taggedUrl, titleMark + replacement)
       const newCursor = Object.assign({}, cursor, {
-        ch: cursor.ch + newValue.length - value.length
+        ch: cursor.ch + newValue.length - (value.length - titleMark.length)
       })
+
       editor.setValue(newValue)
       editor.setCursor(newCursor)
     }
 
-    fetch(pastedTxt, {
+    fetch(urlToFetch, {
       method: 'get'
     })
       .then(response => {
         if (isImageReponse(response)) {
-          return this.mapImageResponse(response, pastedTxt)
+          return this.mapImageResponse(response, urlToFetch)
         } else {
-          return this.mapNormalResponse(response, pastedTxt)
+          return this.mapNormalResponse(response, urlToFetch)
         }
       })
       .then(replacement => {
diff --git a/browser/components/CodeEditor.styl b/browser/components/CodeEditor.styl
index 7a254935..1aa0e466 100644
--- a/browser/components/CodeEditor.styl
+++ b/browser/components/CodeEditor.styl
@@ -3,4 +3,3 @@
 
 .spellcheck-select
   border: none
-  text-decoration underline wavy red
diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index 466be3fa..593f7d99 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -32,6 +32,7 @@ class MarkdownEditor extends React.Component {
   componentDidMount () {
     this.value = this.refs.code.value
     eventEmitter.on('editor:lock', this.lockEditorCode)
+    eventEmitter.on('editor:focus', this.focusEditor.bind(this))
   }
 
   componentDidUpdate () {
@@ -47,6 +48,15 @@ class MarkdownEditor extends React.Component {
   componentWillUnmount () {
     this.cancelQueue()
     eventEmitter.off('editor:lock', this.lockEditorCode)
+    eventEmitter.off('editor:focus', this.focusEditor.bind(this))
+  }
+
+  focusEditor () {
+    this.setState({
+      status: 'CODE'
+    }, () => {
+      this.refs.code.focus()
+    })
   }
 
   queueRendering (value) {
diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index a6819ce9..ff5e85e1 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -8,7 +8,7 @@ import consts from 'browser/lib/consts'
 import Raphael from 'raphael'
 import flowchart from 'flowchart'
 import mermaidRender from './render/MermaidRender'
-import SequenceDiagram from 'js-sequence-diagrams'
+import SequenceDiagram from '@rokt33r/js-sequence-diagrams'
 import Chart from 'chart.js'
 import eventEmitter from 'browser/main/lib/eventEmitter'
 import htmlTextHelper from 'browser/lib/htmlTextHelper'
@@ -192,6 +192,19 @@ const defaultCodeBlockFontFamily = [
   'source-code-pro',
   'monospace'
 ]
+
+// return the line number of the line that used to generate the specified element
+// return -1 if the line is not found
+function getSourceLineNumberByElement (element) {
+  let isHasLineNumber = element.dataset.line !== undefined
+  let parent = element
+  while (!isHasLineNumber && parent.parentElement !== null) {
+    parent = parent.parentElement
+    isHasLineNumber = parent.dataset.line !== undefined
+  }
+  return parent.dataset.line !== undefined ? parseInt(parent.dataset.line) : -1
+}
+
 export default class MarkdownPreview extends React.Component {
   constructor (props) {
     super(props)
@@ -208,6 +221,7 @@ export default class MarkdownPreview extends React.Component {
     this.saveAsTextHandler = () => this.handleSaveAsText()
     this.saveAsMdHandler = () => this.handleSaveAsMd()
     this.saveAsHtmlHandler = () => this.handleSaveAsHtml()
+    this.saveAsPdfHandler = () => this.handleSaveAsPdf()
     this.printHandler = () => this.handlePrint()
 
     this.linkClickHandler = this.handleLinkClick.bind(this)
@@ -268,17 +282,27 @@ export default class MarkdownPreview extends React.Component {
 
   handleMouseDown (e) {
     const config = ConfigManager.get()
+    const clickElement = e.target
+    const targetTag = clickElement.tagName // The direct parent HTML of where was clicked ie "BODY" or "DIV"
+    const lineNumber = getSourceLineNumberByElement(clickElement) // Line location of element clicked.
+
     if (config.editor.switchPreview === 'RIGHTCLICK' && e.buttons === 2 && config.editor.type === 'SPLIT') {
       eventEmitter.emit('topbar:togglemodebutton', 'CODE')
     }
-    if (e.target != null) {
-      switch (e.target.tagName) {
-        case 'A':
-        case 'INPUT':
-          return null
+    if (e.ctrlKey) {
+      if (config.editor.type === 'SPLIT') {
+        if (lineNumber !== -1) {
+          eventEmitter.emit('line:jump', lineNumber)
+        }
+      } else {
+        if (lineNumber !== -1) {
+          eventEmitter.emit('editor:focus')
+          eventEmitter.emit('line:jump', lineNumber)
+        }
       }
     }
-    if (this.props.onMouseDown != null) this.props.onMouseDown(e)
+
+    if (this.props.onMouseDown != null && targetTag === 'BODY') this.props.onMouseDown(e)
   }
 
   handleMouseUp (e) {
@@ -297,58 +321,77 @@ export default class MarkdownPreview extends React.Component {
     this.exportAsDocument('md')
   }
 
-  handleSaveAsHtml () {
-    this.exportAsDocument('html', (noteContent, exportTasks) => {
-      const {
-        fontFamily,
-        fontSize,
-        codeBlockFontFamily,
-        lineNumber,
-        codeBlockTheme,
-        scrollPastEnd,
-        theme,
-        allowCustomCSS,
-        customCSS
-      } = this.getStyleParams()
+  htmlContentFormatter (noteContent, exportTasks, targetDir) {
+    const {
+      fontFamily,
+      fontSize,
+      codeBlockFontFamily,
+      lineNumber,
+      codeBlockTheme,
+      scrollPastEnd,
+      theme,
+      allowCustomCSS,
+      customCSS
+    } = this.getStyleParams()
 
-      const inlineStyles = buildStyle(
-        fontFamily,
-        fontSize,
-        codeBlockFontFamily,
-        lineNumber,
-        scrollPastEnd,
-        theme,
-        allowCustomCSS,
-        customCSS
-      )
-      let body = this.markdown.render(noteContent)
-      const files = [this.GetCodeThemeLink(codeBlockTheme), ...CSS_FILES]
-      files.forEach(file => {
-        if (global.process.platform === 'win32') {
-          file = file.replace('file:///', '')
-        } else {
-          file = file.replace('file://', '')
-        }
-        exportTasks.push({
-          src: file,
-          dst: 'css'
+    const inlineStyles = buildStyle(
+      fontFamily,
+      fontSize,
+      codeBlockFontFamily,
+      lineNumber,
+      scrollPastEnd,
+      theme,
+      allowCustomCSS,
+      customCSS
+    )
+    let body = this.markdown.render(noteContent)
+    const files = [this.GetCodeThemeLink(codeBlockTheme), ...CSS_FILES]
+    files.forEach(file => {
+      if (global.process.platform === 'win32') {
+        file = file.replace('file:///', '')
+      } else {
+        file = file.replace('file://', '')
+      }
+      exportTasks.push({
+        src: file,
+        dst: 'css'
+      })
+    })
+
+    let styles = ''
+    files.forEach(file => {
+      styles += `<link rel="stylesheet" href="css/${path.basename(file)}">`
+    })
+
+    return `<html>
+               <head>
+                 <base href="file://${targetDir}/">
+                 <meta charset="UTF-8">
+                 <meta name = "viewport" content = "width = device-width, initial-scale = 1, maximum-scale = 1">
+                 <style id="style">${inlineStyles}</style>
+                 ${styles}
+               </head>
+               <body>${body}</body>
+            </html>`
+  }
+
+  handleSaveAsHtml () {
+    this.exportAsDocument('html', (noteContent, exportTasks, targetDir) => Promise.resolve(this.htmlContentFormatter(noteContent, exportTasks, targetDir)))
+  }
+
+  handleSaveAsPdf () {
+    this.exportAsDocument('pdf', (noteContent, exportTasks, targetDir) => {
+      const printout = new remote.BrowserWindow({show: false, webPreferences: {webSecurity: false}})
+      printout.loadURL('data:text/html;charset=UTF-8,' + this.htmlContentFormatter(noteContent, exportTasks, targetDir))
+      return new Promise((resolve, reject) => {
+        printout.webContents.on('did-finish-load', () => {
+          printout.webContents.printToPDF({}, (err, data) => {
+            if (err) reject(err)
+            else resolve(data)
+            printout.destroy()
+          })
         })
       })
-
-      let styles = ''
-      files.forEach(file => {
-        styles += `<link rel="stylesheet" href="css/${path.basename(file)}">`
-      })
-
-      return `<html>
-                 <head>
-                   <meta charset="UTF-8">
-                   <meta name = "viewport" content = "width = device-width, initial-scale = 1, maximum-scale = 1">
-                   <style id="style">${inlineStyles}</style>
-                   ${styles}
-                 </head>
-                 <body>${body}</body>
-              </html>`
     })
   }
 
@@ -490,6 +533,7 @@ export default class MarkdownPreview extends React.Component {
     eventEmitter.on('export:save-text', this.saveAsTextHandler)
     eventEmitter.on('export:save-md', this.saveAsMdHandler)
     eventEmitter.on('export:save-html', this.saveAsHtmlHandler)
+    eventEmitter.on('export:save-pdf', this.saveAsPdfHandler)
     eventEmitter.on('print', this.printHandler)
   }
 
@@ -527,6 +571,7 @@ export default class MarkdownPreview extends React.Component {
     eventEmitter.off('export:save-text', this.saveAsTextHandler)
     eventEmitter.off('export:save-md', this.saveAsMdHandler)
     eventEmitter.off('export:save-html', this.saveAsHtmlHandler)
+    eventEmitter.off('export:save-pdf', this.saveAsPdfHandler)
     eventEmitter.off('print', this.printHandler)
   }
 
@@ -705,6 +750,8 @@ export default class MarkdownPreview extends React.Component {
           copyIcon.innerHTML =
             '<button class="clipboardButton"><svg width="13" height="13" viewBox="0 0 1792 1792" ><path d="M768 1664h896v-640h-416q-40 0-68-28t-28-68v-416h-384v1152zm256-1440v-64q0-13-9.5-22.5t-22.5-9.5h-704q-13 0-22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h704q13 0 22.5-9.5t9.5-22.5zm256 672h299l-299-299v299zm512 128v672q0 40-28 68t-68 28h-960q-40 0-68-28t-28-68v-160h-544q-40 0-68-28t-28-68v-1344q0-40 28-68t68-28h1088q40 0 68 28t28 68v328q21 13 36 28l408 408q28 28 48 76t20 88z"/></svg></button>'
           copyIcon.onclick = e => {
+            e.preventDefault()
+            e.stopPropagation()
             copy(content)
             if (showCopyNotification) {
               this.notify('Saved to Clipboard!', {
@@ -835,78 +882,96 @@ export default class MarkdownPreview extends React.Component {
 
     const markdownPreviewIframe = document.querySelector('.MarkdownPreview')
     const rect = markdownPreviewIframe.getBoundingClientRect()
+    const config = { attributes: true, subtree: true }
+    const imgObserver = new MutationObserver((mutationList) => {
+      for (const mu of mutationList) {
+        if (mu.target.className === 'carouselContent-enter-done') {
+          this.setImgOnClickEventHelper(mu.target, rect)
+          break
+        }
+      }
+    })
+
     const imgList = markdownPreviewIframe.contentWindow.document.body.querySelectorAll('img')
     for (const img of imgList) {
-      img.onclick = () => {
-        const widthMagnification = document.body.clientWidth / img.width
-        const heightMagnification = document.body.clientHeight / img.height
-        const baseOnWidth = widthMagnification < heightMagnification
-        const magnification = baseOnWidth ? widthMagnification : heightMagnification
+      const parentEl = img.parentElement
+      this.setImgOnClickEventHelper(img, rect)
+      imgObserver.observe(parentEl, config)
+    }
+  }
 
-        const zoomImgWidth = img.width * magnification
-        const zoomImgHeight = img.height * magnification
-        const zoomImgTop = (document.body.clientHeight - zoomImgHeight) / 2
-        const zoomImgLeft = (document.body.clientWidth - zoomImgWidth) / 2
-        const originalImgTop = img.y + rect.top
-        const originalImgLeft = img.x + rect.left
-        const originalImgRect = {
-          top: `${originalImgTop}px`,
-          left: `${originalImgLeft}px`,
-          width: `${img.width}px`,
-          height: `${img.height}px`
-        }
-        const zoomInImgRect = {
-          top: `${baseOnWidth ? zoomImgTop : 0}px`,
-          left: `${baseOnWidth ? 0 : zoomImgLeft}px`,
-          width: `${zoomImgWidth}px`,
-          height: `${zoomImgHeight}px`
-        }
-        const animationSpeed = 300
+  setImgOnClickEventHelper (img, rect) {
+    img.onclick = () => {
+      const widthMagnification = document.body.clientWidth / img.width
+      const heightMagnification = document.body.clientHeight / img.height
+      const baseOnWidth = widthMagnification < heightMagnification
+      const magnification = baseOnWidth ? widthMagnification : heightMagnification
 
-        const zoomImg = document.createElement('img')
-        zoomImg.src = img.src
+      const zoomImgWidth = img.width * magnification
+      const zoomImgHeight = img.height * magnification
+      const zoomImgTop = (document.body.clientHeight - zoomImgHeight) / 2
+      const zoomImgLeft = (document.body.clientWidth - zoomImgWidth) / 2
+      const originalImgTop = img.y + rect.top
+      const originalImgLeft = img.x + rect.left
+      const originalImgRect = {
+        top: `${originalImgTop}px`,
+        left: `${originalImgLeft}px`,
+        width: `${img.width}px`,
+        height: `${img.height}px`
+      }
+      const zoomInImgRect = {
+        top: `${baseOnWidth ? zoomImgTop : 0}px`,
+        left: `${baseOnWidth ? 0 : zoomImgLeft}px`,
+        width: `${zoomImgWidth}px`,
+        height: `${zoomImgHeight}px`
+      }
+      const animationSpeed = 300
+
+      const zoomImg = document.createElement('img')
+      zoomImg.src = img.src
+      zoomImg.style = `
+        position: absolute;
+        top: ${baseOnWidth ? zoomImgTop : 0}px;
+        left: ${baseOnWidth ? 0 : zoomImgLeft}px;
+        width: ${zoomImgWidth};
+        height: ${zoomImgHeight}px;
+        `
+      zoomImg.animate([
+        originalImgRect,
+        zoomInImgRect
+      ], animationSpeed)
+
+      const overlay = document.createElement('div')
+      overlay.style = `
+        background-color: rgba(0,0,0,0.5);
+        cursor: zoom-out;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: ${document.body.clientHeight}px;
+        z-index: 100;
+      `
+      overlay.onclick = () => {
         zoomImg.style = `
           position: absolute;
-          top: ${baseOnWidth ? zoomImgTop : 0}px;
-          left: ${baseOnWidth ? 0 : zoomImgLeft}px;
-          width: ${zoomImgWidth};
-          height: ${zoomImgHeight}px;
+          top: ${originalImgTop}px;
+          left: ${originalImgLeft}px;
+          width: ${img.width}px;
+          height: ${img.height}px;
           `
-        zoomImg.animate([
-          originalImgRect,
-          zoomInImgRect
+        const zoomOutImgAnimation = zoomImg.animate([
+          zoomInImgRect,
+          originalImgRect
         ], animationSpeed)
-
-        const overlay = document.createElement('div')
-        overlay.style = `
-          background-color: rgba(0,0,0,0.5);
-          cursor: zoom-out;
-          position: absolute;
-          top: 0;
-          left: 0;
-          width: 100%;
-          height: ${document.body.clientHeight}px;
-          z-index: 100;
-        `
-        overlay.onclick = () => {
-          zoomImg.style = `
-            position: absolute;
-            top: ${originalImgTop}px;
-            left: ${originalImgLeft}px;
-            width: ${img.width}px;
-            height: ${img.height}px;
-            `
-          const zoomOutImgAnimation = zoomImg.animate([
-            zoomInImgRect,
-            originalImgRect
-          ], animationSpeed)
-          zoomOutImgAnimation.onfinish = () => overlay.remove()
-        }
-
-        overlay.appendChild(zoomImg)
-        document.body.appendChild(overlay)
+        zoomOutImgAnimation.onfinish = () => overlay.remove()
       }
+
+      overlay.appendChild(zoomImg)
+      document.body.appendChild(overlay)
     }
+
+    this.getWindow().scrollTo(0, 0)
   }
 
   focus () {
@@ -953,9 +1018,11 @@ export default class MarkdownPreview extends React.Component {
     e.preventDefault()
     e.stopPropagation()
 
-    const href = e.target.href
+    const href = e.target.getAttribute('href')
     const linkHash = href.split('/').pop()
 
+    if (!href) return
+
     const regexNoteInternalLink = /main.html#(.+)/
     if (regexNoteInternalLink.test(linkHash)) {
       const targetId = mdurl.encode(linkHash.match(regexNoteInternalLink)[1])
diff --git a/browser/components/NavToggleButton.js b/browser/components/NavToggleButton.js
index ad0ff54c..7dc75e90 100644
--- a/browser/components/NavToggleButton.js
+++ b/browser/components/NavToggleButton.js
@@ -16,8 +16,8 @@ const NavToggleButton = ({isFolded, handleToggleButtonClick}) => (
     onClick={(e) => handleToggleButtonClick(e)}
   >
     {isFolded
-     ? <i className='fa fa-angle-double-right' />
-     : <i className='fa fa-angle-double-left' />
+     ? <i className='fa fa-angle-double-right fa-2x' />
+     : <i className='fa fa-angle-double-left fa-2x' />
     }
   </button>
 )
diff --git a/browser/components/NavToggleButton.styl b/browser/components/NavToggleButton.styl
index ae9dd6ca..422a7ca6 100644
--- a/browser/components/NavToggleButton.styl
+++ b/browser/components/NavToggleButton.styl
@@ -7,7 +7,7 @@
   border-radius 16.5px
   height 34px
   width 34px
-  line-height 32px
+  line-height 100%
   padding 0
   &:hover
     border: 1px solid #1EC38B;
diff --git a/browser/lib/CMLanguageList.js b/browser/lib/CMLanguageList.js
new file mode 100644
index 00000000..0a8652a6
--- /dev/null
+++ b/browser/lib/CMLanguageList.js
@@ -0,0 +1,78 @@
+export const languageMaps = {
+  brainfuck: 'Brainfuck',
+  cpp: 'C++',
+  cs: 'C#',
+  clojure: 'Clojure',
+  'clojure-repl': 'ClojureScript',
+  cmake: 'CMake',
+  coffeescript: 'CoffeeScript',
+  crystal: 'Crystal',
+  css: 'CSS',
+  d: 'D',
+  dart: 'Dart',
+  delphi: 'Pascal',
+  diff: 'Diff',
+  django: 'Django',
+  dockerfile: 'Dockerfile',
+  ebnf: 'EBNF',
+  elm: 'Elm',
+  erlang: 'Erlang',
+  'erlang-repl': 'Erlang',
+  fortran: 'Fortran',
+  fsharp: 'F#',
+  gherkin: 'Gherkin',
+  go: 'Go',
+  groovy: 'Groovy',
+  haml: 'HAML',
+  haskell: 'Haskell',
+  haxe: 'Haxe',
+  http: 'HTTP',
+  ini: 'toml',
+  java: 'Java',
+  javascript: 'JavaScript',
+  json: 'JSON',
+  julia: 'Julia',
+  kotlin: 'Kotlin',
+  less: 'LESS',
+  livescript: 'LiveScript',
+  lua: 'Lua',
+  markdown: 'Markdown',
+  mathematica: 'Mathematica',
+  nginx: 'Nginx',
+  nsis: 'NSIS',
+  objectivec: 'Objective-C',
+  ocaml: 'Ocaml',
+  perl: 'Perl',
+  php: 'PHP',
+  powershell: 'PowerShell',
+  properties: 'Properties files',
+  protobuf: 'ProtoBuf',
+  python: 'Python',
+  puppet: 'Puppet',
+  q: 'Q',
+  r: 'R',
+  ruby: 'Ruby',
+  rust: 'Rust',
+  sas: 'SAS',
+  scala: 'Scala',
+  scheme: 'Scheme',
+  scss: 'SCSS',
+  shell: 'Shell',
+  smalltalk: 'Smalltalk',
+  sml: 'SML',
+  sql: 'SQL',
+  stylus: 'Stylus',
+  swift: 'Swift',
+  tcl: 'Tcl',
+  tex: 'LaTex',
+  typescript: 'TypeScript',
+  twig: 'Twig',
+  vbnet: 'VB.NET',
+  vbscript: 'VBScript',
+  verilog: 'Verilog',
+  vhdl: 'VHDL',
+  xml: 'HTML',
+  xquery: 'XQuery',
+  yaml: 'YAML',
+  elixir: 'Elixir'
+}
diff --git a/browser/lib/SnippetManager.js b/browser/lib/SnippetManager.js
new file mode 100644
index 00000000..70f9b400
--- /dev/null
+++ b/browser/lib/SnippetManager.js
@@ -0,0 +1,91 @@
+import crypto from 'crypto'
+import fs from 'fs'
+import consts from './consts'
+
+class SnippetManager {
+  constructor () {
+    this.defaultSnippet = [
+      {
+        id: crypto.randomBytes(16).toString('hex'),
+        name: 'Dummy text',
+        prefix: ['lorem', 'ipsum'],
+        content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
+      }
+    ]
+    this.snippets = []
+    this.expandSnippet = this.expandSnippet.bind(this)
+    this.init = this.init.bind(this)
+    this.assignSnippets = this.assignSnippets.bind(this)
+  }
+
+  init () {
+    if (fs.existsSync(consts.SNIPPET_FILE)) {
+      try {
+        this.snippets = JSON.parse(
+          fs.readFileSync(consts.SNIPPET_FILE, { encoding: 'UTF-8' })
+        )
+      } catch (error) {
+        console.log('Error while parsing snippet file')
+      }
+      return
+    }
+    fs.writeFileSync(
+      consts.SNIPPET_FILE,
+      JSON.stringify(this.defaultSnippet, null, 4),
+      'utf8'
+    )
+    this.snippets = this.defaultSnippet
+  }
+
+  assignSnippets (snippets) {
+    this.snippets = snippets
+  }
+
+  expandSnippet (wordBeforeCursor, cursor, cm) {
+    const templateCursorString = ':{}'
+    for (let i = 0; i < this.snippets.length; i++) {
+      if (this.snippets[i].prefix.indexOf(wordBeforeCursor.text) === -1) {
+        continue
+      }
+      if (this.snippets[i].content.indexOf(templateCursorString) !== -1) {
+        const snippetLines = this.snippets[i].content.split('\n')
+        let cursorLineNumber = 0
+        let cursorLinePosition = 0
+
+        let cursorIndex
+        for (let j = 0; j < snippetLines.length; j++) {
+          cursorIndex = snippetLines[j].indexOf(templateCursorString)
+
+          if (cursorIndex !== -1) {
+            cursorLineNumber = j
+            cursorLinePosition = cursorIndex
+
+            break
+          }
+        }
+
+        cm.replaceRange(
+          this.snippets[i].content.replace(templateCursorString, ''),
+          wordBeforeCursor.range.from,
+          wordBeforeCursor.range.to
+        )
+        cm.setCursor({
+          line: cursor.line + cursorLineNumber,
+          ch: cursorLinePosition + cursor.ch - wordBeforeCursor.text.length
+        })
+      } else {
+        cm.replaceRange(
+          this.snippets[i].content,
+          wordBeforeCursor.range.from,
+          wordBeforeCursor.range.to
+        )
+      }
+      return true
+    }
+
+    return false
+  }
+}
+
+const manager = new SnippetManager()
+export default manager
diff --git a/browser/lib/markdown-toc-generator.js b/browser/lib/markdown-toc-generator.js
index af1c833f..8f027247 100644
--- a/browser/lib/markdown-toc-generator.js
+++ b/browser/lib/markdown-toc-generator.js
@@ -28,6 +28,8 @@ function linkify (token) {
 const TOC_MARKER_START = '<!-- toc -->'
 const TOC_MARKER_END = '<!-- tocstop -->'
 
+const tocRegex = new RegExp(`${TOC_MARKER_START}[\\s\\S]*?${TOC_MARKER_END}`)
+
 /**
  * Takes care of proper updating given editor with TOC.
  * If TOC doesn't exit in the editor, it's inserted at current caret position.
@@ -35,12 +37,6 @@ const TOC_MARKER_END = '<!-- tocstop -->'
  * @param editor CodeMirror editor to be updated with TOC
  */
 export function generateInEditor (editor) {
-  const tocRegex = new RegExp(`${TOC_MARKER_START}[\\s\\S]*?${TOC_MARKER_END}`)
-
-  function tocExistsInEditor () {
-    return tocRegex.test(editor.getValue())
-  }
-
   function updateExistingToc () {
     const toc = generate(editor.getValue())
     const search = editor.getSearchCursor(tocRegex)
@@ -54,13 +50,17 @@ export function generateInEditor (editor) {
     editor.replaceRange(wrapTocWithEol(toc, editor), editor.getCursor())
   }
 
-  if (tocExistsInEditor()) {
+  if (tocExistsInEditor(editor)) {
     updateExistingToc()
   } else {
     addTocAtCursorPosition()
   }
 }
 
+export function tocExistsInEditor (editor) {
+  return tocRegex.test(editor.getValue())
+}
+
 /**
  * Generates MD TOC based on MD document passed as string.
  * @param markdownText MD document
@@ -94,5 +94,6 @@ function wrapTocWithEol (toc, editor) {
 
 export default {
   generate,
-  generateInEditor
+  generateInEditor,
+  tocExistsInEditor
 }
diff --git a/browser/lib/markdown.js b/browser/lib/markdown.js
index 0ea15ba9..df429b19 100644
--- a/browser/lib/markdown.js
+++ b/browser/lib/markdown.js
@@ -181,7 +181,7 @@ class Markdown {
     })
 
     const deflate = require('markdown-it-plantuml/lib/deflate')
-    this.md.use(require('markdown-it-plantuml'), '', {
+    this.md.use(require('markdown-it-plantuml'), {
       generateSource: function (umlCode) {
         const stripTrailingSlash = (url) => url.endsWith('/') ? url.slice(0, -1) : url
         const serverAddress = stripTrailingSlash(config.preview.plantUMLServerAddress) + '/svg'
diff --git a/browser/lib/markdownTextHelper.js b/browser/lib/markdownTextHelper.js
index 1501e2c7..1657efd9 100644
--- a/browser/lib/markdownTextHelper.js
+++ b/browser/lib/markdownTextHelper.js
@@ -22,7 +22,7 @@ export function strip (input) {
       .replace(/\[(.*?)\][\[\(].*?[\]\)]/g, '$1')
       .replace(/>/g, '')
       .replace(/^\s{1,2}\[(.*?)\]: (\S+)( ".*?")?\s*$/g, '')
-      .replace(/^#{1,6}\s*([^#]*)\s*(#{1,6})?/gm, '$1')
+      .replace(/^#{1,6}\s*/gm, '')
       .replace(/(`{3,})(.*?)\1/gm, '$2')
       .replace(/^-{3,}\s*$/g, '')
       .replace(/`(.+?)`/g, '$1')
diff --git a/browser/lib/spellcheck.js b/browser/lib/spellcheck.js
index dd04e575..ab8fc81b 100644
--- a/browser/lib/spellcheck.js
+++ b/browser/lib/spellcheck.js
@@ -14,7 +14,7 @@ let self
 
 function getAvailableDictionaries () {
   return [
-    {label: i18n.__('Disabled'), value: SPELLCHECK_DISABLED},
+    {label: i18n.__('Spellcheck disabled'), value: SPELLCHECK_DISABLED},
     {label: i18n.__('English'), value: 'en_GB'},
     {label: i18n.__('German'), value: 'de_DE'},
     {label: i18n.__('French'), value: 'fr_FR'}
diff --git a/browser/lib/utils.js b/browser/lib/utils.js
index 1d15b722..4bcc9698 100644
--- a/browser/lib/utils.js
+++ b/browser/lib/utils.js
@@ -132,8 +132,13 @@ export function isObjectEqual (a, b) {
   return true
 }
 
+export function isMarkdownTitleURL (str) {
+  return /(^#{1,6}\s)(?:\w+:|^)\/\/(?:[^\s\.]+\.\S{2}|localhost[\:?\d]*)/.test(str)
+}
+
 export default {
   lastFindInArray,
   escapeHtmlCharacters,
-  isObjectEqual
+  isObjectEqual,
+  isMarkdownTitleURL
 }
diff --git a/browser/main/Detail/InfoPanel.js b/browser/main/Detail/InfoPanel.js
index 15535186..8fe0a855 100644
--- a/browser/main/Detail/InfoPanel.js
+++ b/browser/main/Detail/InfoPanel.js
@@ -14,7 +14,7 @@ class InfoPanel extends React.Component {
 
   render () {
     const {
-      storageName, folderName, noteLink, updatedAt, createdAt, exportAsMd, exportAsTxt, exportAsHtml, wordCount, letterCount, type, print
+      storageName, folderName, noteLink, updatedAt, createdAt, exportAsMd, exportAsTxt, exportAsHtml, exportAsPdf, wordCount, letterCount, type, print
     } = this.props
     return (
       <div className='infoPanel' styleName='control-infoButton-panel' style={{display: 'none'}}>
@@ -85,6 +85,11 @@ class InfoPanel extends React.Component {
             <p>{i18n.__('.html')}</p>
           </button>
 
+          <button styleName='export--enable' onClick={(e) => exportAsPdf(e, 'export-pdf')}>
+            <i className='fa fa-file-pdf-o' />
+            <p>{i18n.__('.pdf')}</p>
+          </button>
+
           <button styleName='export--enable' onClick={(e) => print(e, 'print')}>
             <i className='fa fa-print' />
             <p>{i18n.__('Print')}</p>
@@ -104,6 +109,7 @@ InfoPanel.propTypes = {
   exportAsMd: PropTypes.func.isRequired,
   exportAsTxt: PropTypes.func.isRequired,
   exportAsHtml: PropTypes.func.isRequired,
+  exportAsPdf: PropTypes.func.isRequired,
   wordCount: PropTypes.number,
   letterCount: PropTypes.number,
   type: PropTypes.string.isRequired,
diff --git a/browser/main/Detail/InfoPanel.styl b/browser/main/Detail/InfoPanel.styl
index 1f774174..e9f7f59b 100644
--- a/browser/main/Detail/InfoPanel.styl
+++ b/browser/main/Detail/InfoPanel.styl
@@ -15,7 +15,7 @@
   right 25px
   position absolute
   padding 20px 25px 0 25px
-  width 300px
+  // width 300px
   overflow auto
   background-color $ui-noteList-backgroundColor
   box-shadow 2px 12px 15px 2px rgba(0, 0, 0, 0.1), 2px 1px 50px 2px rgba(0, 0, 0, 0.1)
diff --git a/browser/main/Detail/InfoPanelTrashed.js b/browser/main/Detail/InfoPanelTrashed.js
index d4c8045d..55c9be0a 100644
--- a/browser/main/Detail/InfoPanelTrashed.js
+++ b/browser/main/Detail/InfoPanelTrashed.js
@@ -5,7 +5,7 @@ import styles from './InfoPanel.styl'
 import i18n from 'browser/lib/i18n'
 
 const InfoPanelTrashed = ({
-  storageName, folderName, updatedAt, createdAt, exportAsMd, exportAsTxt, exportAsHtml
+  storageName, folderName, updatedAt, createdAt, exportAsMd, exportAsTxt, exportAsHtml, exportAsPdf
 }) => (
   <div className='infoPanel' styleName='control-infoButton-panel-trash' style={{display: 'none'}}>
     <div>
@@ -46,7 +46,7 @@ const InfoPanelTrashed = ({
         <p>.html</p>
       </button>
 
-      <button styleName='export--unable'>
+      <button styleName='export--enable' onClick={(e) => exportAsPdf(e, 'export-pdf')}>
         <i className='fa fa-file-pdf-o' />
         <p>.pdf</p>
       </button>
@@ -61,7 +61,8 @@ InfoPanelTrashed.propTypes = {
   createdAt: PropTypes.string.isRequired,
   exportAsMd: PropTypes.func.isRequired,
   exportAsTxt: PropTypes.func.isRequired,
-  exportAsHtml: PropTypes.func.isRequired
+  exportAsHtml: PropTypes.func.isRequired,
+  exportAsPdf: PropTypes.func.isRequired
 }
 
 export default CSSModules(InfoPanelTrashed, styles)
diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index 040df60b..cf3be072 100755
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -100,7 +100,12 @@ class MarkdownNoteDetail extends React.Component {
   handleUpdateContent () {
     const { note } = this.state
     note.content = this.refs.content.value
-    note.title = markdown.strip(striptags(findNoteTitle(note.content, this.props.config.editor.enableFrontMatterTitle, this.props.config.editor.frontMatterTitleField)))
+
+    let title = findNoteTitle(note.content, this.props.config.editor.enableFrontMatterTitle, this.props.config.editor.frontMatterTitleField)
+    title = striptags(title)
+    title = markdown.strip(title)
+    note.title = title
+
     this.updateNote(note)
   }
 
@@ -196,6 +201,10 @@ class MarkdownNoteDetail extends React.Component {
     ee.emit('export:save-html')
   }
 
+  exportAsPdf () {
+    ee.emit('export:save-pdf')
+  }
+
   handleKeyDown (e) {
     switch (e.keyCode) {
       // tab key
@@ -421,6 +430,7 @@ class MarkdownNoteDetail extends React.Component {
           exportAsHtml={this.exportAsHtml}
           exportAsMd={this.exportAsMd}
           exportAsTxt={this.exportAsTxt}
+          exportAsPdf={this.exportAsPdf}
         />
       </div>
     </div>
@@ -487,6 +497,7 @@ class MarkdownNoteDetail extends React.Component {
           exportAsMd={this.exportAsMd}
           exportAsTxt={this.exportAsTxt}
           exportAsHtml={this.exportAsHtml}
+          exportAsPdf={this.exportAsPdf}
           wordCount={note.content.split(' ').length}
           letterCount={note.content.replace(/\r?\n/g, '').length}
           type={note.type}
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 11d8ac2a..80378793 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -657,6 +657,7 @@ class SnippetNoteDetail extends React.Component {
       'export-txt': 'Text export',
       'export-md': 'Markdown export',
       'export-html': 'HTML export',
+      'export-pdf': 'PDF export',
       'print': 'Print'
     })[msg]
 
@@ -770,6 +771,7 @@ class SnippetNoteDetail extends React.Component {
           exportAsMd={this.showWarning}
           exportAsTxt={this.showWarning}
           exportAsHtml={this.showWarning}
+          exportAsPdf={this.showWarning}
         />
       </div>
     </div>
@@ -818,6 +820,7 @@ class SnippetNoteDetail extends React.Component {
           exportAsMd={this.showWarning}
           exportAsTxt={this.showWarning}
           exportAsHtml={this.showWarning}
+          exportAsPdf={this.showWarning}
           type={note.type}
           print={this.showWarning}
         />
diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index 33a0adf0..cfcfcc99 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -259,13 +259,22 @@ class NoteList extends React.Component {
   }
 
   jumpNoteByHashHandler (event, noteHash) {
+    const { data } = this.props
+
     // first argument event isn't used.
     if (this.notes === null || this.notes.length === 0) {
       return
     }
 
     const selectedNoteKeys = [noteHash]
-    this.focusNote(selectedNoteKeys, noteHash, '/home')
+
+    let locationToSelect = '/home'
+    const noteByHash = data.noteMap.map((note) => note).find(note => note.key === noteHash)
+    if (noteByHash !== undefined) {
+      locationToSelect = '/storages/' + noteByHash.storage + '/folders/' + noteByHash.folder
+    }
+
+    this.focusNote(selectedNoteKeys, noteHash, locationToSelect)
 
     ee.emit('list:moved')
   }
@@ -496,6 +505,7 @@ class NoteList extends React.Component {
       'export-txt': 'Text export',
       'export-md': 'Markdown export',
       'export-html': 'HTML export',
+      'export-pdf': 'PDF export',
       'print': 'Print'
     })[msg]
 
@@ -716,7 +726,11 @@ class NoteList extends React.Component {
         folder: folder.key,
         title: firstNote.title + ' ' + i18n.__('copy'),
         content: firstNote.content,
-        linesHighlighted: firstNote.linesHighlighted
+        linesHighlighted: firstNote.linesHighlighted,
+        description: firstNote.description,
+        snippets: firstNote.snippets,
+        tags: firstNote.tags,
+        isStarred: firstNote.isStarred
       })
       .then((note) => {
         attachmentManagement.cloneAttachments(firstNote, note)
@@ -881,7 +895,7 @@ class NoteList extends React.Component {
     if (!location.pathname.match(/\/trashed/)) this.addNotesFromFiles(filepaths)
   }
 
-  // Add notes to the current folder
+ // Add notes to the current folder
   addNotesFromFiles (filepaths) {
     const { dispatch, location } = this.props
     const { storage, folder } = this.resolveTargetFolder()
@@ -905,13 +919,20 @@ class NoteList extends React.Component {
           }
           dataApi.createNote(storage.key, newNote)
           .then((note) => {
-            dispatch({
-              type: 'UPDATE_NOTE',
-              note: note
-            })
-            hashHistory.push({
-              pathname: location.pathname,
-              query: {key: getNoteKey(note)}
+            attachmentManagement.importAttachments(note.content, filepath, storage.key, note.key)
+            .then((newcontent) => {
+              note.content = newcontent
+
+              dataApi.updateNote(storage.key, note.key, note)
+
+              dispatch({
+                type: 'UPDATE_NOTE',
+                note: note
+              })
+              hashHistory.push({
+                pathname: location.pathname,
+                query: {key: getNoteKey(note)}
+              })
             })
           })
         })
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 5558b3bd..05f3d822 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -47,7 +47,7 @@ export const DEFAULT_CONFIG = {
     enableRulers: false,
     rulers: [80, 120],
     displayLineNumbers: true,
-    matchingPairs: '()[]{}\'\'""$$**``',
+    matchingPairs: '()[]{}\'\'""$$**``~~__',
     matchingTriples: '```"""\'\'\'',
     explodingPairs: '[]{}``$$',
     switchPreview: 'BLUR', // 'BLUR', 'DBL_CLICK', 'RIGHTCLICK'
diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index 407fa659..d92a1eb4 100644
--- a/browser/main/lib/dataApi/attachmentManagement.js
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -6,6 +6,7 @@ const mdurl = require('mdurl')
 const fse = require('fs-extra')
 const escapeStringRegexp = require('escape-string-regexp')
 const sander = require('sander')
+const url = require('url')
 import i18n from 'browser/lib/i18n'
 
 const STORAGE_FOLDER_PLACEHOLDER = ':storage'
@@ -18,15 +19,23 @@ const PATH_SEPARATORS = escapeStringRegexp(path.posix.sep) + escapeStringRegexp(
  * @returns {Promise<Image>} Image element created
  */
 function getImage (file) {
-  return new Promise((resolve) => {
-    const reader = new FileReader()
-    const img = new Image()
-    img.onload = () => resolve(img)
-    reader.onload = e => {
-      img.src = e.target.result
-    }
-    reader.readAsDataURL(file)
-  })
+  if (_.isString(file)) {
+    return new Promise(resolve => {
+      const img = new Image()
+      img.onload = () => resolve(img)
+      img.src = file
+    })
+  } else {
+    return new Promise(resolve => {
+      const reader = new FileReader()
+      const img = new Image()
+      img.onload = () => resolve(img)
+      reader.onload = e => {
+        img.src = e.target.result
+      }
+      reader.readAsDataURL(file)
+    })
+  }
 }
 
 /**
@@ -76,7 +85,7 @@ function getOrientation (file) {
             return view.getUint16(offset + (i * 12) + 8, little)
           }
         }
-      } else if ((marker & 0xFF00) !== 0xFF00) { // If not start with 0xFF, not a Marker
+      } else if ((marker & 0xFF00) !== 0xFF00) { // If not start with 0xFF, not a Marker.
         break
       } else {
         offset += view.getUint16(offset, false)
@@ -151,23 +160,28 @@ function copyAttachment (sourceFilePath, storageKey, noteKey, useRandomName = tr
 
     try {
       const isBase64 = typeof sourceFilePath === 'object' && sourceFilePath.type === 'base64'
-      if (!fs.existsSync(sourceFilePath) && !isBase64) {
+      if (!isBase64 && !fs.existsSync(sourceFilePath)) {
         return reject('source file does not exist')
       }
-      const targetStorage = findStorage.findStorage(storageKey)
+
+      const sourcePath = sourceFilePath.sourceFilePath || sourceFilePath
+      const sourceURL = url.parse(/^\w+:\/\//.test(sourcePath) ? sourcePath : 'file:///' + sourcePath)
+
       let destinationName
       if (useRandomName) {
-        destinationName = `${uniqueSlug()}${path.extname(sourceFilePath.sourceFilePath || sourceFilePath)}`
+        destinationName = `${uniqueSlug()}${path.extname(sourceURL.pathname) || '.png'}`
       } else {
-        destinationName = path.basename(sourceFilePath.sourceFilePath || sourceFilePath)
+        destinationName = path.basename(sourceURL.pathname)
       }
+
+      const targetStorage = findStorage.findStorage(storageKey)
       const destinationDir = path.join(targetStorage.path, DESTINATION_FOLDER, noteKey)
       createAttachmentDestinationFolder(targetStorage.path, noteKey)
       const outputFile = fs.createWriteStream(path.join(destinationDir, destinationName))
 
       if (isBase64) {
         const base64Data = sourceFilePath.data.replace(/^data:image\/\w+;base64,/, '')
-        const dataBuffer = new Buffer(base64Data, 'base64')
+        const dataBuffer = Buffer.from(base64Data, 'base64')
         outputFile.write(dataBuffer, () => {
           resolve(destinationName)
         })
@@ -261,22 +275,87 @@ function generateAttachmentMarkdown (fileName, path, showPreview) {
  * @param {Event} dropEvent DropEvent
  */
 function handleAttachmentDrop (codeEditor, storageKey, noteKey, dropEvent) {
-  const file = dropEvent.dataTransfer.files[0]
-  const filePath = file.path
-  const originalFileName = path.basename(filePath)
-  const fileType = file['type']
-  const isImage = fileType.startsWith('image')
   let promise
-  if (isImage) {
-    promise = fixRotate(file).then(base64data => {
-      return copyAttachment({type: 'base64', data: base64data, sourceFilePath: filePath}, storageKey, noteKey)
-    })
+  if (dropEvent.dataTransfer.files.length > 0) {
+    promise = Promise.all(Array.from(dropEvent.dataTransfer.files).map(file => {
+      const filePath = file.path
+      const fileType = file.type // EX) 'image/gif' or 'text/html'
+      if (fileType.startsWith('image')) {
+        if (fileType === 'image/gif' || fileType === 'image/svg+xml') {
+          return copyAttachment(filePath, storageKey, noteKey).then(fileName => ({
+            fileName,
+            title: path.basename(filePath),
+            isImage: true
+          }))
+        } else {
+          return getOrientation(file)
+            .then((orientation) => {
+              if (orientation === -1) { // The image rotation is correct and does not need adjustment
+                return copyAttachment(filePath, storageKey, noteKey)
+              } else {
+                return fixRotate(file).then(data => copyAttachment({
+                  type: 'base64',
+                  data: data,
+                  sourceFilePath: filePath
+                }, storageKey, noteKey))
+              }
+            })
+            .then(fileName =>
+              ({
+                fileName,
+                title: path.basename(filePath),
+                isImage: true
+              })
+            )
+        }
+      } else {
+        return copyAttachment(filePath, storageKey, noteKey).then(fileName => ({
+          fileName,
+          title: path.basename(filePath),
+          isImage: false
+        }))
+      }
+    }))
   } else {
-    promise = copyAttachment(filePath, storageKey, noteKey)
+    let imageURL = dropEvent.dataTransfer.getData('text/plain')
+
+    if (!imageURL) {
+      const match = /<img[^>]*[\s"']src="([^"]+)"/.exec(dropEvent.dataTransfer.getData('text/html'))
+      if (match) {
+        imageURL = match[1]
+      }
+    }
+
+    if (!imageURL) {
+      return
+    }
+
+    promise = Promise.all([getImage(imageURL)
+      .then(image => {
+        const canvas = document.createElement('canvas')
+        const context = canvas.getContext('2d')
+        canvas.width = image.width
+        canvas.height = image.height
+        context.drawImage(image, 0, 0)
+
+        return copyAttachment({
+          type: 'base64',
+          data: canvas.toDataURL(),
+          sourceFilePath: imageURL
+        }, storageKey, noteKey)
+      })
+      .then(fileName => ({
+        fileName,
+        title: imageURL,
+        isImage: true
+      }))
+    ])
   }
-  promise.then((fileName) => {
-    const imageMd = generateAttachmentMarkdown(originalFileName, path.join(STORAGE_FOLDER_PLACEHOLDER, noteKey, fileName), isImage)
-    codeEditor.insertAttachmentMd(imageMd)
+
+  promise.then(files => {
+    const attachments = files.filter(file => !!file).map(file => generateAttachmentMarkdown(file.title, path.join(STORAGE_FOLDER_PLACEHOLDER, noteKey, file.fileName), file.isImage))
+
+    codeEditor.insertAttachmentMd(attachments.join('\n'))
   })
 }
 
@@ -388,6 +467,54 @@ function getAbsolutePathsOfAttachmentsInContent (markdownContent, storagePath) {
   return result
 }
 
+/**
+ * @description Copies the attachments to the storage folder and returns the mardown content it should be replaced with
+ * @param {String} markDownContent content in which the attachment paths should be found
+ * @param {String} filepath The path of the file with attachments to import
+ * @param {String} storageKey Storage key of the destination storage
+ * @param {String} noteKey Key of the current note. Will be used as subfolder in :storage
+ */
+function importAttachments (markDownContent, filepath, storageKey, noteKey) {
+  return new Promise((resolve, reject) => {
+    const nameRegex = /(!\[.*?]\()(.+?\..+?)(\))/g
+    let attachPath = nameRegex.exec(markDownContent)
+    const promiseArray = []
+    const attachmentPaths = []
+    const groupIndex = 2
+
+    while (attachPath) {
+      let attachmentPath = attachPath[groupIndex]
+      attachmentPaths.push(attachmentPath)
+      attachmentPath = path.isAbsolute(attachmentPath) ? attachmentPath : path.join(path.dirname(filepath), attachmentPath)
+      promiseArray.push(this.copyAttachment(attachmentPath, storageKey, noteKey))
+      attachPath = nameRegex.exec(markDownContent)
+    }
+
+    let numResolvedPromises = 0
+
+    if (promiseArray.length === 0) {
+      resolve(markDownContent)
+    }
+
+    for (let j = 0; j < promiseArray.length; j++) {
+      promiseArray[j]
+      .then((fileName) => {
+        const newPath = path.join(STORAGE_FOLDER_PLACEHOLDER, noteKey, fileName)
+        markDownContent = markDownContent.replace(attachmentPaths[j], newPath)
+      })
+      .catch((e) => {
+        console.error('File does not exist in path: ' + attachmentPaths[j])
+      })
+      .finally(() => {
+        numResolvedPromises++
+        if (numResolvedPromises === promiseArray.length) {
+          resolve(markDownContent)
+        }
+      })
+    }
+  })
+}
+
 /**
  * @description Moves the attachments of the current note to the new location.
  * Returns a modified version of the given content so that the links to the attachments point to the new note key.
@@ -595,6 +722,7 @@ module.exports = {
   handlePasteNativeImage,
   getAttachmentsInMarkdownContent,
   getAbsolutePathsOfAttachmentsInContent,
+  importAttachments,
   removeStorageAndNoteReferences,
   deleteAttachmentFolder,
   deleteAttachmentsNotPresentInNote,
diff --git a/browser/main/lib/dataApi/exportFolder.js b/browser/main/lib/dataApi/exportFolder.js
index 771f77dc..8f15b147 100644
--- a/browser/main/lib/dataApi/exportFolder.js
+++ b/browser/main/lib/dataApi/exportFolder.js
@@ -43,19 +43,18 @@ function exportFolder (storageKey, folderKey, fileType, exportDir) {
     .then(function exportNotes (data) {
       const { storage, notes } = data
 
-      notes
+      return Promise.all(notes
         .filter(note => note.folder === folderKey && note.isTrashed === false && note.type === 'MARKDOWN_NOTE')
-        .forEach(note => {
+        .map(note => {
           const notePath = path.join(exportDir, `${filenamify(note.title, {replacement: '_'})}.${fileType}`)
-          exportNote(note.key, storage.path, note.content, notePath, null)
+          return exportNote(note.key, storage.path, note.content, notePath, null)
         })
-
-      return {
+      ).then(() => ({
         storage,
         folderKey,
         fileType,
         exportDir
-      }
+      }))
     })
 }
 
diff --git a/browser/main/lib/dataApi/exportNote.js b/browser/main/lib/dataApi/exportNote.js
index b358e548..75c451c1 100755
--- a/browser/main/lib/dataApi/exportNote.js
+++ b/browser/main/lib/dataApi/exportNote.js
@@ -43,14 +43,17 @@ function exportNote (nodeKey, storageKey, noteContent, targetPath, outputFormatt
   )
 
   if (outputFormatter) {
-    exportedData = outputFormatter(exportedData, exportTasks)
+    exportedData = outputFormatter(exportedData, exportTasks, path.dirname(targetPath))
+  } else {
+    exportedData = Promise.resolve(exportedData)
   }
 
   const tasks = prepareTasks(exportTasks, storagePath, path.dirname(targetPath))
 
   return Promise.all(tasks.map((task) => copyFile(task.src, task.dst)))
-  .then(() => {
-    return saveToFile(exportedData, targetPath)
+  .then(() => exportedData)
+  .then(data => {
+    return saveToFile(data, targetPath)
   }).catch((err) => {
     rollbackExport(tasks)
     throw err
diff --git a/browser/main/modals/NewNoteModal.js b/browser/main/modals/NewNoteModal.js
index a190602c..41c174cb 100644
--- a/browser/main/modals/NewNoteModal.js
+++ b/browser/main/modals/NewNoteModal.js
@@ -8,7 +8,7 @@ import { createMarkdownNote, createSnippetNote } from 'browser/lib/newNote'
 class NewNoteModal extends React.Component {
   constructor (props) {
     super(props)
-
+    this.lock = false
     this.state = {}
   }
 
@@ -22,9 +22,12 @@ class NewNoteModal extends React.Component {
 
   handleMarkdownNoteButtonClick (e) {
     const { storage, folder, dispatch, location, params, config } = this.props
-    createMarkdownNote(storage, folder, dispatch, location, params, config).then(() => {
-      setTimeout(this.props.close, 200)
-    })
+    if (!this.lock) {
+      this.lock = true
+      createMarkdownNote(storage, folder, dispatch, location, params, config).then(() => {
+        setTimeout(this.props.close, 200)
+      })
+    }
   }
 
   handleMarkdownNoteButtonKeyDown (e) {
@@ -36,9 +39,12 @@ class NewNoteModal extends React.Component {
 
   handleSnippetNoteButtonClick (e) {
     const { storage, folder, dispatch, location, params, config } = this.props
-    createSnippetNote(storage, folder, dispatch, location, params, config).then(() => {
-      setTimeout(this.props.close, 200)
-    })
+    if (!this.lock) {
+      this.lock = true
+      createSnippetNote(storage, folder, dispatch, location, params, config).then(() => {
+        setTimeout(this.props.close, 200)
+      })
+    }
   }
 
   handleSnippetNoteButtonKeyDown (e) {
diff --git a/browser/main/modals/PreferencesModal/ConfigTab.styl b/browser/main/modals/PreferencesModal/ConfigTab.styl
index 255165ce..0e22833d 100644
--- a/browser/main/modals/PreferencesModal/ConfigTab.styl
+++ b/browser/main/modals/PreferencesModal/ConfigTab.styl
@@ -18,6 +18,14 @@
   margin-bottom 15px
   margin-top 30px
 
+.group-header--sub
+  @extend .group-header
+  margin-bottom 10px
+
+.group-header2--sub
+  @extend .group-header2
+  margin-bottom 10px
+
 .group-section
   margin-bottom 20px
   display flex
@@ -148,10 +156,12 @@ body[data-theme="dark"]
     color $ui-dark-text-color
 
   .group-header
+  .group-header--sub
     color $ui-dark-text-color
     border-color $ui-dark-borderColor
 
   .group-header2
+  .group-header2--sub
     color $ui-dark-text-color
 
   .group-section-control-input
@@ -176,10 +186,12 @@ body[data-theme="solarized-dark"]
     color $ui-solarized-dark-text-color
 
   .group-header
+  .group-header--sub
     color $ui-solarized-dark-text-color
     border-color $ui-solarized-dark-borderColor
 
   .group-header2
+  .group-header2--sub
     color $ui-solarized-dark-text-color
 
   .group-section-control-input
@@ -203,10 +215,12 @@ body[data-theme="monokai"]
     color $ui-monokai-text-color
 
   .group-header
+  .group-header--sub
     color $ui-monokai-text-color
     border-color $ui-monokai-borderColor
 
   .group-header2
+  .group-header2--sub
     color $ui-monokai-text-color
 
   .group-section-control-input
@@ -230,10 +244,12 @@ body[data-theme="dracula"]
     color $ui-dracula-text-color
 
   .group-header
+  .group-header--sub
     color $ui-dracula-text-color
     border-color $ui-dracula-borderColor
 
   .group-header2
+  .group-header2--sub
     color $ui-dracula-text-color
 
   .group-section-control-input
diff --git a/browser/main/modals/PreferencesModal/Crowdfunding.js b/browser/main/modals/PreferencesModal/Crowdfunding.js
index f6389cd8..56bb6e34 100644
--- a/browser/main/modals/PreferencesModal/Crowdfunding.js
+++ b/browser/main/modals/PreferencesModal/Crowdfunding.js
@@ -22,19 +22,17 @@ class Crowdfunding extends React.Component {
   render () {
     return (
       <div styleName='root'>
-        <div styleName='header'>{i18n.__('Crowdfunding')}</div>
+        <div styleName='group-header'>{i18n.__('Crowdfunding')}</div>
         <p>{i18n.__('Thank you for using Boostnote!')}</p>
         <br />
         <p>{i18n.__('We launched IssueHunt which is an issue-based crowdfunding / sourcing platform for open source projects.')}</p>
         <p>{i18n.__('Anyone can put a bounty on not only a bug but also on OSS feature requests listed on IssueHunt. Collected funds will be distributed to project owners and contributors.')}</p>
-        <br />
-        <p>{i18n.__('### Sustainable Open Source Ecosystem')}</p>
+        <div styleName='group-header2--sub'>{i18n.__('Sustainable Open Source Ecosystem')}</div>
         <p>{i18n.__('We discussed about open-source ecosystem and IssueHunt concept with the Boostnote team repeatedly. We actually also discussed with Matz who father of Ruby.')}</p>
         <p>{i18n.__('The original reason why we made IssueHunt was to reward our contributors of Boostnote project. We’ve got tons of Github stars and hundred of contributors in two years.')}</p>
         <p>{i18n.__('We thought that it will be nice if we can pay reward for our contributors.')}</p>
-        <br />
-        <p>{i18n.__('### We believe Meritocracy')}</p>
-        <p>{i18n.__('We think developers who has skill and did great things must be rewarded properly.')}</p>
+        <div styleName='group-header2--sub'>{i18n.__('We believe Meritocracy')}</div>
+        <p>{i18n.__('We think developers who have skills and do great things must be rewarded properly.')}</p>
         <p>{i18n.__('OSS projects are used in everywhere on the internet, but no matter how they great, most of owners of those projects need to have another job to sustain their living.')}</p>
         <p>{i18n.__('It sometimes looks like exploitation.')}</p>
         <p>{i18n.__('We’ve realized IssueHunt could enhance sustainability of open-source ecosystem.')}</p>
diff --git a/browser/main/modals/PreferencesModal/Crowdfunding.styl b/browser/main/modals/PreferencesModal/Crowdfunding.styl
index 6d72290b..d1d6fc9f 100644
--- a/browser/main/modals/PreferencesModal/Crowdfunding.styl
+++ b/browser/main/modals/PreferencesModal/Crowdfunding.styl
@@ -1,14 +1,8 @@
-@import('./Tab')
+@import('./ConfigTab')
 
-.root
-  padding 15px
-  white-space pre
-  line-height 1.4
-  color alpha($ui-text-color, 90%)
-  width 100%
-  font-size 14px
 p
   font-size 16px
+  line-height 1.4
 
 .cf-link
   height 35px
diff --git a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modals/PreferencesModal/InfoTab.js
index dafabb02..8682f62d 100644
--- a/browser/main/modals/PreferencesModal/InfoTab.js
+++ b/browser/main/modals/PreferencesModal/InfoTab.js
@@ -69,8 +69,7 @@ class InfoTab extends React.Component {
   render () {
     return (
       <div styleName='root'>
-
-        <div styleName='header--sub'>{i18n.__('Community')}</div>
+        <div styleName='group-header'>{i18n.__('Community')}</div>
         <div styleName='top'>
           <ul styleName='list'>
             <li>
@@ -108,7 +107,7 @@ class InfoTab extends React.Component {
 
         <hr />
 
-        <div styleName='header--sub'>{i18n.__('About')}</div>
+        <div styleName='group-header--sub'>{i18n.__('About')}</div>
 
         <div styleName='top'>
           <div styleName='icon-space'>
@@ -143,7 +142,7 @@ class InfoTab extends React.Component {
 
         <hr styleName='separate-line' />
 
-        <div styleName='policy'>{i18n.__('Analytics')}</div>
+        <div styleName='group-header2--sub'>{i18n.__('Analytics')}</div>
         <div>{i18n.__('Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.')}</div>
         <div>{i18n.__('You can see how it works on ')}<a href='https://github.com/BoostIO/Boostnote' onClick={(e) => this.handleLinkClick(e)}>GitHub</a>.</div>
         <br />
diff --git a/browser/main/modals/PreferencesModal/InfoTab.styl b/browser/main/modals/PreferencesModal/InfoTab.styl
index 44f2d9ae..c541c91c 100644
--- a/browser/main/modals/PreferencesModal/InfoTab.styl
+++ b/browser/main/modals/PreferencesModal/InfoTab.styl
@@ -1,16 +1,4 @@
-@import('./Tab')
-
-.root
-  padding 15px
-  white-space pre
-  line-height 1.4
-  color alpha($ui-text-color, 90%)
-  width 100%
-  font-size 14px
-
-.top
-  text-align left
-  margin-bottom 20px
+@import('./ConfigTab.styl')
 
 .icon-space
   margin 20px 0
@@ -45,13 +33,21 @@
 .separate-line
   margin 40px 0
 
-.policy
-  width 100%
-  font-size 20px
-  margin-bottom 10px
-
 .policy-submit
   margin-top 10px
+  height 35px
+  border-radius 2px
+  border none
+  background-color alpha(#1EC38B, 90%)
+  padding-left 20px
+  padding-right 20px
+  text-decoration none
+  color white
+  font-weight 600
+  font-size 16px
+  &:hover
+    background-color #1EC38B
+    transition 0.2s
 
 .policy-confirm
   margin-top 10px
@@ -60,11 +56,14 @@
 body[data-theme="dark"]
   .root
     color alpha($tab--dark-text-color, 80%)
-
+  .appId
+    color $ui-dark-text-color
 
 body[data-theme="solarized-dark"]
   .root
     color $ui-solarized-dark-text-color
+  .appId
+    color $ui-solarized-dark-text-color
 .list
   a
     color $ui-solarized-dark-active-color
@@ -72,6 +71,8 @@ body[data-theme="solarized-dark"]
 body[data-theme="monokai"]
   .root
     color $ui-monokai-text-color
+  .appId
+    color $ui-monokai-text-color
 .list
   a
     color $ui-monokai-active-color
@@ -79,6 +80,8 @@ body[data-theme="monokai"]
 body[data-theme="dracula"]
   .root
     color $ui-dracula-text-color
+  .appId
+    color $ui-dracula-text-color
 .list
   a
-    color $ui-dracula-active-color
+    color $ui-dracula-active-color
\ No newline at end of file
diff --git a/browser/main/modals/PreferencesModal/SnippetEditor.js b/browser/main/modals/PreferencesModal/SnippetEditor.js
index 071f265f..e95afdcf 100644
--- a/browser/main/modals/PreferencesModal/SnippetEditor.js
+++ b/browser/main/modals/PreferencesModal/SnippetEditor.js
@@ -4,6 +4,7 @@ import _ from 'lodash'
 import styles from './SnippetTab.styl'
 import CSSModules from 'browser/lib/CSSModules'
 import dataApi from 'browser/main/lib/dataApi'
+import snippetManager from '../../../lib/SnippetManager'
 
 const defaultEditorFontFamily = ['Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'monospace']
 const buildCMRulers = (rulers, enableRulers) =>
@@ -64,7 +65,9 @@ class SnippetEditor extends React.Component {
   }
 
   saveSnippet () {
-    dataApi.updateSnippet(this.snippet).catch((err) => { throw err })
+    dataApi.updateSnippet(this.snippet)
+      .then(snippets => snippetManager.assignSnippets(snippets))
+      .catch((err) => { throw err })
   }
 
   render () {
diff --git a/browser/main/modals/PreferencesModal/SnippetTab.js b/browser/main/modals/PreferencesModal/SnippetTab.js
index 5f5b0aac..df338d7f 100644
--- a/browser/main/modals/PreferencesModal/SnippetTab.js
+++ b/browser/main/modals/PreferencesModal/SnippetTab.js
@@ -91,7 +91,7 @@ class SnippetTab extends React.Component {
     if (!(editorFontSize > 0 && editorFontSize < 132)) editorIndentSize = 4
     return (
       <div styleName='root'>
-        <div styleName='header'>{i18n.__('Snippets')}</div>
+        <div styleName='group-header'>{i18n.__('Snippets')}</div>
         <SnippetList
           onSnippetSelect={this.handleSnippetSelect.bind(this)}
           onSnippetDeleted={this.handleDeleteSnippet.bind(this)}
diff --git a/browser/main/modals/PreferencesModal/SnippetTab.styl b/browser/main/modals/PreferencesModal/SnippetTab.styl
index dd22b72e..296f8167 100644
--- a/browser/main/modals/PreferencesModal/SnippetTab.styl
+++ b/browser/main/modals/PreferencesModal/SnippetTab.styl
@@ -1,14 +1,5 @@
-@import('./Tab')
 @import('./ConfigTab')
 
-.root
-  padding 15px
-  white-space pre
-  line-height 1.4
-  color alpha($ui-text-color, 90%)
-  width 100%
-  font-size 14px
-
 .group
   margin-bottom 45px
 
@@ -127,7 +118,7 @@
     background darken(#f5f5f5, 5)
 
 .snippet-detail
-  width 70%
+  width 67%
   height calc(100% - 200px)
   position absolute
   left 33%
diff --git a/browser/main/modals/PreferencesModal/StoragesTab.styl b/browser/main/modals/PreferencesModal/StoragesTab.styl
index 9a1a0ef8..b63cc85e 100644
--- a/browser/main/modals/PreferencesModal/StoragesTab.styl
+++ b/browser/main/modals/PreferencesModal/StoragesTab.styl
@@ -1,8 +1,4 @@
-@import('./Tab')
-
-.root
-  padding 15px
-  color $ui-text-color
+@import('./ConfigTab')
 
 .list
   margin-bottom 15px
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index c6181a13..316b7f9d 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -492,7 +492,7 @@ class UiTab extends React.Component {
                 ref='editorSnippetDefaultLanguage'
                 onChange={(e) => this.handleUIChange(e)}
               >
-                <option key='Auto Detect' value='Auto Detect'>Auto Detect</option>
+                <option key='Auto Detect' value='Auto Detect'>{i18n.__('Auto Detect')}</option>
                 {
                   _.sortBy(CodeMirror.modeInfo.map(mode => mode.name)).map(name => (<option key={name} value={name}>{name}</option>))
                 }
@@ -846,6 +846,7 @@ class UiTab extends React.Component {
                   onChange={e => this.handleUIChange(e)}
                   ref={e => (this.customCSSCM = e)}
                   value={config.preview.customCSS}
+                  defaultValue={'/* Drop Your Custom CSS Code Here */\n'}
                   options={{
                     lineNumbers: true,
                     mode: 'css',
diff --git a/browser/main/store.js b/browser/main/store.js
index 11ff2f3f..5edc115f 100644
--- a/browser/main/store.js
+++ b/browser/main/store.js
@@ -44,7 +44,9 @@ function data (state = defaultDataMap(), action) {
         const folderNoteSet = getOrInitItem(state.folderNoteMap, folderKey)
         folderNoteSet.add(uniqueKey)
 
-        assignToTags(note.tags, state, uniqueKey)
+        if (!note.isTrashed) {
+          assignToTags(note.tags, state, uniqueKey)
+        }
       })
       return state
     case 'UPDATE_NOTE':
diff --git a/gruntfile.js b/gruntfile.js
index ec3bbf79..207f8685 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -39,7 +39,7 @@ module.exports = function (grunt) {
           name: 'boostnote',
           productName: 'Boostnote',
           genericName: 'Boostnote',
-          productDescription: 'The opensource note app for developer.',
+          productDescription: 'The opensource note app for developers.',
           arch: 'amd64',
           categories: [
             'Development',
@@ -58,7 +58,7 @@ module.exports = function (grunt) {
           name: 'boostnote',
           productName: 'Boostnote',
           genericName: 'Boostnote',
-          productDescription: 'The opensource note app for developer.',
+          productDescription: 'The opensource note app for developers.',
           arch: 'x86_64',
           categories: [
             'Development',
@@ -149,6 +149,7 @@ module.exports = function (grunt) {
       case 'osx':
         Object.assign(opts, {
           platform: 'darwin',
+          darwinDarkModeSupport: true,
           icon: path.join(__dirname, 'resources/app.icns'),
           'app-category-type': 'public.app-category.developer-tools'
         })
diff --git a/lib/main-app.js b/lib/main-app.js
index 88e44294..6151c1f0 100644
--- a/lib/main-app.js
+++ b/lib/main-app.js
@@ -3,8 +3,9 @@ const app = electron.app
 const Menu = electron.Menu
 const ipc = electron.ipcMain
 const GhReleases = require('electron-gh-releases')
-const isDev = process.env.NODE_ENV !== 'production'
+const { isPackaged } = app
 // electron.crashReporter.start()
+
 var ipcServer = null
 
 var mainWindow = null
@@ -36,7 +37,7 @@ const updater = new GhReleases(ghReleasesOpts)
 // Check for updates
 // `status` returns true if there is a new update available
 function checkUpdate () {
-  if (isDev) { // Prevents app from attempting to update when in dev mode.
+  if (!isPackaged) { // Prevents app from attempting to update when in dev mode.
     console.log('Updates are disabled in Development mode, see main-app.js')
     return true
   }
@@ -99,12 +100,12 @@ app.on('ready', function () {
 
   // Check update every day
   setInterval(function () {
-    if (!isDev) checkUpdate()
+    if (isPackaged) checkUpdate()
   }, 1000 * 60 * 60 * 24)
 
   // Check update after 10 secs to prevent file locking of Windows
   setTimeout(() => {
-    if (!isDev) checkUpdate()
+    if (isPackaged) checkUpdate()
 
     ipc.on('update-check', function (event, msg) {
       if (isUpdateReady) {
diff --git a/lib/main-menu.js b/lib/main-menu.js
index dcd85217..f20f1e90 100644
--- a/lib/main-menu.js
+++ b/lib/main-menu.js
@@ -141,6 +141,13 @@ const file = {
             mainWindow.webContents.send('list:isMarkdownNote', 'export-html')
             mainWindow.webContents.send('export:save-html')
           }
+        },
+        {
+          label: 'PDF (.pdf)',
+          click () {
+            mainWindow.webContents.send('list:isMarkdownNote', 'export-pdf')
+            mainWindow.webContents.send('export:save-pdf')
+          }
         }
       ]
     },
diff --git a/lib/main.html b/lib/main.html
index a8d2761b..87a88e2d 100644
--- a/lib/main.html
+++ b/lib/main.html
@@ -134,7 +134,7 @@
     window._ = require('lodash')
   </script>
 
-  <script src="../node_modules/js-sequence-diagrams/fucknpm/sequence-diagram-min.js"></script>
+  <script src="../node_modules/@rokt33r/js-sequence-diagrams/dist/sequence-diagram-min.js"></script>
   <script src="../node_modules/react/dist/react.min.js"></script>
   <script src="../node_modules/react-dom/dist/react-dom.min.js"></script>
   <script src="../node_modules/redux/dist/redux.min.js"></script>
diff --git a/locales/da.json b/locales/da.json
index da5843f3..79503ab3 100644
--- a/locales/da.json
+++ b/locales/da.json
@@ -18,6 +18,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "Print",
 	"Your preferences for Boostnote": "Your preferences for Boostnote",
 	"Storage Locations": "Storage Locations",
@@ -75,7 +76,7 @@
 	"Website": "Website",
 	"Development": "Development",
 	" : Development configurations for Boostnote.": " : Development configurations for Boostnote.",
-	"Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Copyright (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "License: GPL v3",
 	"Analytics": "Analytics",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.",
@@ -153,5 +154,7 @@
 	"Allow dangerous html tags": "Allow dangerous html tags",
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
-	"Disabled": "Disabled"
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/de.json b/locales/de.json
index 1b90ab63..518a4e65 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -18,6 +18,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "Drucken",
 	"Your preferences for Boostnote": "Boostnote Einstellungen",
 	"Storage Locations": "Speicherverwaltung",
@@ -75,7 +76,7 @@
 	"Website": "Website",
 	"Development": "Entwicklung",
 	" : Development configurations for Boostnote.": " : Entwicklungseinstellungen für Boostnote.",
-	"Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Copyright (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "License: GPL v3",
 	"Analytics": "Analytics",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote sammelt anonyme Daten, um die App zu verbessern. Persönliche Informationen, wie z.B. der Inhalt deiner Notizen, werden dabei nicht erfasst.",
@@ -209,5 +210,7 @@
 	"No tags": "Keine Tags",
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
-	"Disabled": "Disabled"
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/en.json b/locales/en.json
index fe7931da..1e09bfc7 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -19,6 +19,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "Print",
 	"Your preferences for Boostnote": "Your preferences for Boostnote",
 	"Help": "Help",
@@ -82,7 +83,7 @@
 	"Website": "Website",
 	"Development": "Development",
 	" : Development configurations for Boostnote.": " : Development configurations for Boostnote.",
-	"Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Copyright (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "License: GPL v3",
 	"Analytics": "Analytics",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.",
@@ -136,7 +137,7 @@
 	"Hotkeys": "Hotkeys",
 	"Show/Hide Boostnote": "Show/Hide Boostnote",
 	"Toggle Editor Mode": "Toggle Editor Mode",
-  "Delete Note": "Delete Note",
+	"Delete Note": "Delete Note",
 	"Restore": "Restore",
 	"Permanent Delete": "Permanent Delete",
 	"Confirm note deletion": "Confirm note deletion",
@@ -179,10 +180,12 @@
 	"Allow dangerous html tags": "Allow dangerous html tags",
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
-	"Disabled": "Disabled",
+	"Spellcheck disabled": "Spellcheck disabled",
 	"Save tags of a note in alphabetical order": "Save tags of a note in alphabetical order",
 	"Enable live count of notes": "Enable live count of notes",
 	"Enable smart table editor": "Enable smart table editor",
 	"Snippet Default Language": "Snippet Default Language",
-  "New notes are tagged with the filtering tags": "New notes are tagged with the filtering tags"
+	"New notes are tagged with the filtering tags": "New notes are tagged with the filtering tags",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/es-ES.json b/locales/es-ES.json
index 8b2da1b7..a42e6bb4 100644
--- a/locales/es-ES.json
+++ b/locales/es-ES.json
@@ -18,6 +18,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "Imprimir",
 	"Your preferences for Boostnote": "Tus preferencias para Boostnote",
 	"Storage Locations": "Almacenamientos",
@@ -75,7 +76,7 @@
 	"Website": "Página web",
 	"Development": "Desarrollo",
 	" : Development configurations for Boostnote.": " : Configuraciones de desarrollo para Boostnote.",
-	"Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Copyright (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "Licencia: GPL v3",
 	"Analytics": "Analítica",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote recopila datos anónimos con el único propósito de mejorar la aplicación, y de ninguna manera recopila información personal como el contenido de sus notas.",
@@ -154,6 +155,8 @@
 	"Allow dangerous html tags": "Permitir etiquetas html peligrosas",
 	"⚠ You have pasted a link referring an attachment that could not be found in the location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ Ha pegado un enlace a un archivo adjunto que no se puede encontrar en el almacenamiento de esta nota. Pegar enlaces a archivos adjuntos solo está soportado si el origen y el destino son el mismo almacenamiento. ¡Por favor, mejor arrastre el archivo! ⚠",
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convertir flechas textuales a símbolos bonitos. ⚠ Esto interferirá cuando use comentarios HTML en Markdown.",
-  "Disabled": "Disabled",
-   "Snippet Default Language": "Lenguaje por defecto de los fragmentos de código"
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect",
+	"Snippet Default Language": "Lenguaje por defecto de los fragmentos de código"
 }
diff --git a/locales/fa.json b/locales/fa.json
index 18bef679..d29e0e75 100644
--- a/locales/fa.json
+++ b/locales/fa.json
@@ -1,161 +1,164 @@
 {
-    "Notes": "یادداشت ها",
-    "Tags": "تگ ها",
-    "Preferences": "تنظیمات",
-    "Make a note": "یک یادداشت بنویس",
-    "Ctrl": "Ctrl",
-    "Ctrl(^)": "Ctrl",
-    "to create a new note": "برای ساخت یک یادداشت",
-    "Toggle Mode": "تغییر حالت نمایش",
-    "Trash": "سطل آشغال",
-    "MODIFICATION DATE": "تاریخ تغییر",
-    "Words": "کلمات",
-    "Letters": "حروف",
-    "STORAGE": "ذخیره سازی",
-    "FOLDER": "پوشه",
-    "CREATION DATE": "تاریخ ایجاد",
-    "NOTE LINK": "لینک یادداشت",
-    ".md": ".md",
-    ".txt": ".txt",
-    ".html": ".html",
-    "Print": "پرینت",
-    "Your preferences for Boostnote": "تنظیمات شما برای boostnote",
-    "Storage Locations": "ذخیره سازی",
-    "Add Storage Location": "افزودن محل ذخیره سازی",
-    "Add Folder": "ساخت پوشه",
-    "Open Storage folder": "بازکردن پوشه ذخیره سازی",
-    "Unlink": "حذف لینک",
-    "Edit": "ویرایش",
-    "Delete": "حذف",
-    "Interface": "رابط کاربری",
-    "Interface Theme": "تم رابط کاربری",
-    "Default": "پیش فرض",
-    "White": "روشن",
-    "Solarized Dark": "سولارایز",
-    "Dark": "تاریک",
-    "Show a confirmation dialog when deleting notes": "هنگام حذف یادداشت ها یک پیام تایید نمایش بده.",
-    "Editor Theme": "تم ویرایشگر",
-    "Editor Font Size": "اندازه فونت ویرایشگر",
-    "Editor Font Family": "فونت ویرایشگر",
-    "Editor Indent Style": "حالت فاصله گذاری ویرایشگر",
-    "Spaces": "Spaces",
-    "Tabs": "Tabs",
-    "Switch to Preview": "دیدن پیش نمایش",
-    "When Editor Blurred": "وقتی ویرایشگر از حالت ویرایش خارج شد ",
-    "When Editor Blurred, Edit On Double Click": "وقتی ویرایشگر از حالت ویرایش خارج شد و با دبل کلیک ویرایش کنید.",
-    "On Right Click": "راست کلیک",
-    "Editor Keymap": "ویرایشگر Keymap",
-    "default": "پیش فرض",
-    "vim": "vim",
-    "emacs": "emacs",
-    "⚠️ Please restart boostnote after you change the keymap": "⚠️ برنامه را دوباره راه اندازی کنید keymap لطفا بعد از تغییر",
-    "Show line numbers in the editor": "شماره خطوط در ویرایشگر را نمایش بده.",
-    "Allow editor to scroll past the last line": "اجازه بده ویرایشگر بعد از آخرین خط اسکرول کند.",
-    "Bring in web page title when pasting URL on editor": "هنگامی که آدرس اینترنتی در ویرایشگر اضافه شد عنوان آنرا نمایش بده",
-    "Preview": "پیش نمایش",
-    "Preview Font Size": "اندازه فونتِ پیش نمایش",
-    "Preview Font Family": " فونتِ پیش نمایش",
-    "Code Block Theme": "تم بخش کد",
-    "Allow preview to scroll past the last line": "اجازه بده پیش نمایش بعد از آخرین خط اسکرول کند.",
-    "Show line numbers for preview code blocks": "شماره خطوط در پیش نمایش را نمایش بده.",
-    "LaTeX Inline Open Delimiter": "جداکننده آغازین لاتکس خطی",
-    "LaTeX Inline Close Delimiter": "جداکننده پایانی لاتکس خطی",
-    "LaTeX Block Open Delimiter": "جداکننده آغازین بلوک لاتکس ",
-    "LaTeX Block Close Delimiter": "جداکننده آغازین بلوک لاتکس ",
-    "PlantUML Server": "PlantUML Server",
-    "Community": "کامینیتی",
-    "Subscribe to Newsletter": "اشتراک در خبرنامه",
-    "GitHub": "گیت هاب",
-    "Blog": "بلاگ",
-    "Facebook Group": "گروه فیسبوک",
-    "Twitter": "توییتر",
-    "About": "درباره",
-    "Boostnote": "Boostnote",
-    "An open source note-taking app made for programmers just like you.": "یک دفترچه یادداشت متن باز ساخته شده برای برنامه نویسانی مثل تو.",
-    "Website": "وبسایت",
-    "Development": "توسعه",
-    " : Development configurations for Boostnote.": " : پیکربندی توسعه برای Boostnote.",
-    "Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
-    "License: GPL v3": "لایسنس: GPL v3",
-    "Analytics": "تجزیه و تحلیل",
-    "Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Bosstnote اطلاعات ناشناس را برای بهبود عملکرد برنامه جمع آوری می‌کند.اطلاعات شخصی شما مثل محتوای یادداشت ها هرگز برای هیچ هدفی جمع آوری نمی‌شوند",
-    "You can see how it works on ": "میتوانید ببینید چگونه کار میکند. ",
-    "You can choose to enable or disable this option.": "میتوانید این گزینه را فعال یا غیرفعال کنید.",
-    "Enable analytics to help improve Boostnote":".تجزیه تحلیل داده ها را برای کمک به بهبود برنامه فعال کن",
-    "Crowdfunding": "جمع سپاری (سرمایه گذاری جمعی )",
-    "Dear Boostnote users,": "عزیزان,",
-    "Thank you for using Boostnote!": "از شما بخاطر استفاده از boostnote ممنونیم!",
-    "Boostnote is used in about 200 different countries and regions by an awesome community of developers.": "در ۲۰۰ کشور مختلف دنیا مورد توسط جمعی از برنامه نویسان بی نظیر مورد استفاده قرار میگیرد.  Boostnote",
-    "To support our growing userbase, and satisfy community expectations,": "برای حمایت از این رشد ، و برآورده شدن انتظارات کامینیتی,",
-    "we would like to invest more time and resources in this project.": "ما می خواهیم زمان و منابع بیشتری را در این پروژه سرمایه گذاری کنیم.",
-    "If you use Boostnote and see its potential, help us out by supporting the project on OpenCollective!": "اگر این پروژه را دوست دارید و پتانسیلی در آن می‌بینید، میتوانید مارا در اوپن‌ کالکتیو حمایت کنید.",
-    "Thanks,": "با تشکر,",
-    "The Boostnote Team": "Boostnote نگهدارندگان",
-    "Support via OpenCollective": "حمایت کنید OpenCollective از طریق",
-    "Language": "زبان",
-    "English": "انگلیسی",
-    "German": "آلمانی",
-    "French": "فرانسوی",
-    "Show \"Saved to Clipboard\" notification when copying": "نمایش \"ذخیره در کلیپ‌بورد\" اطلاع رسانی هنگام کپی کردن",
-    "All Notes": "همه یادداشت ها",
-    "Starred": "ستاره دار",
-    "Are you sure to ": " مطمئن هستید که",
-    " delete": "حذف ",
-    "this folder?": "این پوشه ؟",
-    "Confirm": "تایید",
-    "Cancel": "انصراف",
-    "Markdown Note": "Markdown یادداشتِ",
-    "This format is for creating text documents. Checklists, code blocks and Latex blocks are available.": "این قالب برای ساخت سند های متنی است. چک لیست ها و تکه کد ها و بلاک های لاتکس قابل استفاده اند.",
-    "Snippet Note": "Snippet یادداشتِ",
-    "This format is for creating code snippets. Multiple snippets can be grouped into a single note.": "این قالب برای ساخت تکه کد هاست. چند تکه کد میتوانند تبدیل به یک یادداشت شوند.",
-    "Tab to switch format": "را بزنید Tab برای تغییر فرمت",
-    "Updated": "بروزرسانی شد",
-    "Created": "ایجاد شد",
-    "Alphabetically": "بر اساس حروف الفبا",
-    "Counter": "شمارشگر",
-    "Default View": "نمایش پیش‌فرض",
-    "Compressed View": "نمایش فشرده",
-    "Search": "جستجو",
-    "Blog Type": "نوع وبلاگ",
-    "Blog Address": "آدرس وبلاگ",
-    "Save": "ذخیره",
-    "Auth": "هویت",
-    "Authentication Method": "متد احراز هویت",
-    "JWT": "JWT",
-    "USER": "کاربر",
-    "Token": "توکن",
-    "Storage": "ذخیره سازی",
-    "Hotkeys": "کلید های میانبر",
-    "Show/Hide Boostnote": "Boostnote نمایش/پنهان کردن",
-    "Restore": "بازگرداندن به حالت اول",
-    "Permanent Delete": "حذف بدون بازگشت",
-    "Confirm note deletion": ".حذف یادداشت را تایید کنید",
-    "This will permanently remove this note.": ".این کار یادداشت را بطور دائمی حذف خواهد کرد",
-    "Successfully applied!": "!با موفقیت اجرا شد",
-    "Albanian": "آلبانی",
-    "Chinese (zh-CN)": "چینی (zh-CN)",
-    "Chinese (zh-TW)": "چینی (zh-TW)",
-    "Danish": "دانمارکی",
-    "Japanese": "ژاپنی",
-    "Korean": "کره ای",
-    "Norwegian": "نروژی",
-    "Polish": "لهستانی",
-    "Portuguese": "پرتغالی",
-    "Spanish": "اسپانیایی",
-    "Unsaved Changes!": "!باید ذخیره کنید",
-    "UserName": "نام کاربری",
-    "Password": "رمز عبور",
-    "Russian": "روسی",
-    "Thai": "Thai (ภาษาไทย)",
-    "Command(⌘)": "Command(⌘)",
-    "Editor Rulers": "Editor Rulers",
-    "Enable": "فعال",
-    "Disable": "غیرفعال",
-    "Sanitization": "پاکسازی کردن",
-    "Only allow secure html tags (recommended)": "(فقط  تگ های امن اچ تی ام ال مجاز اند.(پیشنهاد میشود",
-    "Allow styles": "حالت های مجاز",
-    "Allow dangerous html tags": "تگ های خطرناک اچ‌ تی ام ال مجاز اند",
-    "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.",
-    "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
-    "Disabled": "Disabled"
+	"Notes": "یادداشت ها",
+	"Tags": "تگ ها",
+	"Preferences": "تنظیمات",
+	"Make a note": "یک یادداشت بنویس",
+	"Ctrl": "Ctrl",
+	"Ctrl(^)": "Ctrl",
+	"to create a new note": "برای ساخت یک یادداشت",
+	"Toggle Mode": "تغییر حالت نمایش",
+	"Trash": "سطل آشغال",
+	"MODIFICATION DATE": "تاریخ تغییر",
+	"Words": "کلمات",
+	"Letters": "حروف",
+	"STORAGE": "ذخیره سازی",
+	"FOLDER": "پوشه",
+	"CREATION DATE": "تاریخ ایجاد",
+	"NOTE LINK": "لینک یادداشت",
+	".md": ".md",
+	".txt": ".txt",
+	".html": ".html",
+	".pdf": ".pdf",
+	"Print": "پرینت",
+	"Your preferences for Boostnote": "تنظیمات شما برای boostnote",
+	"Storage Locations": "ذخیره سازی",
+	"Add Storage Location": "افزودن محل ذخیره سازی",
+	"Add Folder": "ساخت پوشه",
+	"Open Storage folder": "بازکردن پوشه ذخیره سازی",
+	"Unlink": "حذف لینک",
+	"Edit": "ویرایش",
+	"Delete": "حذف",
+	"Interface": "رابط کاربری",
+	"Interface Theme": "تم رابط کاربری",
+	"Default": "پیش فرض",
+	"White": "روشن",
+	"Solarized Dark": "سولارایز",
+	"Dark": "تاریک",
+	"Show a confirmation dialog when deleting notes": "هنگام حذف یادداشت ها یک پیام تایید نمایش بده.",
+	"Editor Theme": "تم ویرایشگر",
+	"Editor Font Size": "اندازه فونت ویرایشگر",
+	"Editor Font Family": "فونت ویرایشگر",
+	"Editor Indent Style": "حالت فاصله گذاری ویرایشگر",
+	"Spaces": "Spaces",
+	"Tabs": "Tabs",
+	"Switch to Preview": "دیدن پیش نمایش",
+	"When Editor Blurred": "وقتی ویرایشگر از حالت ویرایش خارج شد ",
+	"When Editor Blurred, Edit On Double Click": "وقتی ویرایشگر از حالت ویرایش خارج شد و با دبل کلیک ویرایش کنید.",
+	"On Right Click": "راست کلیک",
+	"Editor Keymap": "ویرایشگر Keymap",
+	"default": "پیش فرض",
+	"vim": "vim",
+	"emacs": "emacs",
+	"⚠️ Please restart boostnote after you change the keymap": "⚠️ برنامه را دوباره راه اندازی کنید keymap لطفا بعد از تغییر",
+	"Show line numbers in the editor": "شماره خطوط در ویرایشگر را نمایش بده.",
+	"Allow editor to scroll past the last line": "اجازه بده ویرایشگر بعد از آخرین خط اسکرول کند.",
+	"Bring in web page title when pasting URL on editor": "هنگامی که آدرس اینترنتی در ویرایشگر اضافه شد عنوان آنرا نمایش بده",
+	"Preview": "پیش نمایش",
+	"Preview Font Size": "اندازه فونتِ پیش نمایش",
+	"Preview Font Family": " فونتِ پیش نمایش",
+	"Code Block Theme": "تم بخش کد",
+	"Allow preview to scroll past the last line": "اجازه بده پیش نمایش بعد از آخرین خط اسکرول کند.",
+	"Show line numbers for preview code blocks": "شماره خطوط در پیش نمایش را نمایش بده.",
+	"LaTeX Inline Open Delimiter": "جداکننده آغازین لاتکس خطی",
+	"LaTeX Inline Close Delimiter": "جداکننده پایانی لاتکس خطی",
+	"LaTeX Block Open Delimiter": "جداکننده آغازین بلوک لاتکس ",
+	"LaTeX Block Close Delimiter": "جداکننده آغازین بلوک لاتکس ",
+	"PlantUML Server": "PlantUML Server",
+	"Community": "کامینیتی",
+	"Subscribe to Newsletter": "اشتراک در خبرنامه",
+	"GitHub": "گیت هاب",
+	"Blog": "بلاگ",
+	"Facebook Group": "گروه فیسبوک",
+	"Twitter": "توییتر",
+	"About": "درباره",
+	"Boostnote": "Boostnote",
+	"An open source note-taking app made for programmers just like you.": "یک دفترچه یادداشت متن باز ساخته شده برای برنامه نویسانی مثل تو.",
+	"Website": "وبسایت",
+	"Development": "توسعه",
+	" : Development configurations for Boostnote.": " : پیکربندی توسعه برای Boostnote.",
+	"Copyright (C) 2017 - 2019 BoostIO": "Copyright (C) 2017 - 2019 BoostIO",
+	"License: GPL v3": "لایسنس: GPL v3",
+	"Analytics": "تجزیه و تحلیل",
+	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Bosstnote اطلاعات ناشناس را برای بهبود عملکرد برنامه جمع آوری می‌کند.اطلاعات شخصی شما مثل محتوای یادداشت ها هرگز برای هیچ هدفی جمع آوری نمی‌شوند",
+	"You can see how it works on ": "میتوانید ببینید چگونه کار میکند. ",
+	"You can choose to enable or disable this option.": "میتوانید این گزینه را فعال یا غیرفعال کنید.",
+	"Enable analytics to help improve Boostnote":".تجزیه تحلیل داده ها را برای کمک به بهبود برنامه فعال کن",
+	"Crowdfunding": "جمع سپاری (سرمایه گذاری جمعی )",
+	"Dear Boostnote users,": "عزیزان,",
+	"Thank you for using Boostnote!": "از شما بخاطر استفاده از boostnote ممنونیم!",
+	"Boostnote is used in about 200 different countries and regions by an awesome community of developers.": "در ۲۰۰ کشور مختلف دنیا مورد توسط جمعی از برنامه نویسان بی نظیر مورد استفاده قرار میگیرد.  Boostnote",
+	"To support our growing userbase, and satisfy community expectations,": "برای حمایت از این رشد ، و برآورده شدن انتظارات کامینیتی,",
+	"we would like to invest more time and resources in this project.": "ما می خواهیم زمان و منابع بیشتری را در این پروژه سرمایه گذاری کنیم.",
+	"If you use Boostnote and see its potential, help us out by supporting the project on OpenCollective!": "اگر این پروژه را دوست دارید و پتانسیلی در آن می‌بینید، میتوانید مارا در اوپن‌ کالکتیو حمایت کنید.",
+	"Thanks,": "با تشکر,",
+	"The Boostnote Team": "Boostnote نگهدارندگان",
+	"Support via OpenCollective": "حمایت کنید OpenCollective از طریق",
+	"Language": "زبان",
+	"English": "انگلیسی",
+	"German": "آلمانی",
+	"French": "فرانسوی",
+	"Show \"Saved to Clipboard\" notification when copying": "نمایش \"ذخیره در کلیپ‌بورد\" اطلاع رسانی هنگام کپی کردن",
+	"All Notes": "همه یادداشت ها",
+	"Starred": "ستاره دار",
+	"Are you sure to ": " مطمئن هستید که",
+	" delete": "حذف ",
+	"this folder?": "این پوشه ؟",
+	"Confirm": "تایید",
+	"Cancel": "انصراف",
+	"Markdown Note": "Markdown یادداشتِ",
+	"This format is for creating text documents. Checklists, code blocks and Latex blocks are available.": "این قالب برای ساخت سند های متنی است. چک لیست ها و تکه کد ها و بلاک های لاتکس قابل استفاده اند.",
+	"Snippet Note": "Snippet یادداشتِ",
+	"This format is for creating code snippets. Multiple snippets can be grouped into a single note.": "این قالب برای ساخت تکه کد هاست. چند تکه کد میتوانند تبدیل به یک یادداشت شوند.",
+	"Tab to switch format": "را بزنید Tab برای تغییر فرمت",
+	"Updated": "بروزرسانی شد",
+	"Created": "ایجاد شد",
+	"Alphabetically": "بر اساس حروف الفبا",
+	"Counter": "شمارشگر",
+	"Default View": "نمایش پیش‌فرض",
+	"Compressed View": "نمایش فشرده",
+	"Search": "جستجو",
+	"Blog Type": "نوع وبلاگ",
+	"Blog Address": "آدرس وبلاگ",
+	"Save": "ذخیره",
+	"Auth": "هویت",
+	"Authentication Method": "متد احراز هویت",
+	"JWT": "JWT",
+	"USER": "کاربر",
+	"Token": "توکن",
+	"Storage": "ذخیره سازی",
+	"Hotkeys": "کلید های میانبر",
+	"Show/Hide Boostnote": "Boostnote نمایش/پنهان کردن",
+	"Restore": "بازگرداندن به حالت اول",
+	"Permanent Delete": "حذف بدون بازگشت",
+	"Confirm note deletion": ".حذف یادداشت را تایید کنید",
+	"This will permanently remove this note.": ".این کار یادداشت را بطور دائمی حذف خواهد کرد",
+	"Successfully applied!": "!با موفقیت اجرا شد",
+	"Albanian": "آلبانی",
+	"Chinese (zh-CN)": "چینی (zh-CN)",
+	"Chinese (zh-TW)": "چینی (zh-TW)",
+	"Danish": "دانمارکی",
+	"Japanese": "ژاپنی",
+	"Korean": "کره ای",
+	"Norwegian": "نروژی",
+	"Polish": "لهستانی",
+	"Portuguese": "پرتغالی",
+	"Spanish": "اسپانیایی",
+	"Unsaved Changes!": "!باید ذخیره کنید",
+	"UserName": "نام کاربری",
+	"Password": "رمز عبور",
+	"Russian": "روسی",
+	"Thai": "Thai (ภาษาไทย)",
+	"Command(⌘)": "Command(⌘)",
+	"Editor Rulers": "Editor Rulers",
+	"Enable": "فعال",
+	"Disable": "غیرفعال",
+	"Sanitization": "پاکسازی کردن",
+	"Only allow secure html tags (recommended)": "(فقط  تگ های امن اچ تی ام ال مجاز اند.(پیشنهاد میشود",
+	"Allow styles": "حالت های مجاز",
+	"Allow dangerous html tags": "تگ های خطرناک اچ‌ تی ام ال مجاز اند",
+	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.",
+	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/fr.json b/locales/fr.json
index ea5a1c05..c44b057e 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -18,6 +18,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "Imprimer",
 	"Your preferences for Boostnote": "Vos préférences pour Boostnote",
 	"Storage Locations": "Stockages",
@@ -76,7 +77,7 @@
 	"Website": "Site web",
 	"Development": "Développement",
 	" : Development configurations for Boostnote.": " : Configurations de développement pour Boostnote.",
-	"Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Copyright (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "License: GPL v3",
 	"Analytics": "Analytics",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote collecte des données anonymisées dans le seul but d'améliorer l'application, et ne collecte aucune donnée personnelle telle que le contenu de vos notes.",
@@ -163,11 +164,13 @@
 	"Enable live count of notes": "Activer le comptage live des notes",
 	"Enable smart table editor": "Activer l'intelligent éditeur de tableaux",
 	"Snippet Default Language": "Langage par défaut d'un snippet",
-  "Disabled": "Disabled",
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect",
 	"New Snippet": "Nouveau snippet",
 	"Custom CSS": "CSS personnalisé",
 	"Snippet name": "Nom du snippet",
 	"Snippet prefix": "Préfixe du snippet",
-  "Delete Note": "Supprimer la note",
-  "New notes are tagged with the filtering tags": "Les nouvelles notes sont taggées avec les tags de filtrage"
+	"Delete Note": "Supprimer la note",
+	"New notes are tagged with the filtering tags": "Les nouvelles notes sont taggées avec les tags de filtrage"
 }
diff --git a/locales/hu.json b/locales/hu.json
index 77bdb2ab..558770b9 100644
--- a/locales/hu.json
+++ b/locales/hu.json
@@ -19,6 +19,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "Nyomtatás",
 	"Your preferences for Boostnote": "Boostnote beállításaid",
 	"Help": "Súgó",
@@ -26,7 +27,6 @@
 	"Storage Locations": "Tárolók",
 	"Add Storage Location": "Tároló Hozzáadása",
 	"Add Folder": "Könyvtár Hozzáadása",
-	"Select Folder": "Könyvtár Kiválasztása",
 	"Open Storage folder": "Tároló Megnyitása",
 	"Unlink": "Tároló Leválasztása",
 	"Edit": "Szerkesztés",
@@ -82,7 +82,7 @@
 	"Website": "Weboldal",
 	"Development": "Fejlesztés",
 	" : Development configurations for Boostnote.": " : Információk a Boostnote fejlesztéséről.",
-	"Copyright (C) 2017 - 2018 BoostIO": "Szerzői jog (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Szerzői jog (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "Licensz: GPL v3",
 	"Analytics": "Adatok elemzése",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "A Boostnote névtelen adatokat gyűjt össze az alkalmazás tökéletesítése céljából, és szigorúan nem gyűjt semmilyen személyes adatot, például a jegyzetek tartalmát.",
@@ -178,5 +178,7 @@
 	"Allow dangerous html tags": "Veszélyes html tag-ek engedélyezése",
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
-	"Disabled": "Disabled"
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/it.json b/locales/it.json
index 05f454f3..3b070197 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -18,6 +18,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "Stampa",
 	"Your preferences for Boostnote": "Le tue preferenze per Boostnote",
 	"Storage Locations": "Posizioni",
@@ -75,7 +76,7 @@
 	"Website": "Sito Web",
 	"Development": "Sviluppo",
 	" : Development configurations for Boostnote.": " : Configurazioni di sviluppo per Boostnote.",
-	"Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Copyright (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "Licenza: GPL v3",
 	"Analytics": "Statistiche",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote raccoglie dati anonimi al solo scopo di migliorare l'applicazione, e non raccoglie nessuna informazione personale rigurado il contenuto delle note.",
@@ -157,5 +158,7 @@
 	"Allow dangerous html tags": "Consenti tag HTML pericolosi",
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
-	"Disabled": "Disabled"
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/ja.json b/locales/ja.json
index e7295360..087bce36 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -8,10 +8,10 @@
 	"to create a new note": "ノートを新規に作成",
 	"Toggle Mode": "モード切替",
 	"Add tag...": "タグを追加...",
-  "Star": "お気に入り",
-  "Fullscreen": "全画面",
+	"Star": "お気に入り",
+	"Fullscreen": "全画面",
 	"Trash": "ゴミ箱",
-  "Info": "情報",
+	"Info": "情報",
 	"MODIFICATION DATE": "修正日",
 	"Words": "ワード",
 	"Letters": "文字",
@@ -22,6 +22,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "印刷",
 	"Your preferences for Boostnote": "Boostnoteの個人設定",
 	"Help": "ヘルプ",
@@ -46,7 +47,7 @@
 	"Default New Note": "新規ノートの形式",
 	"Always Ask": "作成時に聞く",
 	"Show a confirmation dialog when deleting notes": "ノートを削除する時に確認ダイアログを表示する",
-	"Disable Direct Write (It will be applied after restarting)": "Disable Direct Write (It will be applied after restarting)",
+	"Disable Direct Write (It will be applied after restarting)": "直接編集を無効にする（設定反映には再起動が必要です）",
 	"Save tags of a note in alphabetical order": "ノートのタグをアルファベット順に保存する",
 	"Show tags of a note in alphabetical order": "ノートのタグをアルファベット順に表示する",
 	"Show only related tags": "関連するタグのみ表示する",
@@ -105,7 +106,7 @@
 	"Website": "ウェブサイト",
 	"Development": "開発",
 	" : Development configurations for Boostnote.": " : Boostnote の開発構成",
-	"Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Copyright (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "ライセンス: GPL v3",
 	"Analytics": "解析",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote はアプリケーションの機能向上だけを目的に匿名データを収集します。ノートの内容を含めた個人の情報は一切収集しません。",
@@ -199,7 +200,7 @@
 	"Type": "種類",
 	"File System": "ファイルシステム",
 	"Setting up 3rd-party cloud storage integration:": "サードパーティのクラウドストレージとの統合を設定する:",
-	"Cloud-Syncing-and-Backup": "Cloud-Syncing-and-Backup",
+	"Cloud-Syncing-and-Backup": "クラウド同期とバックアップ",
 	"Location": "ロケーション",
 	"Add": "追加",
 	"Export Storage": "ストレージの書き出し",
@@ -215,5 +216,7 @@
 	"Allow dangerous html tags": "安全でないHTMLタグの利用を許可する",
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "テキストの矢印を綺麗な記号に変換する ⚠ この設定はMarkdown内でのHTMLコメントに干渉します。",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ このノートのストレージに存在しない添付ファイルへのリンクを貼り付けました。添付ファイルへのリンクの貼り付けは同一ストレージ内でのみサポートされています。代わりに添付ファイルをドラッグアンドドロップしてください！ ⚠",
-	"Disabled": "Disabled"
+	"Spellcheck disabled": "スペルチェック無効",
+	"Show menu bar": "メニューバーを表示",
+	"Auto Detect": "自動検出"
 }
diff --git a/locales/ko.json b/locales/ko.json
index 9a8bf8c7..3dbb1ada 100644
--- a/locales/ko.json
+++ b/locales/ko.json
@@ -18,6 +18,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "인쇄",
 	"Your preferences for Boostnote": "Boostnote 설정",
 	"Storage Locations": "저장소",
@@ -75,7 +76,7 @@
 	"Website": "웹사이트",
 	"Development": "개발",
 	" : Development configurations for Boostnote.": " : Boostnote 개발을 위한 설정들.",
-	"Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Copyright (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "License: GPL v3",
 	"Analytics": "사용 통계/분석",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote는 서비스개선을 위해 익명으로 데이터를 수집하며 노트의 내용과같은 일체의 개인정보는 수집하지 않습니다.",
@@ -160,5 +161,7 @@
 	"Allow dangerous html tags": "모든 위험한 태그 허용",
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
-	"Disabled": "Disabled"
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/no.json b/locales/no.json
index 2d6c92f5..ff858153 100644
--- a/locales/no.json
+++ b/locales/no.json
@@ -18,6 +18,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "Print",
 	"Your preferences for Boostnote": "Your preferences for Boostnote",
 	"Storage Locations": "Storage Locations",
@@ -75,7 +76,7 @@
 	"Website": "Website",
 	"Development": "Development",
 	" : Development configurations for Boostnote.": " : Development configurations for Boostnote.",
-	"Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Copyright (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "License: GPL v3",
 	"Analytics": "Analytics",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.",
@@ -153,5 +154,7 @@
 	"Allow dangerous html tags": "Allow dangerous html tags",
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
-	"Disabled": "Disabled"
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/pl.json b/locales/pl.json
index 68719aef..ffdc14be 100644
--- a/locales/pl.json
+++ b/locales/pl.json
@@ -14,13 +14,14 @@
 	"STORAGE": "MIEJSCE ZAPISU",
 	"FOLDER": "FOLDER",
 	"CREATION DATE": "DATA UTWORZENIA",
-  "NOTE LINK": "LINK NOTATKI",
-  "Toggle Editor Mode": "Przełączanie trybu edytora",
+	"NOTE LINK": "LINK NOTATKI",
+	"Toggle Editor Mode": "Przełączanie trybu edytora",
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
-  "Print": "Drukuj",
-  "Help": "Pomoc",
+	".pdf": ".pdf",
+	"Print": "Drukuj",
+	"Help": "Pomoc",
 	"Your preferences for Boostnote": "Twoje ustawienia dla Boostnote",
 	"Storage Locations": "Storage Locations",
 	"Add Storage Location": "Dodaj miejsce zapisu",
@@ -35,12 +36,12 @@
 	"White": "Biały",
 	"Solarized Dark": "Solarized Dark",
 	"Dark": "Ciemny",
-  "Show a confirmation dialog when deleting notes": "Zatwierdzaj usunięcie notatek",
-  "Show only related tags": "Pokazuj tylko powiązane tagi",
+	"Show a confirmation dialog when deleting notes": "Zatwierdzaj usunięcie notatek",
+	"Show only related tags": "Pokazuj tylko powiązane tagi",
 	"Editor Theme": "Wygląd edytora",
 	"Editor Font Size": "Rozmiar czcionki",
-  "Editor Font Family": "Czcionka",
-  "Snippet Default Language": "Domyślny język snippetów kodu",
+	"Editor Font Family": "Czcionka",
+	"Snippet Default Language": "Domyślny język snippetów kodu",
 	"Editor Indent Style": "Rodzaj wcięć",
 	"Spaces": "Spacje",
 	"Tabs": "Tabulatory",
@@ -57,9 +58,9 @@
 	"Allow editor to scroll past the last line": "Pozwalaj edytorowi na przewijanie poza końcową linię",
 	"Bring in web page title when pasting URL on editor": "Wprowadź tytuł wklejanej strony WWW do edytora",
 	"Preview": "Podgląd",
-  "Preview Font Size": "Rozmiar czcionki",
-  "Enable smart quotes": "Włącz inteligentne cytowanie",
-  "Render newlines in Markdown paragraphs as <br>": "Dodawaj nowe linie w notatce jako znacznik <br>",
+	"Preview Font Size": "Rozmiar czcionki",
+	"Enable smart quotes": "Włącz inteligentne cytowanie",
+	"Render newlines in Markdown paragraphs as <br>": "Dodawaj nowe linie w notatce jako znacznik <br>",
 	"Preview Font Family": "Czcionka",
 	"Code Block Theme": "Styl bloku kodu",
 	"Allow preview to scroll past the last line": "Pozwalaj podglądowi na przewijanie poza końcową linię",
@@ -81,7 +82,7 @@
 	"Website": "Strona WWW",
 	"Development": "Development",
 	" : Development configurations for Boostnote.": " : Development configurations for Boostnote.",
-	"Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Copyright (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "Licencja: GPL v3",
 	"Analytics": "Statystyki",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote zbiera anonimowe dane wyłącznie w celu poprawy działania aplikacji, lecz nigdy nie pobiera prywatnych danych z Twoich notatek.",
@@ -159,8 +160,10 @@
 	"Allow dangerous html tags": "Zezwól na niebezpieczne tagi HTML",
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Konwertuje tekstowe strzałki na znaki. ⚠ Wpłynie to na używanie komentarzy HTML w Twojej notatce.",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ Wkleiłes link odnoszący się do załącznika, ktory nie może zostać znaleziony. Wklejanie linków do załączników jest możliwe tylko gdy notatka i załącznik są w tym samym folderze. Używaj opcji 'Przeciągaj i upuść' załącznik! ⚠",
-  "Star": "Oznacz",
-  "Fullscreen": "Pełen ekran",
-  "Add tag...": "Dodaj tag...",
-  "Disabled": "Disabled"
+	"Star": "Oznacz",
+	"Fullscreen": "Pełen ekran",
+	"Add tag...": "Dodaj tag...",
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/pt-BR.json b/locales/pt-BR.json
index 273466eb..ada02453 100644
--- a/locales/pt-BR.json
+++ b/locales/pt-BR.json
@@ -18,6 +18,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "Imprimir",
 	"Your preferences for Boostnote": "Suas preferências para o Boostnote",
 	"Storage Locations": "Armazenamentos",
@@ -75,7 +76,7 @@
 	"Website": "Website",
 	"Development": "Desenvolvimento",
 	" : Development configurations for Boostnote.": " : Configurações de desenvolvimento para o Boostnote.",
-	"Copyright (C) 2017 - 2018 BoostIO": "Direitos Autorais (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Direitos Autorais (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "Licença: GPL v3",
 	"Analytics": "Técnicas analíticas",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "O Boostnote coleta dados anônimos com o único propósito de melhorar o aplicativo e de modo algum coleta qualquer informação pessoal, bem como o conteúdo de suas anotações.",
@@ -153,5 +154,7 @@
 	"Allow dangerous html tags": "Permitir tags html perigosas",
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
-	"Disabled": "Disabled"
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/pt-PT.json b/locales/pt-PT.json
index 774919a2..159c2255 100644
--- a/locales/pt-PT.json
+++ b/locales/pt-PT.json
@@ -18,6 +18,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "Imprimir",
 	"Your preferences for Boostnote": "As tuas definiçōes para Boostnote",
 	"Storage Locations": "Locais de Armazenamento",
@@ -75,7 +76,7 @@
 	"Website": "Website",
 	"Development": "Desenvolvimento",
 	" : Development configurations for Boostnote.": " : Configurações de desenvolvimento para o Boostnote.",
-	"Copyright (C) 2017 - 2018 BoostIO": "Direitos de Autor (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Direitos de Autor (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "Licença: GPL v3",
 	"Analytics": "Analíse de Data",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "O Boostnote coleta dados anônimos com o único propósito de melhorar a aplicação e não adquire informação pessoal ou conteúdo das tuas notas.",
@@ -130,7 +131,7 @@
 	"Permanent Delete": "Apagar Permanentemente",
 	"Confirm note deletion": "Confirmar o apagamento da nota",
 	"This will permanently remove this note.": "Isto irá remover permanentemente esta nota.",
-  "Successfully applied!": "Aplicado com Sucesso!",
+	"Successfully applied!": "Aplicado com Sucesso!",
 	"Albanian": "Albanês",
 	"Chinese (zh-CN)": "Chinês (zh-CN)",
 	"Chinese (zh-TW)": "Chinês (zh-TW)",
@@ -152,5 +153,7 @@
 	"Allow dangerous html tags": "Permitir tags html perigosas",
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Converter setas de texto em simbolos. ⚠  Isto irá interferir no use de comentários em HTML em Markdown.",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ Você colou um link referente a um anexo que não pôde ser encontrado no local de armazenamento desta nota. A vinculação de anexos de referência de links só é suportada se o local de origem e de destino for o mesmo de armazenamento. Por favor, arraste e solte o anexo na nota! ⚠",
-  "Disabled": "Disabled"
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/ru.json b/locales/ru.json
index 793e1511..70d140ce 100644
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -18,6 +18,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "Print",
 	"Your preferences for Boostnote": "Настройки Boostnote",
 	"Storage Locations": "Хранилища",
@@ -74,7 +75,7 @@
 	"Website": "Сайт",
 	"Development": "Разработка",
 	" : Development configurations for Boostnote.": " : Разработческие конфигурации для Boostnote.",
-	"Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Copyright (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "License: GPL v3",
 	"Analytics": "Аналитика",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote собирает анонимные данные о пользовании приложением для того, чтобы улучшать пользовательский опыт. Мы не собираем личную информацию и содержание ваших записей.",
@@ -150,5 +151,7 @@
 	"Disable": "Disable",
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
-	"Disabled": "Disabled"
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/sq.json b/locales/sq.json
index e4cc01ac..33d8ec97 100644
--- a/locales/sq.json
+++ b/locales/sq.json
@@ -18,6 +18,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "Print",
 	"Your preferences for Boostnote": "Your preferences for Boostnote",
 	"Storage Locations": "Storage Locations",
@@ -74,7 +75,7 @@
 	"Website": "Website",
 	"Development": "Development",
 	" : Development configurations for Boostnote.": " : Development configurations for Boostnote.",
-	"Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Copyright (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "License: GPL v3",
 	"Analytics": "Analytics",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.",
@@ -152,5 +153,7 @@
 	"Allow dangerous html tags": "Allow dangerous html tags",
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
-	"Disabled": "Disabled"
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/th.json b/locales/th.json
index 49d8e7cd..ade52990 100644
--- a/locales/th.json
+++ b/locales/th.json
@@ -19,6 +19,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "พิมพ์",
 	"Your preferences for Boostnote": "การตั้งค่าของคุณสำหรับ Boostnote",
 	"Help": "ช่วยเหลือ",
@@ -82,7 +83,7 @@
 	"Website": "เว็บไซต์",
 	"Development": "การพัฒนา",
 	" : Development configurations for Boostnote.": " : การตั้งค่าต่างๆสำหรับการพัฒนา Boostnote.",
-	"Copyright (C) 2017 - 2018 BoostIO": "สงวนลิขสิทธิ์ (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "สงวนลิขสิทธิ์ (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "License: GPL v3",
 	"Analytics": "การวิเคราะห์",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote จะเก็บข้อมูลแบบไม่ระบุตัวตนเพื่อนำไปใช้ในการปรับปรุงแอพพลิเคชันเท่านั้น, และจะไม่มีการเก็บข้อมูลส่วนตัวใดๆของคุณ เช่น ข้อมูลในโน๊ตของคุณอย่างเด็ดขาด.",
@@ -178,5 +179,8 @@
 	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "แปลงลูกศรจากรูปแบบข้อความให้เป็นสัญลักษณ์. ⚠ สิ่งนี้จะเป็นการแทรกโดยใช้ HTML comment ลงไปใน Markdown ที่คุณเขียน.",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ ไม่พบไฟล์แนบในโน๊ตนี้ จากลิงค์ที่คุณได้วาง. คุณสามารถวางลิงค์ที่อ้างอิงไปยังไฟล์แนบ เฉพาะกรณีที่ต้นทาง และปลายทางที่อ้างถึงนั้นอยู่ใน 'แหล่งจัดเก็บ เดียวกัน. กรุณาใช้การลากและวางเพื่อใส่ไฟล์แนบแทน! ⚠",
 	"Enable smart table editor": "เปิดการใช้ Smart table editor",
-	"Snippet Default Language": "ทำการ Snippet ภาษาที่เป็นค่าเริ่มต้น"
+	"Snippet Default Language": "ทำการ Snippet ภาษาที่เป็นค่าเริ่มต้น",
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/tr.json b/locales/tr.json
index 03a9791d..d9dd28f1 100644
--- a/locales/tr.json
+++ b/locales/tr.json
@@ -18,6 +18,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "Yazdır",
 	"Your preferences for Boostnote": "Boostnote tercihleriniz",
 	"Storage Locations": "Saklama Alanları",
@@ -74,7 +75,7 @@
 	"Website": "Websitesi",
 	"Development": "Geliştirme",
 	" : Development configurations for Boostnote.": " : Boostnote için geliştirme ayarları.",
-	"Copyright (C) 2017 - 2018 BoostIO": "Her hakkı saklıdır. (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Her hakkı saklıdır. (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "Lisans: GPL v3",
 	"Analytics": "Analizler",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote, uygulamanın geliştirilmesi amacıyla anonim veriler toplar. Notlarınızın içeriği gibi kişisel bilgiler kesinlikle toplanmaz.",
@@ -152,5 +153,7 @@
 	"Only allow secure html tags (recommended)": "Sadece güvenli html etiketlerine izin ver (tavsiye edilen)",
 	"Allow styles": "Stillere izin ver",
 	"Allow dangerous html tags": "Tehlikeli html etiketlerine izin ver",
-	"Disabled": "Disabled"
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 2e12323e..76700a7f 100755
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -18,6 +18,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "打印",
 	"Your preferences for Boostnote": "个性设置",
 	"Storage Locations": "本地存储",
@@ -76,7 +77,7 @@
 	"Website": "官网",
 	"Development": "开发",
 	" : Development configurations for Boostnote.": " : Boostnote 的开发配置",
-	"Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Copyright (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "License: GPL v3",
 	"Analytics": "分析",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote 收集匿名数据只为了提升软件使用体验，绝对不收集任何个人信息（包括笔记内容）",
@@ -205,8 +206,19 @@
 	"Rename": "重命名",
 	"Folder Name": "文件夹名称",
 	"No tags":"无标签",
-	"Render newlines in Markdown paragraphs as <br>":"在 Markdown 段落中使用 <br> 换行",
-	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.",
+	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "将文本箭头转换为完整符号。 ⚠ 注意这会影响 Markdown 的 HTML 注释。",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
-	"Disabled": "Disabled"
+	"Default New Note":"预设新笔记类型",
+	"Show only related tags": "只显示相关标签",
+	"Snippet Default Language": "程式码片段预设语言",
+	"Disable Direct Write (It will be applied after restarting)": "停用直接编辑 (重启后生效)",
+	"Enable smart table editor": "启用智能表格编辑器",
+	"Enable smart quotes": "启用智能引号",
+	"Allow line through checkbox": "替标示为完成的选框添加删除线",
+	"Custom CSS": "自定义 CSS",
+	"Allow custom CSS for preview": "允许预览自定义 CSS",
+	"Render newlines in Markdown paragraphs as <br>":"在 Markdown 段落中使用 <br> 换行",
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
index 93a8afd5..ec6fa80c 100755
--- a/locales/zh-TW.json
+++ b/locales/zh-TW.json
@@ -18,6 +18,7 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
+	".pdf": ".pdf",
 	"Print": "列印",
 	"Your preferences for Boostnote": "Boostnote 偏好設定",
 	"Storage Locations": "儲存空間",
@@ -74,7 +75,7 @@
 	"Website": "官網",
 	"Development": "開發",
 	" : Development configurations for Boostnote.": " : Boostnote 的開發組態",
-	"Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO",
+	"Copyright (C) 2017 - 2019 BoostIO": "Copyright (C) 2017 - 2019 BoostIO",
 	"License: GPL v3": "License: GPL v3",
 	"Analytics": "分析",
 	"Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote 收集匿名資料單純只為了提升軟體使用體驗，絕對不收集任何個人資料（包括筆記內容）",
@@ -149,7 +150,19 @@
 	"Only allow secure html tags (recommended)": "只允許安全的 HTML 標籤 (建議)",
 	"Allow styles": "允許樣式",
 	"Allow dangerous html tags": "允許危險的 HTML 標籤",
-	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.",
+	"Convert textual arrows to beautiful signs. ⚠ This will interfere with using HTML comments in your Markdown.": "將文本箭頭轉換為完整符號。 ⚠ 注意這會影響 Markdown 的 HTML 注釋。",
+	"Default New Note":"預設新筆記類型",
+	"Show only related tags": "只顯示相關標籤",
+	"Snippet Default Language": "程式碼片段預設語言",
+	"Disable Direct Write (It will be applied after restarting)": "停用直接編輯 (重啟後生效)",
+	"Enable smart table editor": "啟用智能表格編輯器",
+	"Enable smart quotes": "啟用智能引號",
+	"Allow line through checkbox": "替標示為完成的選框添加刪除線",
+	"Custom CSS": "自定義 CSS",
+	"Allow custom CSS for preview": "允許預覽自定義 CSS",
+	"Render newlines in Markdown paragraphs as <br>":"在 Markdown 段落中使用 <br> 換行",
 	"⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠": "⚠ You have pasted a link referring an attachment that could not be found in the storage location of this note. Pasting links referring attachments is only supported if the source and destination location is the same storage. Please Drag&Drop the attachment instead! ⚠",
-	"Disabled": "Disabled"
+	"Spellcheck disabled": "Spellcheck disabled",
+	"Show menu bar": "Show menu bar",
+	"Auto Detect": "Auto Detect"
 }
diff --git a/package.json b/package.json
index 253623b0..f00fb095 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "boost",
   "productName": "Boostnote",
-  "version": "0.11.13",
+  "version": "0.11.15",
   "main": "index.js",
   "description": "Boostnote",
   "license": "GPL-3.0",
@@ -50,6 +50,7 @@
   "homepage": "https://boostnote.io",
   "dependencies": {
     "@enyaxu/markdown-it-anchor": "^5.0.2",
+    "@rokt33r/js-sequence-diagrams": "^2.0.6-2",
     "@rokt33r/markdown-it-math": "^4.0.1",
     "@rokt33r/season": "^5.3.0",
     "@susisu/mte-kernel": "^2.0.0",
@@ -72,7 +73,6 @@
     "iconv-lite": "^0.4.19",
     "immutable": "^3.8.1",
     "invert-color": "^2.0.0",
-    "js-sequence-diagrams": "^1000000.0.6",
     "js-yaml": "^3.12.0",
     "katex": "^0.9.0",
     "lodash": "^4.11.1",
@@ -138,7 +138,7 @@
     "devtron": "^1.1.0",
     "dom-storage": "^2.0.2",
     "electron": "3.0.8",
-    "electron-packager": "^12.0.0",
+    "electron-packager": "^12.2.0",
     "eslint": "^3.13.1",
     "eslint-config-standard": "^6.2.1",
     "eslint-config-standard-jsx": "^3.2.0",
diff --git a/readme.md b/readme.md
index 5657cb0a..511f5a37 100644
--- a/readme.md
+++ b/readme.md
@@ -3,7 +3,7 @@
 ![Boostnote app screenshot](./resources/repository/top.png)
 
 <h4 align="center">Note-taking app for programmers. </h4>
-<h5 align="center">Apps available for Mac, Windows, Linux, Android, and iOS.</h5>
+<h5 align="center">Apps available for Mac, Windows and Linux.</h5>
 <h5 align="center">Built with Electron, React + Redux, Webpack, and CSSModules.</h5>
 <p align="center">
   <a href="https://travis-ci.org/BoostIO/Boostnote">
diff --git a/tests/dataApi/attachmentManagement.test.js b/tests/dataApi/attachmentManagement.test.js
index 53558de2..800159b8 100644
--- a/tests/dataApi/attachmentManagement.test.js
+++ b/tests/dataApi/attachmentManagement.test.js
@@ -38,7 +38,7 @@ it('should test that copyAttachment should throw an error if sourcePath dosen\'t
   fs.existsSync = jest.fn()
   fs.existsSync.mockReturnValue(false)
 
-  systemUnderTest.copyAttachment('path', 'storageKey', 'noteKey').then(() => {}, error => {
+  return systemUnderTest.copyAttachment('path', 'storageKey', 'noteKey').then(() => {}, error => {
     expect(error).toBe('source file does not exist')
     expect(fs.existsSync).toHaveBeenCalledWith('path')
   })
@@ -64,7 +64,7 @@ it('should test that copyAttachment works correctly assuming correct working of
   findStorage.findStorage.mockReturnValue(dummyStorage)
   uniqueSlug.mockReturnValue(dummyUniquePath)
 
-  systemUnderTest.copyAttachment(sourcePath, storageKey, noteKey).then(
+  return systemUnderTest.copyAttachment(sourcePath, storageKey, noteKey).then(
     function (newFileName) {
       expect(findStorage.findStorage).toHaveBeenCalledWith(storageKey)
       expect(fs.createReadStream).toHaveBeenCalledWith(sourcePath)
@@ -83,7 +83,7 @@ it('should test that copyAttachment creates a new folder if the attachment folde
   const dummyReadStream = {}
 
   dummyReadStream.pipe = jest.fn()
-  dummyReadStream.on = jest.fn()
+  dummyReadStream.on = jest.fn((event, callback) => { callback() })
   fs.createReadStream = jest.fn(() => dummyReadStream)
   fs.existsSync = jest.fn()
   fs.existsSync.mockReturnValueOnce(true)
@@ -95,7 +95,7 @@ it('should test that copyAttachment creates a new folder if the attachment folde
   findStorage.findStorage.mockReturnValue(dummyStorage)
   uniqueSlug.mockReturnValue('dummyPath')
 
-  systemUnderTest.copyAttachment('path', 'storageKey', 'noteKey').then(
+  return systemUnderTest.copyAttachment('path', 'storageKey', 'noteKey').then(
     function () {
       expect(fs.existsSync).toHaveBeenCalledWith(attachmentFolderPath)
       expect(fs.mkdirSync).toHaveBeenCalledWith(attachmentFolderPath)
@@ -109,7 +109,7 @@ it('should test that copyAttachment don\'t uses a random file name if not intend
   const dummyReadStream = {}
 
   dummyReadStream.pipe = jest.fn()
-  dummyReadStream.on = jest.fn()
+  dummyReadStream.on = jest.fn((event, callback) => { callback() })
   fs.createReadStream = jest.fn(() => dummyReadStream)
   fs.existsSync = jest.fn()
   fs.existsSync.mockReturnValueOnce(true)
@@ -120,12 +120,152 @@ it('should test that copyAttachment don\'t uses a random file name if not intend
   findStorage.findStorage.mockReturnValue(dummyStorage)
   uniqueSlug.mockReturnValue('dummyPath')
 
-  systemUnderTest.copyAttachment('path', 'storageKey', 'noteKey', false).then(
+  return systemUnderTest.copyAttachment('path', 'storageKey', 'noteKey', false).then(
     function (newFileName) {
       expect(newFileName).toBe('path')
     })
 })
 
+it('should test that copyAttachment with url (with extension, without query)', function () {
+  const dummyStorage = {path: 'dummyStoragePath'}
+
+  const dummyReadStream = {
+    pipe: jest.fn(),
+    on: jest.fn((event, callback) => { callback() })
+  }
+  fs.createReadStream = jest.fn(() => dummyReadStream)
+
+  const dummyWriteStream = {
+    write: jest.fn((data, callback) => { callback() })
+  }
+  fs.createWriteStream = jest.fn(() => dummyWriteStream)
+
+  fs.existsSync = jest.fn()
+  fs.existsSync.mockReturnValueOnce(true)
+  fs.existsSync.mockReturnValueOnce(false)
+  fs.mkdirSync = jest.fn()
+
+  findStorage.findStorage = jest.fn()
+  findStorage.findStorage.mockReturnValue(dummyStorage)
+  uniqueSlug.mockReturnValue('dummyPath')
+
+  const sourcePath = {
+    sourceFilePath: 'http://www.foo.bar/baz/qux.jpg',
+    type: 'base64',
+    data: 'data:image/jpeg;base64,Ym9vc3Rub3Rl'
+  }
+
+  return systemUnderTest.copyAttachment(sourcePath, 'storageKey', 'noteKey').then(
+    function (newFileName) {
+      expect(newFileName).toBe('dummyPath.jpg')
+    })
+})
+
+it('should test that copyAttachment with url (with extension, with query)', function () {
+  const dummyStorage = {path: 'dummyStoragePath'}
+
+  const dummyReadStream = {
+    pipe: jest.fn(),
+    on: jest.fn((event, callback) => { callback() })
+  }
+  fs.createReadStream = jest.fn(() => dummyReadStream)
+
+  const dummyWriteStream = {
+    write: jest.fn((data, callback) => { callback() })
+  }
+  fs.createWriteStream = jest.fn(() => dummyWriteStream)
+
+  fs.existsSync = jest.fn()
+  fs.existsSync.mockReturnValueOnce(true)
+  fs.existsSync.mockReturnValueOnce(false)
+  fs.mkdirSync = jest.fn()
+
+  findStorage.findStorage = jest.fn()
+  findStorage.findStorage.mockReturnValue(dummyStorage)
+  uniqueSlug.mockReturnValue('dummyPath')
+
+  const sourcePath = {
+    sourceFilePath: 'http://www.foo.bar/baz/qux.jpg?h=1080',
+    type: 'base64',
+    data: 'data:image/jpeg;base64,Ym9vc3Rub3Rl'
+  }
+
+  return systemUnderTest.copyAttachment(sourcePath, 'storageKey', 'noteKey').then(
+    function (newFileName) {
+      expect(newFileName).toBe('dummyPath.jpg')
+    })
+})
+
+it('should test that copyAttachment with url (without extension, without query)', function () {
+  const dummyStorage = {path: 'dummyStoragePath'}
+
+  const dummyReadStream = {
+    pipe: jest.fn(),
+    on: jest.fn((event, callback) => { callback() })
+  }
+  fs.createReadStream = jest.fn(() => dummyReadStream)
+
+  const dummyWriteStream = {
+    write: jest.fn((data, callback) => { callback() })
+  }
+  fs.createWriteStream = jest.fn(() => dummyWriteStream)
+
+  fs.existsSync = jest.fn()
+  fs.existsSync.mockReturnValueOnce(true)
+  fs.existsSync.mockReturnValueOnce(false)
+  fs.mkdirSync = jest.fn()
+
+  findStorage.findStorage = jest.fn()
+  findStorage.findStorage.mockReturnValue(dummyStorage)
+  uniqueSlug.mockReturnValue('dummyPath')
+
+  const sourcePath = {
+    sourceFilePath: 'http://www.foo.bar/baz/qux',
+    type: 'base64',
+    data: 'data:image/jpeg;base64,Ym9vc3Rub3Rl'
+  }
+
+  return systemUnderTest.copyAttachment(sourcePath, 'storageKey', 'noteKey').then(
+    function (newFileName) {
+      expect(newFileName).toBe('dummyPath.png')
+    })
+})
+
+it('should test that copyAttachment with url (without extension, with query)', function () {
+  const dummyStorage = {path: 'dummyStoragePath'}
+
+  const dummyReadStream = {
+    pipe: jest.fn(),
+    on: jest.fn((event, callback) => { callback() })
+  }
+  fs.createReadStream = jest.fn(() => dummyReadStream)
+
+  const dummyWriteStream = {
+    write: jest.fn((data, callback) => { callback() })
+  }
+  fs.createWriteStream = jest.fn(() => dummyWriteStream)
+
+  fs.existsSync = jest.fn()
+  fs.existsSync.mockReturnValueOnce(true)
+  fs.existsSync.mockReturnValueOnce(false)
+  fs.mkdirSync = jest.fn()
+
+  findStorage.findStorage = jest.fn()
+  findStorage.findStorage.mockReturnValue(dummyStorage)
+  uniqueSlug.mockReturnValue('dummyPath')
+
+  const sourcePath = {
+    sourceFilePath: 'http://www.foo.bar/baz/qux?h=1080',
+    type: 'base64',
+    data: 'data:image/jpeg;base64,Ym9vc3Rub3Rl'
+  }
+
+  return systemUnderTest.copyAttachment(sourcePath, 'storageKey', 'noteKey').then(
+    function (newFileName) {
+      expect(newFileName).toBe('dummyPath.png')
+    })
+})
+
 it('should replace the all ":storage" path with the actual storage path', function () {
   const storageFolder = systemUnderTest.DESTINATION_FOLDER
   const noteKey = '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c'
diff --git a/tests/lib/markdown-text-helper-test.js b/tests/lib/markdown-text-helper-test.js
index e4ad86bc..38ee3136 100644
--- a/tests/lib/markdown-text-helper-test.js
+++ b/tests/lib/markdown-text-helper-test.js
@@ -36,7 +36,8 @@ test(t => {
     ['`MY_TITLE`', 'MY_TITLE'],
     ['MY_TITLE', 'MY_TITLE'],
     // I have no idea for it...
-    ['```test', '`test']
+    ['```test', '`test'],
+    ['# C# Features', 'C# Features']
   ]
 
   testCases.forEach(testCase => {
diff --git a/tests/lib/utils.test.js b/tests/lib/utils.test.js
new file mode 100644
index 00000000..a60cdfec
--- /dev/null
+++ b/tests/lib/utils.test.js
@@ -0,0 +1,15 @@
+import { isMarkdownTitleURL } from '../../browser/lib/utils'
+
+describe('isMarkdownTitleURL', () => {
+  it('returns true for valid Markdown title with url', () => {
+    expect(isMarkdownTitleURL('# https://validurl.com')).toBe(true)
+    expect(isMarkdownTitleURL('## https://validurl.com')).toBe(true)
+    expect(isMarkdownTitleURL('###### https://validurl.com')).toBe(true)
+  })
+
+  it('returns true for invalid Markdown title with url', () => {
+    expect(isMarkdownTitleURL('1 https://validurl.com')).toBe(false)
+    expect(isMarkdownTitleURL('24 https://validurl.com')).toBe(false)
+    expect(isMarkdownTitleURL('####### https://validurl.com')).toBe(false)
+  })
+})
diff --git a/yarn.lock b/yarn.lock
index c6fce749..8fa53631 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -71,6 +71,14 @@
     pretty-ms "^0.2.1"
     text-table "^0.2.0"
 
+"@rokt33r/js-sequence-diagrams@^2.0.6-2":
+  version "2.0.6-2"
+  resolved "https://registry.yarnpkg.com/@rokt33r/js-sequence-diagrams/-/js-sequence-diagrams-2.0.6-2.tgz#fe9c4ad8f70c356873739485d1eff5cf75008821"
+  integrity sha512-33oibMKJEqCyA83TBeRkc9ifBvoIi2pn/davZuW0PZNbgK7zBkZUdFz1yMPPksA0Rbrxapc9BOwU7xXIACmxhg==
+  dependencies:
+    raphael "~2.1.x"
+    underscore "~1.4.x"
+
 "@rokt33r/markdown-it-math@^4.0.1":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@rokt33r/markdown-it-math/-/markdown-it-math-4.0.2.tgz#87c7172f459833b05e406cfc846e0c0b7ebc24ef"
@@ -2846,21 +2854,7 @@ electron-config@^1.0.0:
   dependencies:
     conf "^1.0.0"
 
-electron-download@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-4.1.0.tgz#bf932c746f2f87ffcc09d1dd472f2ff6b9187845"
-  dependencies:
-    debug "^2.2.0"
-    env-paths "^1.0.0"
-    fs-extra "^2.0.0"
-    minimist "^1.2.0"
-    nugget "^2.0.0"
-    path-exists "^3.0.0"
-    rc "^1.1.2"
-    semver "^5.3.0"
-    sumchecker "^2.0.1"
-
-electron-download@^4.1.0:
+electron-download@^4.1.0, electron-download@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-4.1.1.tgz#02e69556705cc456e520f9e035556ed5a015ebe8"
   dependencies:
@@ -2921,13 +2915,13 @@ electron-osx-sign@^0.4.1:
     minimist "^1.2.0"
     plist "^2.1.0"
 
-electron-packager@^12.0.0:
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-12.1.0.tgz#048dd4ff3848be19c5873c315b5b312df6215328"
+electron-packager@^12.2.0:
+  version "12.2.0"
+  resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-12.2.0.tgz#e38e0702a12e5f62a00a03aabd0b9ad28aebab4b"
   dependencies:
     asar "^0.14.0"
     debug "^3.0.0"
-    electron-download "^4.0.0"
+    electron-download "^4.1.1"
     electron-osx-sign "^0.4.1"
     extract-zip "^1.0.3"
     fs-extra "^5.0.0"
@@ -3824,13 +3818,6 @@ fs-extra@^1.0.0:
     jsonfile "^2.1.0"
     klaw "^1.0.0"
 
-fs-extra@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-
 fs-extra@^4.0.0, fs-extra@^4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
@@ -5381,13 +5368,6 @@ js-queue@>=2.0.0:
   dependencies:
     easy-stack "^1.0.0"
 
-js-sequence-diagrams@^1000000.0.6:
-  version "1000000.0.6"
-  resolved "https://registry.yarnpkg.com/js-sequence-diagrams/-/js-sequence-diagrams-1000000.0.6.tgz#e95db01420479c5ccbc12046af1da42fde649e5c"
-  dependencies:
-    raphael "~2.1.x"
-    underscore "~1.4.x"
-
 js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
@@ -6563,7 +6543,7 @@ npmlog@^4.0.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-nugget@^2.0.0, nugget@^2.0.1:
+nugget@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/nugget/-/nugget-2.0.1.tgz#201095a487e1ad36081b3432fa3cada4f8d071b0"
   dependencies:
@@ -7459,6 +7439,7 @@ raphael@2.2.7, raphael@^2.2.7:
 raphael@~2.1.x:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.1.4.tgz#b09ca664ad048b814bb2ff5d4d1e75838cab9c97"
+  integrity sha1-sJymZK0Ei4FLsv9dTR51g4yrnJc=
   dependencies:
     eve "git://github.com/adobe-webplatform/eve.git#eef80ed"
 
@@ -7471,7 +7452,7 @@ raw-body@2.3.2:
     iconv-lite "0.4.19"
     unpipe "1.0.0"
 
-rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7, rc@^1.2.1:
+rc@^1.0.1, rc@^1.1.6, rc@^1.1.7, rc@^1.2.1:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   dependencies:
@@ -8735,7 +8716,7 @@ stylus@^0.52.4:
     sax "0.5.x"
     source-map "0.1.x"
 
-sumchecker@^2.0.1, sumchecker@^2.0.2:
+sumchecker@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-2.0.2.tgz#0f42c10e5d05da5d42eea3e56c3399a37d6c5b3e"
   dependencies:
@@ -9114,6 +9095,7 @@ underscore.string@~2.4.0:
 underscore@~1.4.x:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
+  integrity sha1-YaajIBBiKvoHljvzJSA88SI51gQ=
 
 underscore@~1.6.0:
   version "1.6.0"