for v0.9

Merge remote-tracking branch 'upstream/master'
for Windows 32bit
2025-12-14 10:16:26 +00:00 · 2018-02-04 05:51:39 +09:00 · 2018-02-04 05:40:24 +09:00 · 2018-02-04 05:40:15 +09:00 · 2018-01-17 01:01:45 +09:00 · 2018-01-16 10:01:20 +09:00
64 changed files with 1592 additions and 2065 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,3 +17,4 @@ deploy:
  script: if [ ${TRAVIS_NODE_VERSION} = "stable" ];then docker run -v $(pwd):$(pwd) -t snapcore/snapcraft sh -c "apt update -qq
    && cd $(pwd) && snapcraft && snapcraft push *.snap --release edge"; fi
  skip_cleanup: true
+
--- a/2
+++ b/2
@@ -2,7 +2,7 @@ GPL-3.0

 Boostnote - an open source note-taking app made for programmers just like you.

-Copyright (C) 2017 - 2018 BoostIO
+Copyright (C) 2017 Maisin&Co., Inc.

 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -7,9 +7,6 @@ import path from 'path'
 import copyImage from 'browser/main/lib/dataApi/copyImage'
 import { findStorage } from 'browser/lib/findStorage'
 import fs from 'fs'
-import eventEmitter from 'browser/main/lib/eventEmitter'
-import iconv from 'iconv-lite'
-const { ipcRenderer } = require('electron')

 CodeMirror.modeURL = '../node_modules/codemirror/mode/%N/%N.js'

@@ -34,13 +31,8 @@ export default class CodeEditor extends React.Component {
  constructor (props) {
    super(props)

-    this.scrollHandler = _.debounce(this.handleScroll.bind(this), 100, {leading: false, trailing: true})
    this.changeHandler = (e) => this.handleChange(e)
-    this.focusHandler = () => {
-      ipcRenderer.send('editor:focused', true)
-    }
    this.blurHandler = (editor, e) => {
-      ipcRenderer.send('editor:focused', false)
      if (e == null) return null
      let el = e.relatedTarget
      while (el != null) {
@@ -55,39 +47,6 @@ export default class CodeEditor extends React.Component {
    this.loadStyleHandler = (e) => {
      this.editor.refresh()
    }
-    this.searchHandler = (e, msg) => this.handleSearch(msg)
-    this.searchState = null
-  }
-
-  handleSearch (msg) {
-    const cm = this.editor
-    const component = this
-
-    if (component.searchState) cm.removeOverlay(component.searchState)
-    if (msg.length < 3) return
-
-    cm.operation(function () {
-      component.searchState = makeOverlay(msg, 'searching')
-      cm.addOverlay(component.searchState)
-
-      function makeOverlay (query, style) {
-        query = new RegExp(query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&'), 'gi')
-        return {
-          token: function (stream) {
-            query.lastIndex = stream.pos
-            var match = query.exec(stream.string)
-            if (match && match.index === stream.pos) {
-              stream.pos += match[0].length || 1
-              return style
-            } else if (match) {
-              stream.pos = match.index
-            } else {
-              stream.skipToEnd()
-            }
-          }
-        }
-      }
-    })
  }

  componentDidMount () {
@@ -133,7 +92,7 @@ export default class CodeEditor extends React.Component {
        'Cmd-T': function (cm) {
          // Do nothing
        },
-        Enter: 'boostNewLineAndIndentContinueMarkdownList',
+        Enter: 'newlineAndIndentContinueMarkdownList',
        'Ctrl-C': (cm) => {
          if (cm.getOption('keyMap').substr(0, 3) === 'vim') {
            document.execCommand('copy')
@@ -145,14 +104,9 @@ export default class CodeEditor extends React.Component {

    this.setMode(this.props.mode)

-    this.editor.on('focus', this.focusHandler)
    this.editor.on('blur', this.blurHandler)
    this.editor.on('change', this.changeHandler)
    this.editor.on('paste', this.pasteHandler)
-    eventEmitter.on('top:search', this.searchHandler)
-
-    eventEmitter.emit('code:init')
-    this.editor.on('scroll', this.scrollHandler)

    const editorTheme = document.getElementById('editorTheme')
    editorTheme.addEventListener('load', this.loadStyleHandler)
@@ -169,12 +123,9 @@ export default class CodeEditor extends React.Component {
  }

  componentWillUnmount () {
-    this.editor.off('focus', this.focusHandler)
    this.editor.off('blur', this.blurHandler)
    this.editor.off('change', this.changeHandler)
    this.editor.off('paste', this.pasteHandler)
-    eventEmitter.off('top:search', this.searchHandler)
-    this.editor.off('scroll', this.scrollHandler)
    const editorTheme = document.getElementById('editorTheme')
    editorTheme.removeEventListener('load', this.loadStyleHandler)
  }
@@ -280,92 +231,27 @@ export default class CodeEditor extends React.Component {
  }

  handlePaste (editor, e) {
-    const clipboardData = e.clipboardData
-    const dataTransferItem = clipboardData.items[0]
-    const pastedTxt = clipboardData.getData('text')
-    const isURL = (str) => {
-      const matcher = /^(?:\w+:)?\/\/([^\s\.]+\.\S{2}|localhost[\:?\d]*)\S*$/
-      return matcher.test(str)
+    const dataTransferItem = e.clipboardData.items[0]
+    if (!dataTransferItem.type.match('image')) return
+
+    const blob = dataTransferItem.getAsFile()
+    const reader = new window.FileReader()
+    let base64data
+
+    reader.readAsDataURL(blob)
+    reader.onloadend = () => {
+      base64data = reader.result.replace(/^data:image\/png;base64,/, '')
+      base64data += base64data.replace('+', ' ')
+      const binaryData = new Buffer(base64data, 'base64').toString('binary')
+      const imageName = Math.random().toString(36).slice(-16)
+      const storagePath = findStorage(this.props.storageKey).path
+      const imageDir = path.join(storagePath, 'images')
+      if (!fs.existsSync(imageDir)) fs.mkdirSync(imageDir)
+      const imagePath = path.join(imageDir, `${imageName}.png`)
+      fs.writeFile(imagePath, binaryData, 'binary')
+      const imageMd = `![${imageName}](${path.join('/:storage', `${imageName}.png`)})`
+      this.insertImageMd(imageMd)
    }
-    if (dataTransferItem.type.match('image')) {
-      const blob = dataTransferItem.getAsFile()
-      const reader = new FileReader()
-      let base64data
-
-      reader.readAsDataURL(blob)
-      reader.onloadend = () => {
-        base64data = reader.result.replace(/^data:image\/png;base64,/, '')
-        base64data += base64data.replace('+', ' ')
-        const binaryData = new Buffer(base64data, 'base64').toString('binary')
-        const imageName = Math.random().toString(36).slice(-16)
-        const storagePath = findStorage(this.props.storageKey).path
-        const imageDir = path.join(storagePath, 'images')
-        if (!fs.existsSync(imageDir)) fs.mkdirSync(imageDir)
-        const imagePath = path.join(imageDir, `${imageName}.png`)
-        fs.writeFile(imagePath, binaryData, 'binary')
-        const imageMd = `![${imageName}](${path.join('/:storage', `${imageName}.png`)})`
-        this.insertImageMd(imageMd)
-      }
-    } else if (this.props.fetchUrlTitle && isURL(pastedTxt)) {
-      this.handlePasteUrl(e, editor, pastedTxt)
-    }
-  }
-
-  handleScroll (e) {
-    if (this.props.onScroll) {
-      this.props.onScroll(e)
-    }
-  }
-
-  handlePasteUrl (e, editor, pastedTxt) {
-    e.preventDefault()
-    const taggedUrl = `<${pastedTxt}>`
-    editor.replaceSelection(taggedUrl)
-
-    fetch(pastedTxt, {
-      method: 'get'
-    }).then((response) => {
-      return this.decodeResponse(response)
-    }).then((response) => {
-      const parsedResponse = (new window.DOMParser()).parseFromString(response, 'text/html')
-      const value = editor.getValue()
-      const cursor = editor.getCursor()
-      const LinkWithTitle = `[${parsedResponse.title}](${pastedTxt})`
-      const newValue = value.replace(taggedUrl, LinkWithTitle)
-      editor.setValue(newValue)
-      editor.setCursor(cursor)
-    }).catch((e) => {
-      const value = editor.getValue()
-      const newValue = value.replace(taggedUrl, pastedTxt)
-      const cursor = editor.getCursor()
-      editor.setValue(newValue)
-      editor.setCursor(cursor)
-    })
-  }
-
-  decodeResponse (response) {
-    const headers = response.headers
-    const _charset = headers.has('content-type')
-      ? this.extractContentTypeCharset(headers.get('content-type'))
-      : undefined
-    return response.arrayBuffer().then((buff) => {
-      return new Promise((resolve, reject) => {
-        try {
-          const charset = _charset !== undefined && iconv.encodingExists(_charset) ? _charset : 'utf-8'
-          resolve(iconv.decode(new Buffer(buff), charset).toString())
-        } catch (e) {
-          reject(e)
-        }
-      })
-    })
-  }
-
-  extractContentTypeCharset (contentType) {
-    return contentType.split(';').filter((str) => {
-      return str.trim().toLowerCase().startsWith('charset')
-    }).map((str) => {
-      return str.replace(/['"]/g, '').split('=')[1]
-    })[0]
  }

  render () {
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -5,7 +5,7 @@ import styles from './MarkdownEditor.styl'
 import CodeEditor from 'browser/components/CodeEditor'
 import MarkdownPreview from 'browser/components/MarkdownPreview'
 import eventEmitter from 'browser/main/lib/eventEmitter'
-import {findStorage} from 'browser/lib/findStorage'
+import { findStorage } from 'browser/lib/findStorage'

 class MarkdownEditor extends React.Component {
  constructor (props) {
@@ -92,9 +92,7 @@ class MarkdownEditor extends React.Component {
    if (this.state.isLocked) return
    this.setState({ keyPressed: new Set() })
    const { config } = this.props
-    if (config.editor.switchPreview === 'BLUR' ||
-        (config.editor.switchPreview === 'DBL_CLICK' && this.state.status === 'CODE')
-    ) {
+    if (config.editor.switchPreview === 'BLUR') {
      const cursorPosition = this.refs.code.editor.getCursor()
      this.setState({
        status: 'PREVIEW'
@@ -106,20 +104,6 @@ class MarkdownEditor extends React.Component {
    }
  }

-  handleDoubleClick (e) {
-    if (this.state.isLocked) return
-    this.setState({keyPressed: new Set()})
-    const { config } = this.props
-    if (config.editor.switchPreview === 'DBL_CLICK') {
-      this.setState({
-        status: 'CODE'
-      }, () => {
-        this.refs.code.focus()
-        eventEmitter.emit('topbar:togglelockbutton', this.state.status)
-      })
-    }
-  }
-
  handlePreviewMouseDown (e) {
    this.previewMouseDownedAt = new Date()
  }
@@ -261,7 +245,6 @@ class MarkdownEditor extends React.Component {
          displayLineNumbers={config.editor.displayLineNumbers}
          scrollPastEnd={config.editor.scrollPastEnd}
          storageKey={storageKey}
-          fetchUrlTitle={config.editor.fetchUrlTitle}
          onChange={(e) => this.handleChange(e)}
          onBlur={(e) => this.handleBlur(e)}
        />
@@ -279,10 +262,8 @@ class MarkdownEditor extends React.Component {
          lineNumber={config.preview.lineNumber}
          indentSize={editorIndentSize}
          scrollPastEnd={config.preview.scrollPastEnd}
-          smartQuotes={config.preview.smartQuotes}
          ref='preview'
          onContextMenu={(e) => this.handleContextMenu(e)}
-          onDoubleClick={(e) => this.handleDoubleClick(e)}
          tabIndex='0'
          value={this.state.renderValue}
          onMouseUp={(e) => this.handlePreviewMouseUp(e)}
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types'
 import React from 'react'
-import Markdown from 'browser/lib/markdown'
+import markdown from 'browser/lib/markdown'
 import _ from 'lodash'
 import CodeMirror from 'codemirror'
 import 'codemirror-mode-elixir'
@@ -9,10 +9,10 @@ import Raphael from 'raphael'
 import flowchart from 'flowchart'
 import SequenceDiagram from 'js-sequence-diagrams'
 import eventEmitter from 'browser/main/lib/eventEmitter'
+import fs from 'fs'
 import htmlTextHelper from 'browser/lib/htmlTextHelper'
 import copy from 'copy-to-clipboard'
 import mdurl from 'mdurl'
-import exportNote from 'browser/main/lib/dataApi/exportNote'

 const { remote } = require('electron')
 const { app } = remote
@@ -23,10 +23,6 @@ const markdownStyle = require('!!css!stylus?sourceMap!./markdown.styl')[0][1]
 const appPath = 'file://' + (process.env.NODE_ENV === 'production'
  ? app.getAppPath()
  : path.resolve())
-const CSS_FILES = [
-  `${appPath}/node_modules/katex/dist/katex.min.css`,
-  `${appPath}/node_modules/codemirror/lib/codemirror.css`
-]

 function buildStyle (fontFamily, fontSize, codeBlockFontFamily, lineNumber, scrollPastEnd) {
  return `
@@ -120,8 +116,6 @@ export default class MarkdownPreview extends React.Component {
    this.contextMenuHandler = (e) => this.handleContextMenu(e)
    this.mouseDownHandler = (e) => this.handleMouseDown(e)
    this.mouseUpHandler = (e) => this.handleMouseUp(e)
-    this.DoubleClickHandler = (e) => this.handleDoubleClick(e)
-    this.scrollHandler = _.debounce(this.handleScroll.bind(this), 100, {leading: false, trailing: true})
    this.anchorClickHandler = (e) => this.handlePreviewAnchorClick(e)
    this.checkboxClickHandler = (e) => this.handleCheckboxClick(e)
    this.saveAsTextHandler = () => this.handleSaveAsText()
@@ -130,13 +124,6 @@ export default class MarkdownPreview extends React.Component {
    this.printHandler = () => this.handlePrint()

    this.linkClickHandler = this.handlelinkClick.bind(this)
-    this.initMarkdown = this.initMarkdown.bind(this)
-    this.initMarkdown()
-  }
-
-  initMarkdown () {
-    const { smartQuotes } = this.props
-    this.markdown = new Markdown({ typographer: smartQuotes })
  }

  handlePreviewAnchorClick (e) {
@@ -159,21 +146,13 @@ export default class MarkdownPreview extends React.Component {
    this.props.onCheckboxClick(e)
  }

-  handleScroll (e) {
-    if (this.props.onScroll) {
-      this.props.onScroll(e)
-    }
-  }
-
  handleContextMenu (e) {
+    if (!this.props.onContextMenu) return
    this.props.onContextMenu(e)
  }

-  handleDoubleClick (e) {
-    if (this.props.onDoubleClick != null) this.props.onDoubleClick(e)
-  }
-
  handleMouseDown (e) {
+    if (!this.props.onMouseDown) return
    if (e.target != null) {
      switch (e.target.tagName) {
        case 'A':
@@ -201,35 +180,8 @@ export default class MarkdownPreview extends React.Component {
  }

  handleSaveAsHtml () {
-    this.exportAsDocument('html', (noteContent, exportTasks) => {
-      const {fontFamily, fontSize, codeBlockFontFamily, lineNumber, codeBlockTheme} = this.getStyleParams()
-
-      const inlineStyles = buildStyle(fontFamily, fontSize, codeBlockFontFamily, lineNumber, codeBlockTheme, lineNumber)
-      const body = this.markdown.render(noteContent)
-      const files = [this.GetCodeThemeLink(codeBlockTheme), ...CSS_FILES]
-
-      files.forEach((file) => {
-        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>
-                   <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>`
+    this.exportAsDocument('html', (value) => {
+      return this.refs.root.contentWindow.document.documentElement.outerHTML
    })
  }

@@ -237,29 +189,23 @@ export default class MarkdownPreview extends React.Component {
    this.refs.root.contentWindow.print()
  }

-  exportAsDocument (fileType, contentFormatter) {
+  exportAsDocument (fileType, formatter) {
    const options = {
      filters: [
-        {name: 'Documents', extensions: [fileType]}
+        { name: 'Documents', extensions: [fileType] }
      ],
      properties: ['openFile', 'createDirectory']
    }
+    const value = formatter ? formatter.call(this, this.props.value) : this.props.value

    dialog.showSaveDialog(remote.getCurrentWindow(), options,
-        (filename) => {
-          if (filename) {
-            const content = this.props.value
-            const storage = this.props.storagePath
-
-            exportNote(storage, content, filename, contentFormatter)
-                .then((res) => {
-                  dialog.showMessageBox(remote.getCurrentWindow(), {type: 'info', message: `Exported to ${filename}`})
-                }).catch((err) => {
-                  dialog.showErrorBox('Export error', err ? err.message || err : 'Unexpected error during export')
-                  throw err
-                })
-          }
+    (filename) => {
+      if (filename) {
+        fs.writeFile(filename, value, (err) => {
+          if (err) throw err
        })
+      }
+    })
  }

  fixDecodedURI (node) {
@@ -276,26 +222,20 @@ export default class MarkdownPreview extends React.Component {
    this.refs.root.setAttribute('sandbox', 'allow-scripts')
    this.refs.root.contentWindow.document.body.addEventListener('contextmenu', this.contextMenuHandler)

-    let styles = `
+    this.refs.root.contentWindow.document.head.innerHTML = `
      <style id='style'></style>
+      <link rel="stylesheet" href="${appPath}/node_modules/katex/dist/katex.min.css">
+      <link rel="stylesheet" href="${appPath}/node_modules/codemirror/lib/codemirror.css">
      <link rel="stylesheet" id="codeTheme">
      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    `
-
-    CSS_FILES.forEach((file) => {
-      styles += `<link rel="stylesheet" href="${file}">`
-    })
-
-    this.refs.root.contentWindow.document.head.innerHTML = styles
    this.rewriteIframe()
    this.applyStyle()

    this.refs.root.contentWindow.document.addEventListener('mousedown', this.mouseDownHandler)
    this.refs.root.contentWindow.document.addEventListener('mouseup', this.mouseUpHandler)
-    this.refs.root.contentWindow.document.addEventListener('dblclick', this.DoubleClickHandler)
    this.refs.root.contentWindow.document.addEventListener('drop', this.preventImageDroppedHandler)
    this.refs.root.contentWindow.document.addEventListener('dragover', this.preventImageDroppedHandler)
-    this.refs.root.contentWindow.document.addEventListener('scroll', this.scrollHandler)
    eventEmitter.on('export:save-text', this.saveAsTextHandler)
    eventEmitter.on('export:save-md', this.saveAsMdHandler)
    eventEmitter.on('export:save-html', this.saveAsHtmlHandler)
@@ -306,10 +246,8 @@ export default class MarkdownPreview extends React.Component {
    this.refs.root.contentWindow.document.body.removeEventListener('contextmenu', this.contextMenuHandler)
    this.refs.root.contentWindow.document.removeEventListener('mousedown', this.mouseDownHandler)
    this.refs.root.contentWindow.document.removeEventListener('mouseup', this.mouseUpHandler)
-    this.refs.root.contentWindow.document.removeEventListener('dblclick', this.DoubleClickHandler)
    this.refs.root.contentWindow.document.removeEventListener('drop', this.preventImageDroppedHandler)
    this.refs.root.contentWindow.document.removeEventListener('dragover', this.preventImageDroppedHandler)
-    this.refs.root.contentWindow.document.removeEventListener('scroll', this.scrollHandler)
    eventEmitter.off('export:save-text', this.saveAsTextHandler)
    eventEmitter.off('export:save-md', this.saveAsMdHandler)
    eventEmitter.off('export:save-html', this.saveAsHtmlHandler)
@@ -318,10 +256,6 @@ export default class MarkdownPreview extends React.Component {

  componentDidUpdate (prevProps) {
    if (prevProps.value !== this.props.value) this.rewriteIframe()
-    if (prevProps.smartQuotes !== this.props.smartQuotes) {
-      this.initMarkdown()
-      this.rewriteIframe()
-    }
    if (prevProps.fontFamily !== this.props.fontFamily ||
      prevProps.fontSize !== this.props.fontSize ||
      prevProps.codeBlockFontFamily !== this.props.codeBlockFontFamily ||
@@ -335,31 +269,25 @@ export default class MarkdownPreview extends React.Component {
    }
  }

-  getStyleParams () {
+  applyStyle () {
    const { fontSize, lineNumber, codeBlockTheme, scrollPastEnd } = this.props
    let { fontFamily, codeBlockFontFamily } = this.props
    fontFamily = _.isString(fontFamily) && fontFamily.trim().length > 0
-        ? fontFamily.split(',').map(fontName => fontName.trim()).concat(defaultFontFamily)
-        : defaultFontFamily
+      ? fontFamily.split(',').map(fontName => fontName.trim()).concat(defaultFontFamily)
+      : defaultFontFamily
    codeBlockFontFamily = _.isString(codeBlockFontFamily) && codeBlockFontFamily.trim().length > 0
-        ? codeBlockFontFamily.split(',').map(fontName => fontName.trim()).concat(defaultCodeBlockFontFamily)
-        : defaultCodeBlockFontFamily
+      ? codeBlockFontFamily.split(',').map(fontName => fontName.trim()).concat(defaultCodeBlockFontFamily)
+      : defaultCodeBlockFontFamily

-    return {fontFamily, fontSize, codeBlockFontFamily, lineNumber, codeBlockTheme, scrollPastEnd}
-  }
-
-  applyStyle () {
-    const {fontFamily, fontSize, codeBlockFontFamily, lineNumber, codeBlockTheme, scrollPastEnd} = this.getStyleParams()
-
-    this.getWindow().document.getElementById('codeTheme').href = this.GetCodeThemeLink(codeBlockTheme)
+    this.setCodeTheme(codeBlockTheme)
    this.getWindow().document.getElementById('style').innerHTML = buildStyle(fontFamily, fontSize, codeBlockFontFamily, lineNumber, scrollPastEnd)
  }

-  GetCodeThemeLink (theme) {
+  setCodeTheme (theme) {
    theme = consts.THEMES.some((_theme) => _theme === theme) && theme !== 'default'
      ? theme
      : 'elegant'
-    return theme.startsWith('solarized')
+    this.getWindow().document.getElementById('codeTheme').href = theme.startsWith('solarized')
      ? `${appPath}/node_modules/codemirror/theme/solarized.css`
      : `${appPath}/node_modules/codemirror/theme/${theme}.css`
  }
@@ -387,7 +315,11 @@ export default class MarkdownPreview extends React.Component {
        value = value.replace(codeBlock, htmlTextHelper.encodeEntities(codeBlock))
      })
    }
-    this.refs.root.contentWindow.document.body.innerHTML = this.markdown.render(value)
+    this.refs.root.contentWindow.document.body.innerHTML = markdown.render(value)
+
+    _.forEach(this.refs.root.contentWindow.document.querySelectorAll('.taskListItem'), (el) => {
+      el.parentNode.parentNode.style.listStyleType = 'none'
+    })

    _.forEach(this.refs.root.contentWindow.document.querySelectorAll('a'), (el) => {
      this.fixDecodedURI(el)
@@ -403,9 +335,9 @@ export default class MarkdownPreview extends React.Component {
    })

    _.forEach(this.refs.root.contentWindow.document.querySelectorAll('img'), (el) => {
-      el.src = this.markdown.normalizeLinkText(el.src)
+      el.src = markdown.normalizeLinkText(el.src)
      if (!/\/:storage/.test(el.src)) return
-      el.src = `file:///${this.markdown.normalizeLinkText(path.join(storagePath, 'images', path.basename(el.src)))}`
+      el.src = `file:///${markdown.normalizeLinkText(path.join(storagePath, 'images', path.basename(el.src)))}`
    })

    codeBlockTheme = consts.THEMES.some((_theme) => _theme === codeBlockTheme)
@@ -432,9 +364,9 @@ export default class MarkdownPreview extends React.Component {
        el.innerHTML = ''
        if (codeBlockTheme.indexOf('solarized') === 0) {
          const [refThema, color] = codeBlockTheme.split(' ')
-          el.parentNode.className += ` cm-s-${refThema} cm-s-${color}`
+          el.parentNode.className += ` cm-s-${refThema} cm-s-${color} CodeMirror`
        } else {
-          el.parentNode.className += ` cm-s-${codeBlockTheme}`
+          el.parentNode.className += ` cm-s-${codeBlockTheme} CodeMirror`
        }
        CodeMirror.runMode(content, syntax.mime, el, {
          tabSize: indentSize
@@ -517,20 +449,9 @@ export default class MarkdownPreview extends React.Component {

  handlelinkClick (e) {
    const noteHash = e.target.href.split('/').pop()
-    // this will match the new uuid v4 hash and the old hash
-    // e.g.
-    // :note:1c211eb7dcb463de6490 and
-    // :note:7dd23275-f2b4-49cb-9e93-3454daf1af9c
-    const regexIsNoteLink = /^:note:([a-zA-Z0-9-]{20,36})$/
+    const regexIsNoteLink = /^(.{20})-(.{20})$/
    if (regexIsNoteLink.test(noteHash)) {
-      eventEmitter.emit('list:jump', noteHash.replace(':note:', ''))
-    }
-    // this will match the old link format storage.key-note.key
-    // e.g.
-    // 877f99c3268608328037-1c211eb7dcb463de6490
-    const regexIsLegacyNoteLink = /^(.{20})-(.{20})$/
-    if (regexIsLegacyNoteLink.test(noteHash)) {
-      eventEmitter.emit('list:jump', noteHash.split('-')[1])
+      eventEmitter.emit('list:jump', noteHash)
    }
  }

@@ -557,6 +478,5 @@ MarkdownPreview.propTypes = {
  className: PropTypes.string,
  value: PropTypes.string,
  showCopyNotification: PropTypes.bool,
-  storagePath: PropTypes.string,
-  smartQuotes: PropTypes.bool
+  storagePath: PropTypes.string
 }
--- a/browser/components/MarkdownSplitEditor.js
+++ b/browser/components/MarkdownSplitEditor.js
@@ -2,7 +2,6 @@ import React from 'react'
 import CodeEditor from 'browser/components/CodeEditor'
 import MarkdownPreview from 'browser/components/MarkdownPreview'
 import { findStorage } from 'browser/lib/findStorage'
-import _ from 'lodash'

 import styles from './MarkdownSplitEditor.styl'
 import CSSModules from 'browser/lib/CSSModules'
@@ -13,7 +12,6 @@ class MarkdownSplitEditor extends React.Component {
    this.value = props.value
    this.focus = () => this.refs.code.focus()
    this.reload = () => this.refs.code.reload()
-    this.userScroll = true
  }

  handleOnChange () {
@@ -21,49 +19,6 @@ class MarkdownSplitEditor extends React.Component {
    this.props.onChange()
  }

-  handleScroll (e) {
-    const previewDoc = _.get(this, 'refs.preview.refs.root.contentWindow.document')
-    const codeDoc = _.get(this, 'refs.code.editor.doc')
-    let srcTop, srcHeight, targetTop, targetHeight
-
-    if (this.userScroll) {
-      if (e.doc) {
-        srcTop = _.get(e, 'doc.scrollTop')
-        srcHeight = _.get(e, 'doc.height')
-        targetTop = _.get(previewDoc, 'body.scrollTop')
-        targetHeight = _.get(previewDoc, 'body.scrollHeight')
-      } else {
-        srcTop = _.get(previewDoc, 'body.scrollTop')
-        srcHeight = _.get(previewDoc, 'body.scrollHeight')
-        targetTop = _.get(codeDoc, 'scrollTop')
-        targetHeight = _.get(codeDoc, 'height')
-      }
-
-      const distance = (targetHeight * srcTop / srcHeight) - targetTop
-      const framerate = 1000 / 60
-      const frames = 20
-      const refractory = frames * framerate
-
-      this.userScroll = false
-
-      let frame = 0
-      let scrollPos, time
-      const timer = setInterval(() => {
-        time = frame / frames
-        scrollPos = time < 0.5
-                  ? 2 * time * time // ease in
-                  : -1 + (4 - 2 * time) * time // ease out
-        if (e.doc) _.set(previewDoc, 'body.scrollTop', targetTop + scrollPos * distance)
-        else _.get(this, 'refs.code.editor').scrollTo(0, targetTop + scrollPos * distance)
-        if (frame >= frames) {
-          clearInterval(timer)
-          setTimeout(() => { this.userScroll = true }, refractory)
-        }
-        frame++
-      }, framerate)
-    }
-  }
-
  handleCheckboxClick (e) {
    e.preventDefault()
    e.stopPropagation()
@@ -111,10 +66,8 @@ class MarkdownSplitEditor extends React.Component {
          indentType={config.editor.indentType}
          indentSize={editorIndentSize}
          scrollPastEnd={config.editor.scrollPastEnd}
-          fetchUrlTitle={config.editor.fetchUrlTitle}
          storageKey={storageKey}
          onChange={this.handleOnChange.bind(this)}
-          onScroll={this.handleScroll.bind(this)}
       />
        <MarkdownPreview
          style={previewStyle}
@@ -127,12 +80,10 @@ class MarkdownSplitEditor extends React.Component {
          codeBlockFontFamily={config.editor.fontFamily}
          lineNumber={config.preview.lineNumber}
          scrollPastEnd={config.preview.scrollPastEnd}
-          smartQuotes={config.preview.smartQuotes}
          ref='preview'
          tabInde='0'
          value={value}
          onCheckboxClick={(e) => this.handleCheckboxClick(e)}
-          onScroll={this.handleScroll.bind(this)}
          showCopyNotification={config.ui.showCopyNotification}
          storagePath={storage.path}
       />
--- a/browser/components/NoteItem.js
+++ b/browser/components/NoteItem.js
@@ -46,25 +46,14 @@ const TagElementList = (tags) => {
 * @param {Function} handleDragStart
 * @param {string} dateDisplay
 */
-const NoteItem = ({
-  isActive,
-  note,
-  dateDisplay,
-  handleNoteClick,
-  handleNoteContextMenu,
-  handleDragStart,
-  pathname,
-  storageName,
-  folderName,
-  viewType
-}) => (
+const NoteItem = ({ isActive, note, dateDisplay, handleNoteClick, handleNoteContextMenu, handleDragStart, pathname }) => (
  <div styleName={isActive
-    ? 'item--active'
-    : 'item'
-  }
-    key={note.key}
-    onClick={e => handleNoteClick(e, note.key)}
-    onContextMenu={e => handleNoteContextMenu(e, note.key)}
+      ? 'item--active'
+      : 'item'
+    }
+    key={`${note.storage}-${note.key}`}
+    onClick={e => handleNoteClick(e, `${note.storage}-${note.key}`)}
+    onContextMenu={e => handleNoteContextMenu(e, `${note.storage}-${note.key}`)}
    onDragStart={e => handleDragStart(e, note)}
    draggable='true'
  >
@@ -79,33 +68,23 @@ const NoteItem = ({
          : <span styleName='item-title-empty'>Empty</span>
        }
      </div>
-      {['ALL', 'STORAGE'].includes(viewType) && <div styleName='item-middle'>
-        <div styleName='item-middle-time'>{dateDisplay}</div>
-        <div styleName='item-middle-app-meta'>
-          <div title={viewType === 'ALL' ? storageName : viewType === 'STORAGE' ? folderName : null} styleName='item-middle-app-meta-label'>
-            {viewType === 'ALL' && storageName}
-            {viewType === 'STORAGE' && folderName}
-          </div>
-        </div>
-      </div>}

+      <div styleName='item-bottom-time'>{dateDisplay}</div>
+      {note.isStarred
+        ? <img styleName='item-star' src='../resources/icon/icon-starred.svg' /> : ''
+      }
+      {note.isPinned && !pathname.match(/\/home|\/starred|\/trash/)
+        ? <i styleName='item-pin' className='fa fa-thumb-tack' /> : ''
+      }
+      {note.type === 'MARKDOWN_NOTE'
+        ? <TodoProcess todoStatus={getTodoStatus(note.content)} />
+        : ''
+      }
      <div styleName='item-bottom'>
        <div styleName='item-bottom-tagList'>
          {note.tags.length > 0
            ? TagElementList(note.tags)
-            : <span style={{ fontStyle: 'italic', opacity: 0.5 }} styleName='item-bottom-tagList-empty'>No tags</span>
-          }
-        </div>
-        <div>
-          {note.isStarred
-            ? <img styleName='item-star' src='../resources/icon/icon-starred.svg' /> : ''
-          }
-          {note.isPinned && !pathname.match(/\/starred|\/trash/)
-            ? <i styleName='item-pin' className='fa fa-thumb-tack' /> : ''
-          }
-          {note.type === 'MARKDOWN_NOTE'
-            ? <TodoProcess todoStatus={getTodoStatus(note.content)} />
-            : ''
+            : <span styleName='item-bottom-tagList-empty' />
          }
        </div>
      </div>
@@ -123,11 +102,7 @@ NoteItem.propTypes = {
    title: PropTypes.string.isrequired,
    tags: PropTypes.array,
    isStarred: PropTypes.bool.isRequired,
-    isTrashed: PropTypes.bool.isRequired,
-    blog: {
-      blogLink: PropTypes.string,
-      blogId: PropTypes.number
-    }
+    isTrashed: PropTypes.bool.isRequired
  }),
  handleNoteClick: PropTypes.func.isRequired,
  handleNoteContextMenu: PropTypes.func.isRequired,
--- a/browser/components/NoteItem.styl
+++ b/browser/components/NoteItem.styl
@@ -90,26 +90,6 @@ $control-height = 30px
  font-weight normal
  color $ui-inactive-text-color

-.item-middle
-  font-size 13px
-  padding-left 2px
-  padding-bottom 2px
-
-.item-middle-time
-  color $ui-inactive-text-color
-  display inline-block
-
-.item-middle-app-meta
-  float right
-  .item-middle-app-meta-label
-    opacity 0.4
-    color $ui-inactive-text-color
-    padding 0 3px
-    white-space nowrap
-    text-overflow ellipsis
-    overflow hidden
-    max-width 200px
-
 .item-bottom
  position relative
  bottom 0px
@@ -117,7 +97,7 @@ $control-height = 30px
  font-size 12px
  line-height 20px
  overflow ellipsis
-  display block
+  display flex

 .item-bottom-tagList
  flex 1
@@ -145,8 +125,10 @@ $control-height = 30px

 .item-star
  position absolute
-  right 2px
-  top 5px
+  right -6px
+  bottom 23px
+  width 16px
+  height 16px
  color alpha($ui-favorite-star-button-color, 60%)
  font-size 12px
  padding 0
@@ -154,8 +136,10 @@ $control-height = 30px

 .item-pin
  position absolute
-  right 25px
-  top 7px
+  right 0px
+  bottom 2px
+  width 34px
+  height 34px
  color #E54D42
  font-size 14px
  padding 0
@@ -208,7 +192,7 @@ body[data-theme="dark"]
      .item-bottom-tagList-item
        transition 0.15s
        background-color alpha(white, 10%)
-        color $ui-dark-text-color
+        color $ui-dark-text-color  

  .item-wrapper
    border-color alpha($ui-dark-button--active-backgroundColor, 60%)
@@ -282,7 +266,7 @@ body[data-theme="solarized-dark"]
      .item-bottom-tagList-item
        transition 0.15s
        background-color alpha($ui-solarized-dark-noteList-backgroundColor, 10%)
-        color $ui-solarized-dark-text-color
+        color $ui-solarized-dark-text-color  

  .item-wrapper
    border-color alpha($ui-solarized-dark-button--active-backgroundColor, 60%)
@@ -320,4 +304,4 @@ body[data-theme="solarized-dark"]

  .item-bottom-tagList-empty
    color $ui-inactive-text-color
-    vertical-align middle
+    vertical-align middle
--- a/browser/components/NoteItemSimple.js
+++ b/browser/components/NoteItemSimple.js
@@ -14,23 +14,14 @@ import styles from './NoteItemSimple.styl'
 * @param {Function} handleNoteContextMenu
 * @param {Function} handleDragStart
 */
-const NoteItemSimple = ({
-  isActive,
-  isAllNotesView,
-  note,
-  handleNoteClick,
-  handleNoteContextMenu,
-  handleDragStart,
-  pathname,
-  storage
-}) => (
+const NoteItemSimple = ({ isActive, note, handleNoteClick, handleNoteContextMenu, handleDragStart, pathname }) => (
  <div styleName={isActive
-    ? 'item-simple--active'
-    : 'item-simple'
-  }
-    key={note.key}
-    onClick={e => handleNoteClick(e, note.key)}
-    onContextMenu={e => handleNoteContextMenu(e, note.key)}
+      ? 'item-simple--active'
+      : 'item-simple'
+    }
+    key={`${note.storage}-${note.key}`}
+    onClick={e => handleNoteClick(e, `${note.storage}-${note.key}`)}
+    onContextMenu={e => handleNoteContextMenu(e, `${note.storage}-${note.key}`)}
    onDragStart={e => handleDragStart(e, note)}
    draggable='true'
  >
@@ -39,7 +30,7 @@ const NoteItemSimple = ({
        ? <i styleName='item-simple-title-icon' className='fa fa-fw fa-code' />
        : <i styleName='item-simple-title-icon' className='fa fa-fw fa-file-text-o' />
      }
-      {note.isPinned && !pathname.match(/\/starred|\/trash/)
+      {note.isPinned && !pathname.match(/\/home|\/starred|\/trash/)
        ? <i styleName='item-pin' className='fa fa-thumb-tack' />
        : ''
      }
@@ -47,11 +38,6 @@ const NoteItemSimple = ({
        ? note.title
        : <span styleName='item-simple-title-empty'>Empty</span>
      }
-      {isAllNotesView && <div styleName='item-simple-right'>
-        <span styleName='item-simple-right-storageName'>
-          {storage.name}
-        </span>
-      </div>}
    </div>
  </div>
 )
--- a/browser/components/NoteItemSimple.styl
+++ b/browser/components/NoteItemSimple.styl
@@ -124,7 +124,7 @@ body[data-theme="dark"]
      .item-simple-bottom-tagList-item
        transition 0.15s
        background-color alpha(white, 10%)
-        color $ui-dark-text-color
+        color $ui-dark-text-color  

  .item-simple--active
    border-color $ui-dark-borderColor
@@ -188,7 +188,7 @@ body[data-theme="solarized-dark"]
      .item-simple-bottom-tagList-item
        transition 0.15s
        background-color alpha(white, 10%)
-        color $ui-solarized-dark-text-color
+        color $ui-solarized-dark-text-color  

  .item-simple--active
    border-color $ui-solarized-dark-borderColor
@@ -206,9 +206,4 @@ body[data-theme="solarized-dark"]
      // background-color alpha($ui-dark-button--active-backgroundColor, 60%)
      color #c0392b
      .item-simple-bottom-tagList-item
-        background-color alpha(#fff, 20%)
-.item-simple-right
-  float right
-  .item-simple-right-storageName
-    padding-left 4px
-    opacity 0.4
+        background-color alpha(#fff, 20%)
--- a/browser/components/SideNavFilter.js
+++ b/browser/components/SideNavFilter.js
@@ -17,7 +17,7 @@ import styles from './SideNavFilter.styl'
 const SideNavFilter = ({
  isFolded, isHomeActive, handleAllNotesButtonClick,
  isStarredActive, handleStarredButtonClick, isTrashedActive, handleTrashedButtonClick, counterDelNote,
-  counterTotalNote, counterStarredNote, handleFilterButtonContextMenu
+  counterTotalNote, counterStarredNote
 }) => (
  <div styleName={isFolded ? 'menu--folded' : 'menu'}>

@@ -26,9 +26,9 @@ const SideNavFilter = ({
    >
      <div styleName='iconWrap'>
        <img src={isHomeActive
-          ? '../resources/icon/icon-all-active.svg'
-          : '../resources/icon/icon-all.svg'
-        }
+            ? '../resources/icon/icon-all-active.svg'
+            : '../resources/icon/icon-all.svg'
+          }
        />
      </div>
      <span styleName='menu-button-label'>All Notes</span>
@@ -40,9 +40,9 @@ const SideNavFilter = ({
    >
      <div styleName='iconWrap'>
        <img src={isStarredActive
-          ? '../resources/icon/icon-star-active.svg'
-          : '../resources/icon/icon-star-sidenav.svg'
-        }
+            ? '../resources/icon/icon-star-active.svg'
+            : '../resources/icon/icon-star-sidenav.svg'
+          }
        />
      </div>
      <span styleName='menu-button-label'>Starred</span>
@@ -54,12 +54,12 @@ const SideNavFilter = ({
    >
      <div styleName='iconWrap'>
        <img src={isTrashedActive
-          ? '../resources/icon/icon-trash-active.svg'
-          : '../resources/icon/icon-trash-sidenav.svg'
-        }
+            ? '../resources/icon/icon-trash-active.svg'
+            : '../resources/icon/icon-trash-sidenav.svg'
+          }
        />
      </div>
-      <span onContextMenu={handleFilterButtonContextMenu} styleName='menu-button-label'>Trash</span>
+      <span styleName='menu-button-label'>Trash</span>
      <span styleName='counters'>{counterDelNote}</span>
    </button>

--- a/browser/components/StorageItem.js
+++ b/browser/components/StorageItem.js
@@ -6,18 +6,6 @@ import React from 'react'
 import styles from './StorageItem.styl'
 import CSSModules from 'browser/lib/CSSModules'
 import _ from 'lodash'
-import { SortableHandle } from 'react-sortable-hoc'
-
-const DraggableIcon = SortableHandle(({ className }) => (
-  <i className={`fa ${className}`} />
-))
-
-const FolderIcon = ({ className, color, isActive }) => {
-  const iconStyle = isActive ? 'fa-folder-open-o' : 'fa-folder-o'
-  return (
-    <i className={`fa ${iconStyle} ${className}`} style={{ color: color }} />
-  )
-}

 /**
 * @param {boolean} isActive
@@ -33,54 +21,34 @@ const FolderIcon = ({ className, color, isActive }) => {
 * @return {React.Component}
 */
 const StorageItem = ({
-  styles,
-  isActive,
-  handleButtonClick,
-  handleContextMenu,
-  folderName,
-  folderColor,
-  isFolded,
-  noteCount,
-  handleDrop,
-  handleDragEnter,
-  handleDragLeave
-}) => {
-  return (
-    <button
-      styleName={isActive ? 'folderList-item--active' : 'folderList-item'}
-      onClick={handleButtonClick}
-      onContextMenu={handleContextMenu}
-      onDrop={handleDrop}
-      onDragEnter={handleDragEnter}
-      onDragLeave={handleDragLeave}
-    >
-      {!isFolded && (
-        <DraggableIcon className={styles['folderList-item-reorder']} />
-      )}
-      <span
-        styleName={
-          isFolded ? 'folderList-item-name--folded' : 'folderList-item-name'
-        }
-      >
-        <FolderIcon
-          styleName='folderList-item-icon'
-          color={folderColor}
-          isActive={isActive}
-        />
-        {isFolded
-          ? _.truncate(folderName, { length: 1, omission: '' })
-          : folderName}
+  isActive, handleButtonClick, handleContextMenu, folderName,
+  folderColor, isFolded, noteCount, handleDrop, handleDragEnter, handleDragLeave
+}) => (
+  <button styleName={isActive
+      ? 'folderList-item--active'
+      : 'folderList-item'
+    }
+    onClick={handleButtonClick}
+    onContextMenu={handleContextMenu}
+    onDrop={handleDrop}
+    onDragEnter={handleDragEnter}
+    onDragLeave={handleDragLeave}
+  >
+    <span styleName={isFolded
+      ? 'folderList-item-name--folded' : 'folderList-item-name'
+    }>
+      <text style={{color: folderColor, paddingRight: '10px'}}>{isActive ? <i className='fa fa-folder-open-o' /> : <i className='fa fa-folder-o' />}</text>{isFolded ? _.truncate(folderName, {length: 1, omission: ''}) : folderName}
+    </span>
+    {(!isFolded && _.isNumber(noteCount)) &&
+      <span styleName='folderList-item-noteCount'>{noteCount}</span>
+    }
+    {isFolded &&
+      <span styleName='folderList-item-tooltip'>
+        {folderName}
      </span>
-      {!isFolded &&
-        _.isNumber(noteCount) && (
-          <span styleName='folderList-item-noteCount'>{noteCount}</span>
-        )}
-      {isFolded && (
-        <span styleName='folderList-item-tooltip'>{folderName}</span>
-      )}
-    </button>
-  )
-}
+    }
+  </button>
+)

 StorageItem.propTypes = {
  isActive: PropTypes.bool.isRequired,
--- a/browser/components/StorageItem.styl
+++ b/browser/components/StorageItem.styl
@@ -13,7 +13,6 @@
  border none
  overflow ellipsis
  font-size 14px
-  align-items: center
  &:first-child
    margin-top 0
  &:hover
@@ -23,7 +22,7 @@
  &:active
    color $$ui-button-default-color
    background-color alpha($ui-button-default--active-backgroundColor, 20%)
-
+    
 .folderList-item--active
  @extend .folderList-item
  color #1EC38B
@@ -35,7 +34,9 @@
 .folderList-item-name
  display block
  flex 1
-  padding-right: 10px
+  padding 0 12px
+  height 26px
+  line-height 26px
  border-width 0 0 0 2px
  border-style solid
  border-color transparent
@@ -68,20 +69,9 @@
 .folderList-item-name--folded
  @extend .folderList-item-name
  padding-left 7px
-  .folderList-item-icon
+  text
    font-size 9px

-.folderList-item-icon
-  padding-right: 10px
-
-.folderList-item-reorder
-  font-size: 9px
-  padding: 10px 8px 10px 9px;
-  color: rgba(147, 147, 149, 0.3)
-  cursor: ns-resize
-  &:before
-    content: "\f142 \f142"
-
 body[data-theme="white"]
  .folderList-item
    color $ui-inactive-text-color
@@ -137,4 +127,4 @@ body[data-theme="solarized-dark"]
      background-color $ui-solarized-dark-button-backgroundColor
    &:hover
      color $ui-solarized-dark-text-color
-      background-color $ui-solarized-dark-button-backgroundColor
+      background-color $ui-solarized-dark-button-backgroundColor
--- a/browser/components/TagListItem.js
+++ b/browser/components/TagListItem.js
@@ -12,11 +12,10 @@ import CSSModules from 'browser/lib/CSSModules'
 * @param {bool} isActive
 */

-const TagListItem = ({name, handleClickTagListItem, isActive, count}) => (
+const TagListItem = ({name, handleClickTagListItem, isActive}) => (
  <button styleName={isActive ? 'tagList-item-active' : 'tagList-item'} onClick={() => handleClickTagListItem(name)}>
    <span styleName='tagList-item-name'>
      {`# ${name}`}
-      <span styleName='tagList-item-count'> {count}</span>
    </span>
  </button>
 )
--- a/browser/components/TagListItem.styl
+++ b/browser/components/TagListItem.styl
@@ -48,9 +48,6 @@
  overflow hidden
  text-overflow ellipsis

-.tagList-item-count
-  padding 0 3px
-
 body[data-theme="white"]
  .tagList-item
    color $ui-inactive-text-color
@@ -66,8 +63,6 @@ body[data-theme="white"]
    color $ui-text-color
    &:hover
      background-color alpha($ui-button--active-backgroundColor, 60%)
-  .tagList-item-count
-    color $ui-text-color

 body[data-theme="dark"]
  .tagList-item
@@ -86,6 +81,4 @@ body[data-theme="dark"]
      background-color alpha($ui-dark-button--active-backgroundColor, 50%)
    &:hover
      color $ui-dark-text-color
-      background-color alpha($ui-dark-button--active-backgroundColor, 50%)
-  .tagList-item-count
-    color $ui-dark-button--active-color
+      background-color alpha($ui-dark-button--active-backgroundColor, 50%)
--- a/browser/components/markdown.styl
+++ b/browser/components/markdown.styl
@@ -76,7 +76,7 @@ body
    justify-content left
 li
  label.taskListItem
-    margin-left -1.8em
+    margin-left -2em
    &.checked
      text-decoration line-through
      opacity 0.5
@@ -178,8 +178,6 @@ ul
  margin-bottom 1em
  li
    display list-item
-    &.taskListItem
-      list-style none
    p
      margin 0
  &>li>ul, &>li>ol
@@ -220,7 +218,6 @@ pre
    background-color white
  &.CodeMirror
    height initial
-    flex-wrap wrap
    &>code
      flex 1
      overflow-x auto
@@ -230,13 +227,6 @@ pre
    padding 0
    border none
    border-radius 0
-  &>span.filename
-    width 100%
-    border-radius: 5px 0px 0px 0px
-    margin -8px 100% 8px -8px
-    padding 0px 6px
-    background-color #777;
-    color white
  &>span.lineNumber
    display none
    font-size 1em
--- a/browser/finder/NoteDetail.js
+++ b/browser/finder/NoteDetail.js
--- a/browser/lib/keygen.js
+++ b/browser/lib/keygen.js
@@ -1,11 +1,7 @@
 const crypto = require('crypto')
 const _ = require('lodash')
-const uuidv4 = require('uuid/v4')

-module.exports = function (uuid) {
-  if (typeof uuid === typeof true && uuid) {
-    return uuidv4()
-  }
-  const length = 10
+module.exports = function (length) {
+  if (!_.isFinite(length)) length = 10
  return crypto.randomBytes(length).toString('hex')
 }
--- a/browser/lib/markdown-it-sanitize-html.js
+++ b/browser/lib/markdown-it-sanitize-html.js
@@ -1,23 +0,0 @@
-'use strict'
-
-import sanitizeHtml from 'sanitize-html'
-
-module.exports = function sanitizePlugin (md, options) {
-  options = options || {}
-
-  md.core.ruler.after('linkify', 'sanitize_inline', state => {
-    for (let tokenIdx = 0; tokenIdx < state.tokens.length; tokenIdx++) {
-      if (state.tokens[tokenIdx].type === 'html_block') {
-        state.tokens[tokenIdx].content = sanitizeHtml(state.tokens[tokenIdx].content, options)
-      }
-      if (state.tokens[tokenIdx].type === 'inline') {
-        const inlineTokens = state.tokens[tokenIdx].children
-        for (let childIdx = 0; childIdx < inlineTokens.length; childIdx++) {
-          if (inlineTokens[childIdx].type === 'html_inline') {
-            inlineTokens[childIdx].content = sanitizeHtml(inlineTokens[childIdx].content, options)
-          }
-        }
-      }
-    }
-  })
-}
--- a/browser/lib/markdown.js
+++ b/browser/lib/markdown.js
@@ -1,235 +1,173 @@
 import markdownit from 'markdown-it'
-import sanitize from './markdown-it-sanitize-html'
 import emoji from 'markdown-it-emoji'
 import math from '@rokt33r/markdown-it-math'
 import _ from 'lodash'
 import ConfigManager from 'browser/main/lib/ConfigManager'
-import {lastFindInArray} from './utils'

 // FIXME We should not depend on global variable.
 const katex = window.katex
 const config = ConfigManager.get()

-function createGutter (str, firstLineNumber) {
-  if (Number.isNaN(firstLineNumber)) firstLineNumber = 1
-  const lastLineNumber = (str.match(/\n/g) || []).length + firstLineNumber - 1
+function createGutter (str) {
+  const lc = (str.match(/\n/g) || []).length
  const lines = []
-  for (let i = firstLineNumber; i <= lastLineNumber; i++) {
+  for (let i = 1; i <= lc; i++) {
    lines.push('<span class="CodeMirror-linenumber">' + i + '</span>')
  }
  return '<span class="lineNumber CodeMirror-gutters">' + lines.join('') + '</span>'
 }

-class Markdown {
-  constructor (options = {}) {
-    const defaultOptions = {
-      typographer: true,
-      linkify: true,
-      html: true,
-      xhtmlOut: true,
-      breaks: true,
-      highlight: function (str, lang) {
-        const delimiter = ':'
-        const langInfo = lang.split(delimiter)
-        const langType = langInfo[0]
-        const fileName = langInfo[1] || ''
-        const firstLineNumber = parseInt(langInfo[2], 10)
+var md = markdownit({
+  typographer: true,
+  linkify: true,
+  html: true,
+  xhtmlOut: true,
+  breaks: true,
+  highlight: function (str, lang) {
+    if (lang === 'flowchart') {
+      return `<pre class="flowchart">${str}</pre>`
+    }
+    if (lang === 'sequence') {
+      return `<pre class="sequence">${str}</pre>`
+    }
+    return '<pre class="code">' +
+      createGutter(str) +
+      '<code class="' + lang + '">' +
+      str +
+      '</code></pre>'
+  }
+})
+md.use(emoji, {
+  shortcuts: {}
+})
+md.use(math, {
+  inlineOpen: config.preview.latexInlineOpen,
+  inlineClose: config.preview.latexInlineClose,
+  blockOpen: config.preview.latexBlockOpen,
+  blockClose: config.preview.latexBlockClose,
+  inlineRenderer: function (str) {
+    let output = ''
+    try {
+      output = katex.renderToString(str.trim())
+    } catch (err) {
+      output = `<span class="katex-error">${err.message}</span>`
+    }
+    return output
+  },
+  blockRenderer: function (str) {
+    let output = ''
+    try {
+      output = katex.renderToString(str.trim(), { displayMode: true })
+    } catch (err) {
+      output = `<div class="katex-error">${err.message}</div>`
+    }
+    return output
+  }
+})
+md.use(require('markdown-it-imsize'))
+md.use(require('markdown-it-footnote'))
+md.use(require('markdown-it-multimd-table'))
+md.use(require('markdown-it-named-headers'), {
+  slugify: (header) => {
+    return encodeURI(header.trim()
+      .replace(/[\]\[\!\"\#\$\%\&\'\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\_\{\|\}\~]/g, '')
+      .replace(/\s+/g, '-'))
+      .replace(/\-+$/, '')
+  }
+})
+md.use(require('markdown-it-kbd'))

-        if (langType === 'flowchart') {
-          return `<pre class="flowchart">${str}</pre>`
-        }
-        if (langType === 'sequence') {
-          return `<pre class="sequence">${str}</pre>`
-        }
-        return '<pre class="code CodeMirror">' +
-          '<span class="filename">' + fileName + '</span>' +
-          createGutter(str, firstLineNumber) +
-          '<code class="' + langType + '">' +
-          str +
-          '</code></pre>'
+const deflate = require('markdown-it-plantuml/lib/deflate')
+md.use(require('markdown-it-plantuml'), '', {
+  generateSource: function (umlCode) {
+    const s = unescape(encodeURIComponent(umlCode))
+    const zippedCode = deflate.encode64(
+      deflate.zip_deflate(`@startuml\n${s}\n@enduml`, 9)
+    )
+    return `http://www.plantuml.com/plantuml/svg/${zippedCode}`
+  }
+})
+
+// Override task item
+md.block.ruler.at('paragraph', function (state, startLine/*, endLine */) {
+  let content, terminate, i, l, token
+  let nextLine = startLine + 1
+  const terminatorRules = state.md.block.ruler.getRules('paragraph')
+  const endLine = state.lineMax
+
+  // jump line-by-line until empty one or EOF
+  for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
+    // this would be a code block normally, but after paragraph
+    // it's considered a lazy continuation regardless of what's there
+    if (state.sCount[nextLine] - state.blkIndent > 3) { continue }
+
+    // quirk for blockquotes, this line should already be checked by that rule
+    if (state.sCount[nextLine] < 0) { continue }
+
+    // Some tags can terminate paragraph without empty line.
+    terminate = false
+    for (i = 0, l = terminatorRules.length; i < l; i++) {
+      if (terminatorRules[i](state, nextLine, endLine, true)) {
+        terminate = true
+        break
      }
    }
+    if (terminate) { break }
+  }

-    const updatedOptions = Object.assign(defaultOptions, options)
-    this.md = markdownit(updatedOptions)
+  content = state.getLines(startLine, nextLine, state.blkIndent, false).trim()

-    // Sanitize use rinput before other plugins
-    this.md.use(sanitize, {
-      allowedTags: ['iframe', 'input',
-        'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'h7', 'h8', 'br', 'b', 'i', 'strong', 'em', 'a', 'pre', 'code', 'img', 'tt',
-        'div', 'ins', 'del', 'sup', 'sub', 'p', 'ol', 'ul', 'table', 'thead', 'tbody', 'tfoot', 'blockquote',
-        'dl', 'dt', 'dd', 'kbd', 'q', 'samp', 'var', 'hr', 'ruby', 'rt', 'rp', 'li', 'tr', 'td', 'th', 's', 'strike', 'summary', 'details'
-      ],
-      allowedAttributes: {
-        '*': [
-          'abbr', 'accept', 'accept-charset',
-          'accesskey', 'action', 'align', 'alt', 'axis',
-          'border', 'cellpadding', 'cellspacing', 'char',
-          'charoff', 'charset', 'checked',
-          'clear', 'cols', 'colspan', 'color',
-          'compact', 'coords', 'datetime', 'dir',
-          'disabled', 'enctype', 'for', 'frame',
-          'headers', 'height', 'hreflang',
-          'hspace', 'ismap', 'label', 'lang',
-          'maxlength', 'media', 'method',
-          'multiple', 'name', 'nohref', 'noshade',
-          'nowrap', 'open', 'prompt', 'readonly', 'rel', 'rev',
-          'rows', 'rowspan', 'rules', 'scope',
-          'selected', 'shape', 'size', 'span',
-          'start', 'summary', 'tabindex', 'target',
-          'title', 'type', 'usemap', 'valign', 'value',
-          'vspace', 'width', 'itemprop'
-        ],
-        'a': ['href'],
-        'div': ['itemscope', 'itemtype'],
-        'blockquote': ['cite'],
-        'del': ['cite'],
-        'ins': ['cite'],
-        'q': ['cite'],
-        'img': ['src', 'width', 'height'],
-        'iframe': ['src', 'width', 'height', 'frameborder', 'allowfullscreen'],
-        'input': ['type', 'id', 'checked']
-      },
-      allowedIframeHostnames: ['www.youtube.com']
-    })
+  state.line = nextLine

-    this.md.use(emoji, {
-      shortcuts: {}
-    })
-    this.md.use(math, {
-      inlineOpen: config.preview.latexInlineOpen,
-      inlineClose: config.preview.latexInlineClose,
-      blockOpen: config.preview.latexBlockOpen,
-      blockClose: config.preview.latexBlockClose,
-      inlineRenderer: function (str) {
-        let output = ''
-        try {
-          output = katex.renderToString(str.trim())
-        } catch (err) {
-          output = `<span class="katex-error">${err.message}</span>`
-        }
-        return output
-      },
-      blockRenderer: function (str) {
-        let output = ''
-        try {
-          output = katex.renderToString(str.trim(), { displayMode: true })
-        } catch (err) {
-          output = `<div class="katex-error">${err.message}</div>`
-        }
-        return output
-      }
-    })
-    this.md.use(require('markdown-it-imsize'))
-    this.md.use(require('markdown-it-footnote'))
-    this.md.use(require('markdown-it-multimd-table'))
-    this.md.use(require('markdown-it-named-headers'), {
-      slugify: (header) => {
-        return encodeURI(header.trim()
-          .replace(/[\]\[\!\"\#\$\%\&\'\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\_\{\|\}\~]/g, '')
-          .replace(/\s+/g, '-'))
-          .replace(/\-+$/, '')
-      }
-    })
-    this.md.use(require('markdown-it-kbd'))
+  token = state.push('paragraph_open', 'p', 1)
+  token.map = [startLine, state.line]

-    const deflate = require('markdown-it-plantuml/lib/deflate')
-    this.md.use(require('markdown-it-plantuml'), '', {
-      generateSource: function (umlCode) {
-        const s = unescape(encodeURIComponent(umlCode))
-        const zippedCode = deflate.encode64(
-          deflate.zip_deflate(`@startuml\n${s}\n@enduml`, 9)
-        )
-        return `http://www.plantuml.com/plantuml/svg/${zippedCode}`
-      }
-    })
-
-    // Override task item
-    this.md.block.ruler.at('paragraph', function (state, startLine/*, endLine */) {
-      let content, terminate, i, l, token
-      let nextLine = startLine + 1
-      const terminatorRules = state.md.block.ruler.getRules('paragraph')
-      const endLine = state.lineMax
-
-      // jump line-by-line until empty one or EOF
-      for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
-        // this would be a code block normally, but after paragraph
-        // it's considered a lazy continuation regardless of what's there
-        if (state.sCount[nextLine] - state.blkIndent > 3) { continue }
-
-        // quirk for blockquotes, this line should already be checked by that rule
-        if (state.sCount[nextLine] < 0) { continue }
-
-        // Some tags can terminate paragraph without empty line.
-        terminate = false
-        for (i = 0, l = terminatorRules.length; i < l; i++) {
-          if (terminatorRules[i](state, nextLine, endLine, true)) {
-            terminate = true
-            break
-          }
-        }
-        if (terminate) { break }
-      }
-
-      content = state.getLines(startLine, nextLine, state.blkIndent, false).trim()
-
-      state.line = nextLine
-
-      token = state.push('paragraph_open', 'p', 1)
-      token.map = [startLine, state.line]
-
-      if (state.parentType === 'list') {
-        const match = content.match(/^\[( |x)\] ?(.+)/i)
-        if (match) {
-          const liToken = lastFindInArray(state.tokens, token => token.type === 'list_item_open')
-          if (liToken) {
-            if (!liToken.attrs) {
-              liToken.attrs = []
-            }
-            liToken.attrs.push(['class', 'taskListItem'])
-          }
-          content = `<label class='taskListItem${match[1] !== ' ' ? ' checked' : ''}' for='checkbox-${startLine + 1}'><input type='checkbox'${match[1] !== ' ' ? ' checked' : ''} id='checkbox-${startLine + 1}'/> ${content.substring(4, content.length)}</label>`
-        }
-      }
-
-      token = state.push('inline', '', 0)
-      token.content = content
-      token.map = [startLine, state.line]
-      token.children = []
-
-      token = state.push('paragraph_close', 'p', -1)
-
-      return true
-    })
-
-    // Add line number attribute for scrolling
-    const originalRender = this.md.renderer.render
-    this.md.renderer.render = (tokens, options, env) => {
-      tokens.forEach((token) => {
-        switch (token.type) {
-          case 'heading_open':
-          case 'paragraph_open':
-          case 'blockquote_open':
-          case 'table_open':
-            token.attrPush(['data-line', token.map[0]])
-        }
-      })
-      const result = originalRender.call(this.md.renderer, tokens, options, env)
-      return result
+  if (state.parentType === 'list') {
+    const match = content.match(/^\[( |x)\] ?(.+)/i)
+    if (match) {
+      content = `<label class='taskListItem${match[1] !== ' ' ? ' checked' : ''}' for='checkbox-${startLine + 1}'><input type='checkbox'${match[1] !== ' ' ? ' checked' : ''} id='checkbox-${startLine + 1}'/> ${content.substring(4, content.length)}</label>`
    }
-    // FIXME We should not depend on global variable.
-    window.md = this.md
  }

-  render (content) {
-    if (!_.isString(content)) content = ''
-    return this.md.render(content)
-  }
+  token = state.push('inline', '', 0)
+  token.content = content
+  token.map = [startLine, state.line]
+  token.children = []

-  normalizeLinkText (linkText) {
-    return this.md.normalizeLinkText(linkText)
-  }
+  token = state.push('paragraph_close', 'p', -1)
+
+  return true
+})
+
+// Add line number attribute for scrolling
+const originalRender = md.renderer.render
+md.renderer.render = function render (tokens, options, env) {
+  tokens.forEach((token) => {
+    switch (token.type) {
+      case 'heading_open':
+      case 'paragraph_open':
+      case 'blockquote_open':
+      case 'table_open':
+        token.attrPush(['data-line', token.map[0]])
+    }
+  })
+  const result = originalRender.call(md.renderer, tokens, options, env)
+  return result
+}
+// FIXME We should not depend on global variable.
+window.md = md
+
+function normalizeLinkText (linkText) {
+  return md.normalizeLinkText(linkText)
 }

-export default Markdown
+const markdown = {
+  render: function markdown (content) {
+    if (!_.isString(content)) content = ''
+    const renderedContent = md.render(content)
+    return renderedContent
+  },
+  normalizeLinkText
+}

+export default markdown
--- a/browser/lib/utils.js
+++ b/browser/lib/utils.js
@@ -1,11 +0,0 @@
-export function lastFindInArray (array, callback) {
-  for (let i = array.length - 1; i >= 0; --i) {
-    if (callback(array[i], i, array)) {
-      return array[i]
-    }
-  }
-}
-
-export default {
-  lastFindInArray
-}
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -19,7 +19,6 @@ import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
 import ConfigManager from 'browser/main/lib/ConfigManager'
 import TrashButton from './TrashButton'
 import FullscreenButton from './FullscreenButton'
-import RestoreButton from './RestoreButton'
 import PermanentDeleteButton from './PermanentDeleteButton'
 import InfoButton from './InfoButton'
 import ToggleModeButton from './ToggleModeButton'
@@ -69,10 +68,13 @@ class MarkdownNoteDetail extends React.Component {
  }

  componentWillUnmount () {
-    ee.off('topbar:togglelockbutton', this.toggleLockButton)
    if (this.saveQueue != null) this.saveNow()
  }

+  componentDidUnmount () {
+    ee.off('topbar:togglelockbutton', this.toggleLockButton)
+  }
+
  handleUpdateTag () {
    const { note } = this.state
    if (this.refs.tags) note.tags = this.refs.tags.value
@@ -139,7 +141,7 @@ class MarkdownNoteDetail extends React.Component {
          hashHistory.replace({
            pathname: location.pathname,
            query: {
-              key: newNote.key
+              key: newNote.storage + '-' + newNote.key
            }
          })
          this.setState({
@@ -196,9 +198,8 @@ class MarkdownNoteDetail extends React.Component {
                noteKey: data.noteKey
              })
            }
-            ee.once('list:next', dispatchHandler)
+            ee.once('list:moved', dispatchHandler)
          })
-          .then(() => ee.emit('list:next'))
      }
    } else {
      if (confirmDeletion()) {
@@ -322,7 +323,10 @@ class MarkdownNoteDetail extends React.Component {

    const trashTopBar = <div styleName='info'>
      <div styleName='info-left'>
-        <RestoreButton onClick={(e) => this.handleUndoButtonClick(e)} />
+        <i styleName='undo-button'
+          className='fa fa-undo fa-fw'
+          onClick={(e) => this.handleUndoButtonClick(e)}
+        />
      </div>
      <div styleName='info-right'>
        <PermanentDeleteButton onClick={(e) => this.handleTrashButtonClick(e)} />
@@ -357,10 +361,12 @@ class MarkdownNoteDetail extends React.Component {
          value={this.state.note.tags}
          onChange={this.handleUpdateTag.bind(this)}
        />
+
+        <ToggleModeButton onClick={(e) => this.handleSwitchMode(e)} editorType={editorType} />
+
        <TodoListPercentage percentageOfTodo={getTodoPercentageOfCompleted(note.content)} />
      </div>
      <div styleName='info-right'>
-        <ToggleModeButton onClick={(e) => this.handleSwitchMode(e)} editorType={editorType} />
        <StarButton
          onClick={(e) => this.handleStarButtonClick(e)}
          isActive={note.isStarred}
@@ -393,7 +399,7 @@ class MarkdownNoteDetail extends React.Component {
        <InfoPanel
          storageName={currentOption.storage.name}
          folderName={currentOption.folder.name}
-          noteLink={`[${note.title}](:note:${location.query.key})`}
+          noteLink={`[${note.title}](${location.query.key})`}
          updatedAt={formatDate(note.updatedAt)}
          createdAt={formatDate(note.createdAt)}
          exportAsMd={this.exportAsMd}
--- a/browser/main/Detail/MarkdownNoteDetail.styl
+++ b/browser/main/Detail/MarkdownNoteDetail.styl
@@ -7,7 +7,6 @@
  background-color $ui-noteDetail-backgroundColor
  box-shadow none
  padding 20px 40px
-  overflow hidden

 .lock-button
  padding-bottom 3px
@@ -45,7 +44,7 @@
  margin 0 30px
 .body-noteEditor
  absolute top bottom left right
-
+  
 body[data-theme="white"]
  .root
    box-shadow $note-detail-box-shadow
--- a/browser/main/Detail/RestoreButton.js
+++ b/browser/main/Detail/RestoreButton.js
@@ -1,21 +0,0 @@
-import PropTypes from 'prop-types'
-import React from 'react'
-import CSSModules from 'browser/lib/CSSModules'
-import styles from './RestoreButton.styl'
-
-const RestoreButton = ({
-  onClick
-}) => (
-  <button styleName='control-restoreButton'
-    onClick={onClick}
-  >
-    <i className='fa fa-undo fa-fw' styleName='iconRestore' />
-    <span styleName='tooltip'>Restore</span>
-  </button>
-)
-
-RestoreButton.propTypes = {
-  onClick: PropTypes.func.isRequired
-}
-
-export default CSSModules(RestoreButton, styles)
--- a/browser/main/Detail/RestoreButton.styl
+++ b/browser/main/Detail/RestoreButton.styl
@@ -1,22 +0,0 @@
-.control-restoreButton
-  top 115px
-  topBarButtonRight()
-  &:hover .tooltip
-    opacity 1
-
-.tooltip
-  tooltip()
-  position absolute
-  pointer-events none
-  top 50px
-  left 25px
-  z-index 200
-  padding 5px
-  line-height normal
-  border-radius 2px
-  opacity 0
-  transition 0.1s
-
-body[data-theme="dark"]
-  .control-restoreButton
-    topBarButtonDark()
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -20,7 +20,6 @@ import _ from 'lodash'
 import { findNoteTitle } from 'browser/lib/findNoteTitle'
 import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
 import TrashButton from './TrashButton'
-import RestoreButton from './RestoreButton'
 import PermanentDeleteButton from './PermanentDeleteButton'
 import InfoButton from './InfoButton'
 import InfoPanel from './InfoPanel'
@@ -147,7 +146,7 @@ class SnippetNoteDetail extends React.Component {
          hashHistory.replace({
            pathname: location.pathname,
            query: {
-              key: newNote.key
+              key: newNote.storage + '-' + newNote.key
            }
          })
          this.setState({
@@ -192,9 +191,8 @@ class SnippetNoteDetail extends React.Component {
                noteKey: data.noteKey
              })
            }
-            ee.once('list:next', dispatchHandler)
+            ee.once('list:moved', dispatchHandler)
          })
-          .then(() => ee.emit('list:next'))
      }
    } else {
      if (confirmDeletion()) {
@@ -343,7 +341,6 @@ class SnippetNoteDetail extends React.Component {

  handleKeyDown (e) {
    switch (e.keyCode) {
-      // tab key
      case 9:
        if (e.ctrlKey && !e.shiftKey) {
          e.preventDefault()
@@ -356,7 +353,6 @@ class SnippetNoteDetail extends React.Component {
          this.focusEditor()
        }
        break
-      // L key
      case 76:
        {
          const isSuper = global.process.platform === 'darwin'
@@ -368,7 +364,6 @@ class SnippetNoteDetail extends React.Component {
          }
        }
        break
-      // T key
      case 84:
        {
          const isSuper = global.process.platform === 'darwin'
@@ -572,7 +567,6 @@ class SnippetNoteDetail extends React.Component {
            displayLineNumbers={config.editor.displayLineNumbers}
            keyMap={config.editor.keyMap}
            scrollPastEnd={config.editor.scrollPastEnd}
-            fetchUrlTitle={config.editor.fetchUrlTitle}
            onChange={(e) => this.handleCodeChange(index)(e)}
            ref={'code-' + index}
          />
@@ -593,7 +587,10 @@ class SnippetNoteDetail extends React.Component {

    const trashTopBar = <div styleName='info'>
      <div styleName='info-left'>
-        <RestoreButton onClick={(e) => this.handleUndoButtonClick(e)} />
+        <i styleName='undo-button'
+          className='fa fa-undo fa-fw'
+          onClick={(e) => this.handleUndoButtonClick(e)}
+        />
      </div>
      <div styleName='info-right'>
        <PermanentDeleteButton onClick={(e) => this.handleTrashButtonClick(e)} />
@@ -650,7 +647,7 @@ class SnippetNoteDetail extends React.Component {
        <InfoPanel
          storageName={currentOption.storage.name}
          folderName={currentOption.folder.name}
-          noteLink={`[${note.title}](:note:${location.query.key})`}
+          noteLink={`[${note.title}](${location.query.key})`}
          updatedAt={formatDate(note.updatedAt)}
          createdAt={formatDate(note.createdAt)}
          exportAsMd={this.showWarning}
--- a/browser/main/Detail/ToggleModeButton.styl
+++ b/browser/main/Detail/ToggleModeButton.styl
@@ -5,8 +5,8 @@
  width 52px
  display flex
  align-items center
-  position: relative
-  top 2px
+  position absolute
+  right 165px
  .active
    background-color #1EC38B
    width 33px
@@ -55,4 +55,4 @@ body[data-theme="solarized-dark"]
      background-color #002B36
    .active
      background-color #1EC38B
-      box-shadow 2px 0px 7px #222222
+      box-shadow 2px 0px 7px #222222
--- a/browser/main/Detail/index.js
+++ b/browser/main/Detail/index.js
@@ -56,8 +56,11 @@ class Detail extends React.Component {
    const { location, data, config } = this.props
    let note = null
    if (location.query.key != null) {
-      const noteKey = location.query.key
-      note = data.noteMap.get(noteKey)
+      const splitted = location.query.key.split('-')
+      const storageKey = splitted.shift()
+      const noteKey = splitted.shift()
+
+      note = data.noteMap.get(storageKey + '-' + noteKey)
    }

    if (note == null) {
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -13,13 +13,10 @@ import searchFromNotes from 'browser/lib/search'
 import fs from 'fs'
 import path from 'path'
 import { hashHistory } from 'react-router'
-import copy from 'copy-to-clipboard'
 import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
-import markdown from '../../lib/markdown'

 const { remote } = require('electron')
 const { Menu, MenuItem, dialog } = remote
-const WP_POST_PATH = '/wp/v2/posts'

 function sortByCreatedAt (a, b) {
  return new Date(b.createdAt) - new Date(a.createdAt)
@@ -34,7 +31,7 @@ function sortByUpdatedAt (a, b) {
 }

 function findNoteByKey (notes, noteKey) {
-  return notes.find((note) => note.key === noteKey)
+  return notes.find((note) => `${note.storage}-${note.key}` === noteKey)
 }

 function findNotesByKeys (notes, noteKeys) {
@@ -42,7 +39,7 @@ function findNotesByKeys (notes, noteKeys) {
 }

 function getNoteKey (note) {
-  return note.key
+  return `${note.storage}-${note.key}`
 }

 class NoteList extends React.Component {
@@ -69,11 +66,6 @@ class NoteList extends React.Component {
    this.deleteNote = this.deleteNote.bind(this)
    this.focusNote = this.focusNote.bind(this)
    this.pinToTop = this.pinToTop.bind(this)
-    this.getNoteStorage = this.getNoteStorage.bind(this)
-    this.getNoteFolder = this.getNoteFolder.bind(this)
-    this.getViewType = this.getViewType.bind(this)
-    this.restoreNote = this.restoreNote.bind(this)
-    this.copyNoteLink = this.copyNoteLink.bind(this)

    // TODO: not Selected noteKeys but SelectedNote(for reusing)
    this.state = {
@@ -117,27 +109,14 @@ class NoteList extends React.Component {

  componentDidUpdate (prevProps) {
    const { location } = this.props
-    const { selectedNoteKeys } = this.state
-    const visibleNoteKeys = this.notes.map(note => note.key)
-    const note = this.notes[0]
-    const prevKey = prevProps.location.query.key
-    const noteKey = visibleNoteKeys.includes(prevKey) ? prevKey : note && note.key

-    if (note && location.query.key == null) {
+    if (this.notes.length > 0 && location.query.key == null) {
      const { router } = this.context
      if (!location.pathname.match(/\/searched/)) this.contextNotes = this.getContextNotes()
-
-      // A visible note is an active note
-      if (!selectedNoteKeys.includes(noteKey)) {
-        if (selectedNoteKeys.length === 1) selectedNoteKeys.pop()
-        selectedNoteKeys.push(noteKey)
-        ee.emit('list:moved')
-      }
-
      router.replace({
        pathname: location.pathname,
        query: {
-          key: noteKey
+          key: this.notes[0].storage + '-' + this.notes[0].key
        }
      })
      return
@@ -261,38 +240,27 @@ class NoteList extends React.Component {
  handleNoteListKeyDown (e) {
    if (e.metaKey || e.ctrlKey) return true

-    // A key
    if (e.keyCode === 65 && !e.shiftKey) {
      e.preventDefault()
      ee.emit('top:new-note')
    }

-    // D key
    if (e.keyCode === 68) {
      e.preventDefault()
      this.deleteNote()
    }

-    // E key
    if (e.keyCode === 69) {
      e.preventDefault()
      ee.emit('detail:focus')
    }

-    // F or S key
-    if (e.keyCode === 70 || e.keyCode === 83) {
-      e.preventDefault()
-      ee.emit('top:focus-search')
-    }
-
-    // UP or K key
-    if (e.keyCode === 38 || e.keyCode === 75) {
+    if (e.keyCode === 38) {
      e.preventDefault()
      this.selectPriorNote()
    }

-    // DOWN or J key
-    if (e.keyCode === 40 || e.keyCode === 74) {
+    if (e.keyCode === 40) {
      e.preventDefault()
      this.selectNextNote()
    }
@@ -472,27 +440,14 @@ class NoteList extends React.Component {
    const pinLabel = note.isPinned ? 'Remove pin' : 'Pin to Top'
    const deleteLabel = 'Delete Note'
    const cloneNote = 'Clone Note'
-    const restoreNote = 'Restore Note'
-    const copyNoteLink = 'Copy Note Link'
-    const publishLabel = 'Publish Blog'
-    const updateLabel = 'Update Blog'
-    const openBlogLabel = 'Open Blog'

    const menu = new Menu()
-    if (!location.pathname.match(/\/starred|\/trash/)) {
+    if (!location.pathname.match(/\/home|\/starred|\/trash/)) {
      menu.append(new MenuItem({
        label: pinLabel,
        click: this.pinToTop
      }))
    }
-
-    if (location.pathname.match(/\/trash/)) {
-      menu.append(new MenuItem({
-        label: restoreNote,
-        click: this.restoreNote
-      }))
-    }
-
    menu.append(new MenuItem({
      label: deleteLabel,
      click: this.deleteNote
@@ -501,75 +456,31 @@ class NoteList extends React.Component {
      label: cloneNote,
      click: this.cloneNote.bind(this)
    }))
-    menu.append(new MenuItem({
-      label: copyNoteLink,
-      click: this.copyNoteLink(note)
-    }))
-    if (note.type === 'MARKDOWN_NOTE') {
-      if (note.blog && note.blog.blogLink && note.blog.blogId) {
-        menu.append(new MenuItem({
-          label: updateLabel,
-          click: this.publishMarkdown.bind(this)
-        }))
-        menu.append(new MenuItem({
-          label: openBlogLabel,
-          click: () => this.openBlog.bind(this)(note)
-        }))
-      } else {
-        menu.append(new MenuItem({
-          label: publishLabel,
-          click: this.publishMarkdown.bind(this)
-        }))
-      }
-    }
-
    menu.popup()
  }

-  updateSelectedNotes (updateFunc, cleanSelection = true) {
+  pinToTop () {
    const { selectedNoteKeys } = this.state
    const { dispatch } = this.props
    const notes = this.notes.map((note) => Object.assign({}, note))
    const selectedNotes = findNotesByKeys(notes, selectedNoteKeys)

-    if (!_.isFunction(updateFunc)) {
-      console.warn('Update function is not defined. No update will happen')
-      updateFunc = (note) => { return note }
-    }
-
    Promise.all(
-        selectedNotes.map((note) => {
-          note = updateFunc(note)
-          return dataApi
-              .updateNote(note.storage, note.key, note)
-        })
+      selectedNotes.map((note) => {
+        note.isPinned = !note.isPinned
+        return dataApi
+          .updateNote(note.storage, note.key, note)
+      })
    )
-        .then((updatedNotes) => {
-          updatedNotes.forEach((note) => {
-            dispatch({
-              type: 'UPDATE_NOTE',
-              note
-            })
-          })
+    .then((updatedNotes) => {
+      updatedNotes.forEach((note) => {
+        dispatch({
+          type: 'UPDATE_NOTE',
+          note
        })
-
-    if (cleanSelection) {
-      this.selectNextNote()
-    }
-  }
-
-  pinToTop () {
-    this.updateSelectedNotes((note) => {
-      note.isPinned = !note.isPinned
-      return note
-    })
-  }
-
-  restoreNote () {
-    this.updateSelectedNotes((note) => {
-      note.isTrashed = false
-      return note
+      })
    })
+    this.setState({ selectedNoteKeys: [] })
  }

  deleteNote () {
@@ -589,9 +500,11 @@ class NoteList extends React.Component {
      })
      if (dialogueButtonIndex === 1) return
      Promise.all(
-        selectedNotes.map((note) => {
+        selectedNoteKeys.map((uniqueKey) => {
+          const storageKey = uniqueKey.split('-')[0]
+          const noteKey = uniqueKey.split('-')[1]
          return dataApi
-            .deleteNote(note.storage, note.key)
+            .deleteNote(storageKey, noteKey)
        })
      )
      .then((data) => {
@@ -652,133 +565,23 @@ class NoteList extends React.Component {
        content: firstNote.content
      })
      .then((note) => {
+        const uniqueKey = note.storage + '-' + note.key
        dispatch({
          type: 'UPDATE_NOTE',
          note: note
        })

        this.setState({
-          selectedNoteKeys: [note.key]
+          selectedNoteKeys: [uniqueKey]
        })

        hashHistory.push({
          pathname: location.pathname,
-          query: {key: note.key}
+          query: {key: uniqueKey}
        })
      })
  }

-  copyNoteLink (note) {
-    const noteLink = `[${note.title}](${note.key})`
-    return copy(noteLink)
-  }
-
-  save (note) {
-    const { dispatch } = this.props
-    dataApi
-      .updateNote(note.storage, note.key, note)
-      .then((note) => {
-        dispatch({
-          type: 'UPDATE_NOTE',
-          note: note
-        })
-      })
-  }
-
-  publishMarkdown () {
-    if (this.pendingPublish) {
-      clearTimeout(this.pendingPublish)
-    }
-    this.pendingPublish = setTimeout(() => {
-      this.publishMarkdownNow()
-    }, 1000)
-  }
-
-  publishMarkdownNow () {
-    const {selectedNoteKeys} = this.state
-    const notes = this.notes.map((note) => Object.assign({}, note))
-    const selectedNotes = findNotesByKeys(notes, selectedNoteKeys)
-    const firstNote = selectedNotes[0]
-    const config = ConfigManager.get()
-    const {address, token, authMethod, username, password} = config.blog
-    let authToken = ''
-    if (authMethod === 'USER') {
-      authToken = `Basic ${window.btoa(`${username}:${password}`)}`
-    } else {
-      authToken = `Bearer ${token}`
-    }
-    const contentToRender = firstNote.content.replace(`# ${firstNote.title}`, '')
-    var data = {
-      title: firstNote.title,
-      content: markdown.render(contentToRender),
-      status: 'publish'
-    }
-
-    let url = ''
-    let method = ''
-    if (firstNote.blog && firstNote.blog.blogId) {
-      url = `${address}${WP_POST_PATH}/${firstNote.blog.blogId}`
-      method = 'PUT'
-    } else {
-      url = `${address}${WP_POST_PATH}`
-      method = 'POST'
-    }
-    // eslint-disable-next-line no-undef
-    fetch(url, {
-      method: method,
-      body: JSON.stringify(data),
-      headers: {
-        'Authorization': authToken,
-        'Content-Type': 'application/json'
-      }
-    }).then(res => res.json())
-      .then(response => {
-        if (_.isNil(response.link) || _.isNil(response.id)) {
-          return Promise.reject()
-        }
-        firstNote.blog = {
-          blogLink: response.link,
-          blogId: response.id
-        }
-        this.save(firstNote)
-        this.confirmPublish(firstNote)
-      })
-      .catch((error) => {
-        console.error(error)
-        this.confirmPublishError()
-      })
-  }
-
-  confirmPublishError () {
-    const { remote } = electron
-    const { dialog } = remote
-    const alertError = {
-      type: 'warning',
-      message: 'Publish Failed',
-      detail: 'Check and update your blog setting and try again.',
-      buttons: ['Confirm']
-    }
-    dialog.showMessageBox(remote.getCurrentWindow(), alertError)
-  }
-
-  confirmPublish (note) {
-    const buttonIndex = dialog.showMessageBox(remote.getCurrentWindow(), {
-      type: 'warning',
-      message: 'Publish Succeeded',
-      detail: `${note.title} is published at ${note.blog.blogLink}`,
-      buttons: ['Confirm', 'Open Blog']
-    })
-
-    if (buttonIndex === 1) {
-      this.openBlog(note)
-    }
-  }
-
-  openBlog (note) {
-    const { shell } = electron
-    shell.openExternal(note.blog.blogLink)
-  }
-
  importFromFile () {
    const options = {
      filters: [
@@ -875,24 +678,6 @@ class NoteList extends React.Component {
    })
  }

-  getNoteStorage (note) { // note.storage = storage key
-    return this.props.data.storageMap.toJS()[note.storage]
-  }
-
-  getNoteFolder (note) { // note.folder = folder key
-    return _.find(this.getNoteStorage(note).folders, ({ key }) => key === note.folder)
-  }
-
-  getViewType () {
-    const { pathname } = this.props.location
-    const folder = /\/folders\/[a-zA-Z0-9]+/.test(pathname)
-    const storage = /\/storages\/[a-zA-Z0-9]+/.test(pathname) && !folder
-    const allNotes = pathname === '/home'
-    if (allNotes) return 'ALL'
-    if (folder) return 'FOLDER'
-    if (storage) return 'STORAGE'
-  }
-
  render () {
    const { location, config } = this.props
    let { notes } = this.props
@@ -902,7 +687,7 @@ class NoteList extends React.Component {
      : config.sortBy === 'ALPHABETICAL'
      ? sortByAlphabetical
      : sortByUpdatedAt
-    const sortedNotes = location.pathname.match(/\/starred|\/trash/)
+    const sortedNotes = location.pathname.match(/\/home|\/starred|\/trash/)
        ? this.getNotes().sort(sortFunc)
        : this.sortByPin(this.getNotes().sort(sortFunc))
    this.notes = notes = sortedNotes.filter((note) => {
@@ -929,8 +714,6 @@ class NoteList extends React.Component {
      }
    })

-    const viewType = this.getViewType()
-
    const noteList = notes
      .map(note => {
        if (note == null) {
@@ -956,9 +739,6 @@ class NoteList extends React.Component {
              handleNoteClick={this.handleNoteClick.bind(this)}
              handleDragStart={this.handleDragStart.bind(this)}
              pathname={location.pathname}
-              folderName={this.getNoteFolder(note).name}
-              storageName={this.getNoteStorage(note).name}
-              viewType={viewType}
            />
          )
        }
@@ -972,9 +752,6 @@ class NoteList extends React.Component {
            handleNoteClick={this.handleNoteClick.bind(this)}
            handleDragStart={this.handleDragStart.bind(this)}
            pathname={location.pathname}
-            folderName={this.getNoteFolder(note).name}
-            storageName={this.getNoteStorage(note).name}
-            viewType={viewType}
          />
        )
      })
@@ -989,17 +766,16 @@ class NoteList extends React.Component {
          <div styleName='control-sortBy'>
            <i className='fa fa-angle-down' />
            <select styleName='control-sortBy-select'
-              title='Select filter mode'
              value={config.sortBy}
              onChange={(e) => this.handleSortByChange(e)}
            >
-              <option title='Sort by update time' value='UPDATED_AT'>Updated</option>
-              <option title='Sort by create time' value='CREATED_AT'>Created</option>
-              <option title='Sort alphabetically' value='ALPHABETICAL'>Alphabetically</option>
+              <option value='UPDATED_AT'>Updated</option>
+              <option value='CREATED_AT'>Created</option>
+              <option value='ALPHABETICAL'>Alphabetically</option>
            </select>
          </div>
          <div styleName='control-button-area'>
-            <button title='Default View' styleName={config.listStyle === 'DEFAULT'
+            <button styleName={config.listStyle === 'DEFAULT'
                ? 'control-button--active'
                : 'control-button'
              }
@@ -1007,7 +783,7 @@ class NoteList extends React.Component {
            >
              <img styleName='iconTag' src='../resources/icon/icon-column.svg' />
            </button>
-            <button title='Compressed View' styleName={config.listStyle === 'SMALL'
+            <button styleName={config.listStyle === 'SMALL'
                ? 'control-button--active'
                : 'control-button'
              }
--- a/browser/main/SideNav/StorageItem.js
+++ b/browser/main/SideNav/StorageItem.js
@@ -9,7 +9,6 @@ import RenameFolderModal from 'browser/main/modals/RenameFolderModal'
 import dataApi from 'browser/main/lib/dataApi'
 import StorageItemChild from 'browser/components/StorageItem'
 import _ from 'lodash'
-import { SortableElement } from 'react-sortable-hoc'

 const { remote } = require('electron')
 const { Menu, dialog } = remote
@@ -192,16 +191,33 @@ class StorageItem extends React.Component {
  dropNote (storage, folder, dispatch, location, noteData) {
    noteData = noteData.filter((note) => folder.key !== note.folder)
    if (noteData.length === 0) return
+    const newNoteData = noteData.map((note) => Object.assign({}, note, {storage: storage, folder: folder.key}))

    Promise.all(
-      noteData.map((note) => dataApi.moveNote(note.storage, note.key, storage.key, folder.key))
+      newNoteData.map((note) => dataApi.createNote(storage.key, note))
    )
    .then((createdNoteData) => {
-      createdNoteData.forEach((newNote) => {
+      createdNoteData.forEach((note) => {
        dispatch({
-          type: 'MOVE_NOTE',
-          originNote: noteData.find((note) => note.content === newNote.content),
-          note: newNote
+          type: 'UPDATE_NOTE',
+          note: note
+        })
+      })
+    })
+    .catch((err) => {
+      console.error(`error on create notes: ${err}`)
+    })
+    .then(() => {
+      return Promise.all(
+        noteData.map((note) => dataApi.deleteNote(note.storage, note.key))
+      )
+    })
+    .then((deletedNoteData) => {
+      deletedNoteData.forEach((note) => {
+        dispatch({
+          type: 'DELETE_NOTE',
+          storageKey: note.storageKey,
+          noteKey: note.noteKey
        })
      })
    })
@@ -220,8 +236,7 @@ class StorageItem extends React.Component {
  render () {
    const { storage, location, isFolded, data, dispatch } = this.props
    const { folderNoteMap, trashedSet } = data
-    const SortableStorageItemChild = SortableElement(StorageItemChild)
-    const folderList = storage.folders.map((folder, index) => {
+    const folderList = storage.folders.map((folder) => {
      const isActive = !!(location.pathname.match(new RegExp('\/storages\/' + storage.key + '\/folders\/' + folder.key)))
      const noteSet = folderNoteMap.get(storage.key + '-' + folder.key)

@@ -235,9 +250,8 @@ class StorageItem extends React.Component {
        noteCount = noteSet.size - trashedNoteCount
      }
      return (
-        <SortableStorageItemChild
+        <StorageItemChild
          key={folder.key}
-          index={index}
          isActive={isActive}
          handleButtonClick={(e) => this.handleFolderButtonClick(folder.key)(e)}
          handleContextMenu={(e) => this.handleFolderButtonContextMenu(e, folder)}
@@ -259,9 +273,9 @@ class StorageItem extends React.Component {
        key={storage.key}
      >
        <div styleName={isActive
-          ? 'header--active'
-          : 'header'
-        }
+            ? 'header--active'
+            : 'header'
+          }
          onContextMenu={(e) => this.handleHeaderContextMenu(e)}
        >
          <button styleName='header-toggleButton'
@@ -270,7 +284,7 @@ class StorageItem extends React.Component {
            <img src={this.state.isOpen
              ? '../resources/icon/icon-down.svg'
              : '../resources/icon/icon-right.svg'
-            }
+              }
            />
          </button>

--- a/browser/main/SideNav/index.js
+++ b/browser/main/SideNav/index.js
@@ -1,9 +1,6 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
-const { remote } = require('electron')
-const { Menu } = remote
-import dataApi from 'browser/main/lib/dataApi'
 import styles from './SideNav.styl'
 import { openModal } from 'browser/main/lib/modal'
 import PreferencesModal from '../modals/PreferencesModal'
@@ -17,7 +14,6 @@ import EventEmitter from 'browser/main/lib/eventEmitter'
 import PreferenceButton from './PreferenceButton'
 import ListButton from './ListButton'
 import TagButton from './TagButton'
-import {SortableContainer} from 'react-sortable-hoc'

 class SideNav extends React.Component {
  // TODO: should not use electron stuff v0.7
@@ -69,17 +65,6 @@ class SideNav extends React.Component {
    router.push('/alltags')
  }

-  onSortEnd (storage) {
-    return ({oldIndex, newIndex}) => {
-      const { dispatch } = this.props
-      dataApi
-        .reorderFolder(storage.key, oldIndex, newIndex)
-        .then((data) => {
-          dispatch({ type: 'REORDER_FOLDER', storage: data.storage })
-        })
-    }
-  }
-
  SideNavComponent (isFolded, storageList) {
    const { location, data } = this.props

@@ -101,10 +86,9 @@ class SideNav extends React.Component {
            isTrashedActive={isTrashedActive}
            handleStarredButtonClick={(e) => this.handleStarredButtonClick(e)}
            handleTrashedButtonClick={(e) => this.handleTrashedButtonClick(e)}
-            counterTotalNote={data.noteMap._map.size - data.trashedSet._set.size}
+            counterTotalNote={data.noteMap._map.size}
            counterStarredNote={data.starredSet._set.size}
            counterDelNote={data.trashedSet._set.size}
-            handleFilterButtonContextMenu={this.handleFilterButtonContextMenu.bind(this)}
          />

          <StorageList storageList={storageList} />
@@ -129,21 +113,18 @@ class SideNav extends React.Component {

  tagListComponent () {
    const { data, location } = this.props
-    const tagList = _.sortBy(data.tagNoteMap.map((tag, name) => {
-      return { name, size: tag.size }
-    }), ['name'])
+    const tagList = data.tagNoteMap.map((tag, key) => {
+      return key
+    })
    return (
-      tagList.map(tag => {
-        return (
-          <TagListItem
-            name={tag.name}
-            handleClickTagListItem={this.handleClickTagListItem.bind(this)}
-            isActive={this.getTagActive(location.pathname, tag)}
-            key={tag.name}
-            count={tag.size}
-          />
-        )
-      })
+      tagList.map(tag => (
+        <TagListItem
+          name={tag}
+          handleClickTagListItem={this.handleClickTagListItem.bind(this)}
+          isActive={this.getTagActive(location.pathname, tag)}
+          key={tag}
+        />
+      ))
    )
  }

@@ -158,48 +139,19 @@ class SideNav extends React.Component {
    router.push(`/tags/${name}`)
  }

-  emptyTrash (entries) {
-    const { dispatch } = this.props
-    const deletionPromises = entries.map((note) => {
-      return dataApi.deleteNote(note.storage, note.key)
-    })
-    Promise.all(deletionPromises)
-    .then((arrayOfStorageAndNoteKeys) => {
-      arrayOfStorageAndNoteKeys.forEach(({ storageKey, noteKey }) => {
-        dispatch({ type: 'DELETE_NOTE', storageKey, noteKey })
-      })
-    })
-    .catch((err) => {
-      console.error('Cannot Delete note: ' + err)
-    })
-    console.log('Trash emptied')
-  }
-
-  handleFilterButtonContextMenu (event) {
-    const { data } = this.props
-    const trashedNotes = data.trashedSet.toJS().map((uniqueKey) => data.noteMap.get(uniqueKey))
-    const menu = Menu.buildFromTemplate([
-      { label: 'Empty Trash', click: () => this.emptyTrash(trashedNotes) }
-    ])
-    menu.popup()
-  }
-
  render () {
    const { data, location, config, dispatch } = this.props

    const isFolded = config.isSideNavFolded

    const storageList = data.storageMap.map((storage, key) => {
-      const SortableStorageItem = SortableContainer(StorageItem)
-      return <SortableStorageItem
+      return <StorageItem
        key={storage.key}
        storage={storage}
        data={data}
        location={location}
        isFolded={isFolded}
        dispatch={dispatch}
-        onSortEnd={this.onSortEnd.bind(this)(storage)}
-        useDragHandle
      />
    })
    const style = {}
--- a/browser/main/StatusBar/StatusBar.styl
+++ b/browser/main/StatusBar/StatusBar.styl
@@ -21,19 +21,20 @@
    color white

 .zoom
-  navButtonColor()
-  color rgba(0,0,0,.54)
-  height 20px
-  display flex
-  padding 0
-  align-items center
-  background-color transparent
-  &:hover
-    color $ui-active-color
-  &:active
-    color $ui-active-color
-  span
-    margin-left 5px
+  display none
+  // navButtonColor()
+  // color rgba(0,0,0,.54)
+  // height 20px
+  // display flex
+  // padding 0
+  // align-items center
+  // background-color transparent
+  // &:hover
+  //   color $ui-active-color
+  // &:active
+  //   color $ui-active-color
+  // span
+  //   margin-left 5px
  
 .update
  navButtonColor()
--- a/browser/main/TopBar/TopBar.styl
+++ b/browser/main/TopBar/TopBar.styl
@@ -40,32 +40,6 @@ $control-height = 34px
    padding-bottom 2px
    background-color $ui-noteList-backgroundColor

-.control-search-input-clear
-  height 16px
-  width 16px
-  position absolute
-  right 40px
-  top 10px
-  z-index 300
-  border none
-  background-color transparent
-  color #999
-  &:hover .control-search-input-clear-tooltip
-    opacity 1
-
-.control-search-input-clear-tooltip
-  tooltip()
-  position fixed
-  pointer-events none
-  top 50px
-  left 433px
-  z-index 200
-  padding 5px
-  line-height normal
-  border-radius 2px
-  opacity 0
-  transition 0.1s
-
 .control-search-optionList
  position fixed
  z-index 200
@@ -233,4 +207,4 @@ body[data-theme="solarized-dark"]
    background-color $ui-solarized-dark-noteList-backgroundColor
    input
      background-color $ui-solarized-dark-noteList-backgroundColor
-      color $ui-solarized-dark-text-color
+      color $ui-solarized-dark-text-color
--- a/browser/main/TopBar/index.js
+++ b/browser/main/TopBar/index.js
@@ -22,29 +22,14 @@ class TopBar extends React.Component {
    this.focusSearchHandler = () => {
      this.handleOnSearchFocus()
    }
-
-    this.codeInitHandler = this.handleCodeInit.bind(this)
  }

  componentDidMount () {
    ee.on('top:focus-search', this.focusSearchHandler)
-    ee.on('code:init', this.codeInitHandler)
  }

  componentWillUnmount () {
    ee.off('top:focus-search', this.focusSearchHandler)
-    ee.off('code:init', this.codeInitHandler)
-  }
-
-  handleSearchClearButton (e) {
-    const { router } = this.context
-    this.setState({
-      search: '',
-      isSearching: false
-    })
-    this.refs.search.childNodes[0].blur
-    router.push('/searched')
-    e.preventDefault()
  }

  handleKeyDown (e) {
@@ -54,23 +39,6 @@ class TopBar extends React.Component {
      isIME: false
    })

-    // Clear search on ESC
-    if (e.keyCode === 27) {
-      return this.handleSearchClearButton(e)
-    }
-
-    // Next note on DOWN key
-    if (e.keyCode === 40) {
-      ee.emit('list:next')
-      e.preventDefault()
-    }
-
-    // Prev note on UP key
-    if (e.keyCode === 38) {
-      ee.emit('list:prior')
-      e.preventDefault()
-    }
-
    // When the key is an alphabet, del, enter or ctr
    if (e.keyCode <= 90 || e.keyCode >= 186 && e.keyCode <= 222) {
      this.setState({
@@ -105,16 +73,14 @@ class TopBar extends React.Component {

  handleSearchChange (e) {
    const { router } = this.context
-    const keyword = this.refs.searchInput.value
    if (this.state.isAlphabet || this.state.isConfirmTranslation) {
      router.push('/searched')
    } else {
      e.preventDefault()
    }
    this.setState({
-      search: keyword
+      search: this.refs.searchInput.value
    })
-    ee.emit('top:search', keyword)
  }

  handleSearchFocus (e) {
@@ -142,19 +108,13 @@ class TopBar extends React.Component {
  }

  handleOnSearchFocus () {
-    const el = this.refs.search.childNodes[0]
    if (this.state.isSearching) {
-      el.blur()
+      this.refs.search.childNodes[0].blur()
    } else {
-      el.focus()
-      el.setSelectionRange(0, el.value.length)
+      this.refs.search.childNodes[0].focus()
    }
  }

-  handleCodeInit () {
-    ee.emit('top:search', this.refs.searchInput.value)
-  }
-
  render () {
    const { config, style, location } = this.props
    return (
@@ -180,15 +140,15 @@ class TopBar extends React.Component {
                type='text'
                className='searchInput'
              />
-              {this.state.search !== '' &&
-                <button styleName='control-search-input-clear'
-                  onClick={(e) => this.handleSearchClearButton(e)}
-                >
-                  <i className='fa fa-fw fa-times' />
-                  <span styleName='control-search-input-clear-tooltip'>Clear Search</span>
-                </button>
-              }
            </div>
+            {this.state.search > 0 &&
+              <button styleName='left-search-clearButton'
+                onClick={(e) => this.handleSearchClearButton(e)}
+              >
+                <i className='fa fa-times' />
+              </button>
+            }
+
          </div>
        </div>
        {location.pathname === '/trashed' ? ''
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -36,8 +36,7 @@ export const DEFAULT_CONFIG = {
    displayLineNumbers: true,
    switchPreview: 'BLUR', // Available value: RIGHTCLICK, BLUR
    scrollPastEnd: false,
-    type: 'SPLIT',
-    fetchUrlTitle: true
+    type: 'SPLIT'
  },
  preview: {
    fontSize: '14',
@@ -48,16 +47,7 @@ export const DEFAULT_CONFIG = {
    latexInlineClose: '$',
    latexBlockOpen: '$$',
    latexBlockClose: '$$',
-    scrollPastEnd: false,
-    smartQuotes: true
-  },
-  blog: {
-    type: 'wordpress', // Available value: wordpress, add more types in the future plz
-    address: 'http://wordpress.com/wp-json',
-    authMethod: 'JWT', // Available value: JWT, USER
-    token: '',
-    username: '',
-    password: ''
+    scrollPastEnd: false
  }
 }

@@ -160,7 +150,6 @@ function set (updates) {
 function assignConfigValues (originalConfig, rcConfig) {
  const config = Object.assign({}, DEFAULT_CONFIG, originalConfig, rcConfig)
  config.hotkey = Object.assign({}, DEFAULT_CONFIG.hotkey, originalConfig.hotkey, rcConfig.hotkey)
-  config.blog = Object.assign({}, DEFAULT_CONFIG.blog, originalConfig.blog, rcConfig.blog)
  config.ui = Object.assign({}, DEFAULT_CONFIG.ui, originalConfig.ui, rcConfig.ui)
  config.editor = Object.assign({}, DEFAULT_CONFIG.editor, originalConfig.editor, rcConfig.editor)
  config.preview = Object.assign({}, DEFAULT_CONFIG.preview, originalConfig.preview, rcConfig.preview)
--- a/browser/main/lib/dataApi/copyFile.js
+++ b/browser/main/lib/dataApi/copyFile.js
@@ -1,31 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-
-/**
- * @description Copy a file from source to destination
- * @param {String} srcPath
- * @param {String} dstPath
- * @return {Promise} an image path
- */
-function copyFile (srcPath, dstPath) {
-  if (!path.extname(dstPath)) {
-    dstPath = path.join(dstPath, path.basename(srcPath))
-  }
-
-  return new Promise((resolve, reject) => {
-    const dstFolder = path.dirname(dstPath)
-    if (!fs.existsSync(dstFolder)) fs.mkdirSync(dstFolder)
-
-    const input = fs.createReadStream(srcPath)
-    const output = fs.createWriteStream(dstPath)
-
-    output.on('error', reject)
-    input.on('error', reject)
-    input.on('end', () => {
-      resolve(dstPath)
-    })
-    input.pipe(output)
-  })
-}
-
-module.exports = copyFile
--- a/browser/main/lib/dataApi/copyImage.js
+++ b/browser/main/lib/dataApi/copyImage.js
@@ -3,20 +3,19 @@ const path = require('path')
 const { findStorage } = require('browser/lib/findStorage')

 /**
- * @description Copy an image and return the path.
+ * @description To copy an image and return the path.
 * @param {String} filePath
 * @param {String} storageKey
- * @param {Boolean} rename create new filename or leave the old one
- * @return {Promise<any>} an image path
+ * @return {String} an image path
 */
-function copyImage (filePath, storageKey, rename = true) {
+function copyImage (filePath, storageKey) {
  return new Promise((resolve, reject) => {
    try {
      const targetStorage = findStorage(storageKey)

      const inputImage = fs.createReadStream(filePath)
      const imageExt = path.extname(filePath)
-      const imageName = rename ? Math.random().toString(36).slice(-16) : path.basename(filePath, imageExt)
+      const imageName = Math.random().toString(36).slice(-16)
      const basename = `${imageName}${imageExt}`
      const imageDir = path.join(targetStorage.path, 'images')
      if (!fs.existsSync(imageDir)) fs.mkdirSync(imageDir)
--- a/browser/main/lib/dataApi/createNote.js
+++ b/browser/main/lib/dataApi/createNote.js
@@ -52,12 +52,12 @@ function createNote (storageKey, input) {
      return storage
    })
    .then(function saveNote (storage) {
-      let key = keygen(true)
+      let key = keygen()
      let isUnique = false
      while (!isUnique) {
        try {
          sander.statSync(path.join(storage.path, 'notes', key + '.cson'))
-          key = keygen(true)
+          key = keygen()
        } catch (err) {
          if (err.code === 'ENOENT') {
            isUnique = true
--- a/browser/main/lib/dataApi/exportNote.js
+++ b/browser/main/lib/dataApi/exportNote.js
@@ -1,110 +0,0 @@
-import copyFile from 'browser/main/lib/dataApi/copyFile'
-import {findStorage} from 'browser/lib/findStorage'
-
-const fs = require('fs')
-const path = require('path')
-
-const LOCAL_STORED_REGEX = /!\[(.*?)]\(\s*?\/:storage\/(.*\.\S*?)\)/gi
-const IMAGES_FOLDER_NAME = 'images'
-
-/**
- * Export note together with images
- *
- * If images is stored in the storage, creates 'images' subfolder in target directory
- * and copies images to it. Changes links to images in the content of the note
- *
- * @param {String} storageKey or storage path
- * @param {String} noteContent Content to export
- * @param {String} targetPath Path to exported file
- * @param {function} outputFormatter
- * @return {Promise.<*[]>}
- */
-function exportNote (storageKey, noteContent, targetPath, outputFormatter) {
-  const storagePath = path.isAbsolute(storageKey) ? storageKey : findStorage(storageKey).path
-  const exportTasks = []
-
-  if (!storagePath) {
-    throw new Error('Storage path is not found')
-  }
-
-  let exportedData = noteContent.replace(LOCAL_STORED_REGEX, (match, dstFilename, srcFilename) => {
-    if (!path.extname(dstFilename)) {
-      dstFilename += path.extname(srcFilename)
-    }
-
-    const dstRelativePath = path.join(IMAGES_FOLDER_NAME, dstFilename)
-
-    exportTasks.push({
-      src: path.join(IMAGES_FOLDER_NAME, srcFilename),
-      dst: dstRelativePath
-    })
-
-    return `![${dstFilename}](${dstRelativePath})`
-  })
-
-  if (outputFormatter) {
-    exportedData = outputFormatter(exportedData, exportTasks)
-  }
-
-  const tasks = prepareTasks(exportTasks, storagePath, path.dirname(targetPath))
-
-  return Promise.all(tasks.map((task) => copyFile(task.src, task.dst)))
-  .then(() => {
-    return saveToFile(exportedData, targetPath)
-  }).catch((err) => {
-    rollbackExport(tasks)
-    throw err
-  })
-}
-
-function prepareTasks (tasks, storagePath, targetPath) {
-  return tasks.map((task) => {
-    if (!path.isAbsolute(task.src)) {
-      task.src = path.join(storagePath, task.src)
-    }
-
-    if (!path.isAbsolute(task.dst)) {
-      task.dst = path.join(targetPath, task.dst)
-    }
-
-    return task
-  })
-}
-
-function saveToFile (data, filename) {
-  return new Promise((resolve, reject) => {
-    fs.writeFile(filename, data, (err) => {
-      if (err) return reject(err)
-
-      resolve(filename)
-    })
-  })
-}
-
-/**
- * Remove exported files
- * @param tasks Array of copy task objects. Object consists of two mandatory fields – `src` and `dst`
- */
-function rollbackExport (tasks) {
-  const folders = new Set()
-  tasks.forEach((task) => {
-    let fullpath = task.dst
-
-    if (!path.extname(task.dst)) {
-      fullpath = path.join(task.dst, path.basename(task.src))
-    }
-
-    if (fs.existsSync(fullpath)) {
-      fs.unlink(fullpath)
-      folders.add(path.dirname(fullpath))
-    }
-  })
-
-  folders.forEach((folder) => {
-    if (fs.readdirSync(folder).length === 0) {
-      fs.rmdir(folder)
-    }
-  })
-}
-
-export default exportNote
--- a/browser/main/lib/dataApi/moveNote.js
+++ b/browser/main/lib/dataApi/moveNote.js
@@ -1,12 +1,10 @@
 const resolveStorageData = require('./resolveStorageData')
 const _ = require('lodash')
 const path = require('path')
-const fs = require('fs')
 const CSON = require('@rokt33r/season')
 const keygen = require('browser/lib/keygen')
 const sander = require('sander')
 const { findStorage } = require('browser/lib/findStorage')
-const copyImage = require('./copyImage')

 function moveNote (storageKey, noteKey, newStorageKey, newFolderKey) {
  let oldStorage, newStorage
@@ -39,12 +37,12 @@ function moveNote (storageKey, noteKey, newStorageKey, newFolderKey) {
          return resolveStorageData(newStorage)
            .then(function findNewNoteKey (_newStorage) {
              newStorage = _newStorage
-              newNoteKey = keygen(true)
+              newNoteKey = keygen()
              let isUnique = false
              while (!isUnique) {
                try {
                  sander.statSync(path.join(newStorage.path, 'notes', newNoteKey + '.cson'))
-                  newNoteKey = keygen(true)
+                  newNoteKey = keygen()
                } catch (err) {
                  if (err.code === 'ENOENT') {
                    isUnique = true
@@ -67,27 +65,6 @@ function moveNote (storageKey, noteKey, newStorageKey, newFolderKey) {

          return noteData
        })
-        .then(function moveImages (noteData) {
-          const searchImagesRegex = /!\[.*?]\(\s*?\/:storage\/(.*\.\S*?)\)/gi
-          let match = searchImagesRegex.exec(noteData.content)
-
-          const moveTasks = []
-          while (match != null) {
-            const [, filename] = match
-            const oldPath = path.join(oldStorage.path, 'images', filename)
-            moveTasks.push(
-                copyImage(oldPath, noteData.storage, false)
-                .then(() => {
-                  fs.unlinkSync(oldPath)
-                })
-            )
-
-            // find next occurence
-            match = searchImagesRegex.exec(noteData.content)
-          }
-
-          return Promise.all(moveTasks).then(() => noteData)
-        })
        .then(function writeAndReturn (noteData) {
          CSON.writeFileSync(path.join(newStorage.path, 'notes', noteData.key + '.cson'), _.omit(noteData, ['key', 'storage']))
          return noteData
--- a/browser/main/lib/dataApi/updateNote.js
+++ b/browser/main/lib/dataApi/updateNote.js
@@ -30,9 +30,6 @@ function validateInput (input) {
    validatedInput.isPinned = !!input.isPinned
  }

-  if (!_.isNil(input.blog)) {
-    validatedInput.blog = input.blog
-  }
  validatedInput.type = input.type
  switch (input.type) {
    case 'MARKDOWN_NOTE':
--- a/browser/main/lib/ipcClient.js
+++ b/browser/main/lib/ipcClient.js
@@ -18,7 +18,7 @@ nodeIpc.connectTo(
      console.log(err)
    })
    nodeIpc.of.node.on('connect', function () {
-      console.log('Connected successfully')
+      console.log('Conncted successfully')
      ipcRenderer.send('config-renew', {config: ConfigManager.get()})
    })
    nodeIpc.of.node.on('disconnect', function () {
--- a/browser/main/modals/NewNoteModal.js
+++ b/browser/main/modals/NewNoteModal.js
@@ -35,16 +35,14 @@ class NewNoteModal extends React.Component {
        content: ''
      })
      .then((note) => {
-        const noteHash = note.key
        dispatch({
          type: 'UPDATE_NOTE',
          note: note
        })
        hashHistory.push({
          pathname: location.pathname,
-          query: {key: noteHash}
+          query: {key: note.storage + '-' + note.key}
        })
-        ee.emit('list:jump', noteHash)
        ee.emit('detail:focus')
        this.props.close()
      })
@@ -75,16 +73,14 @@ class NewNoteModal extends React.Component {
        }]
      })
      .then((note) => {
-        const noteHash = note.key
        dispatch({
          type: 'UPDATE_NOTE',
          note: note
        })
        hashHistory.push({
          pathname: location.pathname,
-          query: {key: noteHash}
+          query: {key: note.storage + '-' + note.key}
        })
-        ee.emit('list:jump', noteHash)
        ee.emit('detail:focus')
        this.props.close()
      })
--- a/browser/main/modals/PreferencesModal/Blog.js
+++ b/browser/main/modals/PreferencesModal/Blog.js
@@ -1,198 +0,0 @@
-import React from 'react'
-import CSSModules from 'browser/lib/CSSModules'
-import styles from './ConfigTab.styl'
-import ConfigManager from 'browser/main/lib/ConfigManager'
-import store from 'browser/main/store'
-import PropTypes from 'prop-types'
-import _ from 'lodash'
-
-const electron = require('electron')
-const { shell } = electron
-const ipc = electron.ipcRenderer
-class Blog extends React.Component {
-  constructor (props) {
-    super(props)
-
-    this.state = {
-      config: props.config,
-      BlogAlert: null
-    }
-  }
-
-  handleLinkClick (e) {
-    shell.openExternal(e.currentTarget.href)
-    e.preventDefault()
-  }
-
-  clearMessage () {
-    _.debounce(() => {
-      this.setState({
-        BlogAlert: null
-      })
-    }, 2000)()
-  }
-
-  componentDidMount () {
-    this.handleSettingDone = () => {
-      this.setState({BlogAlert: {
-        type: 'success',
-        message: 'Successfully applied!'
-      }})
-    }
-    this.handleSettingError = (err) => {
-      this.setState({BlogAlert: {
-        type: 'error',
-        message: err.message != null ? err.message : 'Error occurs!'
-      }})
-    }
-    this.oldBlog = this.state.config.blog
-    ipc.addListener('APP_SETTING_DONE', this.handleSettingDone)
-    ipc.addListener('APP_SETTING_ERROR', this.handleSettingError)
-  }
-
-  handleBlogChange (e) {
-    const { config } = this.state
-    config.blog = {
-      password: !_.isNil(this.refs.passwordInput) ? this.refs.passwordInput.value : config.blog.password,
-      username: !_.isNil(this.refs.usernameInput) ? this.refs.usernameInput.value : config.blog.username,
-      token: !_.isNil(this.refs.tokenInput) ? this.refs.tokenInput.value : config.blog.token,
-      authMethod: this.refs.authMethodDropdown.value,
-      address: this.refs.addressInput.value,
-      type: this.refs.typeDropdown.value
-    }
-    this.setState({
-      config
-    })
-    if (_.isEqual(this.oldBlog, config.blog)) {
-      this.props.haveToSave()
-    } else {
-      this.props.haveToSave({
-        tab: 'Blog',
-        type: 'warning',
-        message: 'You have to save!'
-      })
-    }
-  }
-
-  handleSaveButtonClick (e) {
-    const newConfig = {
-      blog: this.state.config.blog
-    }
-
-    ConfigManager.set(newConfig)
-
-    store.dispatch({
-      type: 'SET_UI',
-      config: newConfig
-    })
-    this.clearMessage()
-    this.props.haveToSave()
-  }
-
-  render () {
-    const {config, BlogAlert} = this.state
-    const blogAlertElement = BlogAlert != null
-      ? <p className={`alert ${BlogAlert.type}`}>
-        {BlogAlert.message}
-      </p>
-      : null
-    return (
-      <div styleName='root'>
-        <div styleName='group'>
-          <div styleName='group-header'>Blog</div>
-          <div styleName='group-section'>
-            <div styleName='group-section-label'>
-              Blog Type
-            </div>
-            <div styleName='group-section-control'>
-              <select
-                value={config.blog.type}
-                ref='typeDropdown'
-                onChange={(e) => this.handleBlogChange(e)}
-              >
-                <option value='wordpress' key='wordpress'>wordpress</option>
-              </select>
-            </div>
-          </div>
-          <div styleName='group-section'>
-            <div styleName='group-section-label'>Blog Address</div>
-            <div styleName='group-section-control'>
-              <input styleName='group-section-control-input'
-                onChange={(e) => this.handleBlogChange(e)}
-                ref='addressInput'
-                value={config.blog.address}
-                type='text'
-              />
-            </div>
-          </div>
-          <div styleName='group-control'>
-            <button styleName='group-control-rightButton'
-              onClick={(e) => this.handleSaveButtonClick(e)}>Save
-            </button>
-            {blogAlertElement}
-          </div>
-        </div>
-        <div styleName='group-header2'>Auth</div>
-
-        <div styleName='group-section'>
-          <div styleName='group-section-label'>
-            Authentication Method
-          </div>
-          <div styleName='group-section-control'>
-            <select
-              value={config.blog.authMethod}
-              ref='authMethodDropdown'
-              onChange={(e) => this.handleBlogChange(e)}
-            >
-              <option value='JWT' key='JWT'>JWT</option>
-              <option value='USER' key='USER'>USER</option>
-            </select>
-          </div>
-        </div>
-        { config.blog.authMethod === 'JWT' &&
-          <div styleName='group-section'>
-            <div styleName='group-section-label'>Token</div>
-            <div styleName='group-section-control'>
-              <input styleName='group-section-control-input'
-                onChange={(e) => this.handleBlogChange(e)}
-                ref='tokenInput'
-                value={config.blog.token}
-                type='text' />
-            </div>
-          </div>
-        }
-        { config.blog.authMethod === 'USER' &&
-          <div>
-            <div styleName='group-section'>
-              <div styleName='group-section-label'>UserName</div>
-              <div styleName='group-section-control'>
-                <input styleName='group-section-control-input'
-                  onChange={(e) => this.handleBlogChange(e)}
-                  ref='usernameInput'
-                  value={config.blog.username}
-                  type='text' />
-              </div>
-            </div>
-            <div styleName='group-section'>
-              <div styleName='group-section-label'>Password</div>
-              <div styleName='group-section-control'>
-                <input styleName='group-section-control-input'
-                  onChange={(e) => this.handleBlogChange(e)}
-                  ref='passwordInput'
-                  value={config.blog.password}
-                  type='password' />
-              </div>
-            </div>
-          </div>
-        }
-      </div>
-    )
-  }
-}
-
-Blog.propTypes = {
-  dispatch: PropTypes.func,
-  haveToSave: PropTypes.func
-}
-
-export default CSSModules(Blog, styles)
--- a/browser/main/modals/PreferencesModal/InfoTab.js
+++ b/browser/main/modals/PreferencesModal/InfoTab.js
@@ -42,7 +42,7 @@ class InfoTab extends React.Component {
      })
    } else {
      this.setState({
-        amaMessage: 'Thanks for trusting us'
+        amaMessage: 'Thank\'s for trust us'
      })
    }

@@ -83,7 +83,7 @@ class InfoTab extends React.Component {
              >GitHub</a>
            </li>
            <li>
-              <a href='https://boostlog.io/@junp1234'
+              <a href='https://medium.com/boostnote'
                onClick={(e) => this.handleLinkClick(e)}
              >Blog</a>
            </li>
@@ -128,7 +128,7 @@ class InfoTab extends React.Component {
            >Development</a> : Development configurations for Boostnote.
          </li>
          <li styleName='cc'>
-            Copyright (C) 2017 - 2018 BoostIO
+            Copyright (C) 2017 Maisin&Co.
          </li>
          <li styleName='cc'>
            License: GPL v3
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -76,8 +76,7 @@ class UiTab extends React.Component {
        displayLineNumbers: this.refs.editorDisplayLineNumbers.checked,
        switchPreview: this.refs.editorSwitchPreview.value,
        keyMap: this.refs.editorKeyMap.value,
-        scrollPastEnd: this.refs.scrollPastEnd.checked,
-        fetchUrlTitle: this.refs.editorFetchUrlTitle.checked
+        scrollPastEnd: this.refs.scrollPastEnd.checked
      },
      preview: {
        fontSize: this.refs.previewFontSize.value,
@@ -88,8 +87,7 @@ class UiTab extends React.Component {
        latexInlineClose: this.refs.previewLatexInlineClose.value,
        latexBlockOpen: this.refs.previewLatexBlockOpen.value,
        latexBlockClose: this.refs.previewLatexBlockClose.value,
-        scrollPastEnd: this.refs.previewScrollPastEnd.checked,
-        smartQuotes: this.refs.previewSmartQuotes.checked
+        scrollPastEnd: this.refs.previewScrollPastEnd.checked
      }
    }

@@ -285,7 +283,6 @@ class UiTab extends React.Component {
                onChange={(e) => this.handleUIChange(e)}
              >
                <option value='BLUR'>When Editor Blurred</option>
-                <option value='DBL_CLICK'>When Editor Blurred, Edit On Double Click</option>
                <option value='RIGHTCLICK'>On Right Click</option>
              </select>
            </div>
@@ -330,17 +327,6 @@ class UiTab extends React.Component {
            </label>
          </div>

-          <div styleName='group-checkBoxSection'>
-            <label>
-              <input onChange={(e) => this.handleUIChange(e)}
-                checked={this.state.config.editor.fetchUrlTitle}
-                ref='editorFetchUrlTitle'
-                type='checkbox'
-              />&nbsp;
-              Bring in web page title when pasting URL on editor
-            </label>
-          </div>
-
          <div styleName='group-header2'>Preview</div>
          <div styleName='group-section'>
            <div styleName='group-section-label'>
@@ -403,16 +389,6 @@ class UiTab extends React.Component {
              Show line numbers for preview code blocks
            </label>
          </div>
-          <div styleName='group-checkBoxSection'>
-            <label>
-              <input onChange={(e) => this.handleUIChange(e)}
-                checked={this.state.config.preview.smartQuotes}
-                ref='previewSmartQuotes'
-                type='checkbox'
-              />&nbsp;
-              Enable smart quotes
-            </label>
-          </div>
          <div styleName='group-section'>
            <div styleName='group-section-label'>
              LaTeX Inline Open Delimiter
--- a/browser/main/modals/PreferencesModal/index.js
+++ b/browser/main/modals/PreferencesModal/index.js
@@ -6,7 +6,6 @@ import UiTab from './UiTab'
 import InfoTab from './InfoTab'
 import Crowdfunding from './Crowdfunding'
 import StoragesTab from './StoragesTab'
-import Blog from './Blog'
 import ModalEscButton from 'browser/components/ModalEscButton'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './PreferencesModal.styl'
@@ -20,8 +19,7 @@ class Preferences extends React.Component {
    this.state = {
      currentTab: 'STORAGES',
      UIAlert: '',
-      HotkeyAlert: '',
-      BlogAlert: ''
+      HotkeyAlert: ''
    }
  }

@@ -77,14 +75,6 @@ class Preferences extends React.Component {
        return (
          <Crowdfunding />
        )
-      case 'BLOG':
-        return (
-          <Blog
-            dispatch={dispatch}
-            config={config}
-            haveToSave={alert => this.setState({BlogAlert: alert})}
-          />
-        )
      case 'STORAGES':
      default:
        return (
@@ -121,8 +111,7 @@ class Preferences extends React.Component {
      {target: 'HOTKEY', label: 'Hotkeys', Hotkey: this.state.HotkeyAlert},
      {target: 'UI', label: 'Interface', UI: this.state.UIAlert},
      {target: 'INFO', label: 'About'},
-      {target: 'CROWDFUNDING', label: 'Crowdfunding'},
-      {target: 'BLOG', label: 'Blog', Blog: this.state.BlogAlert}
+      {target: 'CROWDFUNDING', label: 'Crowdfunding'}
    ]

    const navButtons = tabs.map((tab) => {
--- a/browser/main/store.js
+++ b/browser/main/store.js
@@ -27,7 +27,7 @@ function data (state = defaultDataMap(), action) {

      action.notes.some((note) => {
        if (note === undefined) return true
-        const uniqueKey = note.key
+        const uniqueKey = note.storage + '-' + note.key
        const folderKey = note.storage + '-' + note.folder
        state.noteMap.set(uniqueKey, note)

@@ -66,7 +66,7 @@ function data (state = defaultDataMap(), action) {
    case 'UPDATE_NOTE':
      {
        const note = action.note
-        const uniqueKey = note.key
+        const uniqueKey = note.storage + '-' + note.key
        const folderKey = note.storage + '-' + note.folder
        const oldNote = state.noteMap.get(uniqueKey)

@@ -162,9 +162,9 @@ function data (state = defaultDataMap(), action) {
    case 'MOVE_NOTE':
      {
        const originNote = action.originNote
-        const originKey = originNote.key
+        const originKey = originNote.storage + '-' + originNote.key
        const note = action.note
-        const uniqueKey = note.key
+        const uniqueKey = note.storage + '-' + note.key
        const folderKey = note.storage + '-' + note.folder
        const oldNote = state.noteMap.get(uniqueKey)

@@ -297,7 +297,7 @@ function data (state = defaultDataMap(), action) {
      }
    case 'DELETE_NOTE':
      {
-        const uniqueKey = action.noteKey
+        const uniqueKey = action.storageKey + '-' + action.noteKey
        const targetNote = state.noteMap.get(uniqueKey)

        state = Object.assign({}, state)
@@ -423,7 +423,7 @@ function data (state = defaultDataMap(), action) {
      state.folderNoteMap = new Map(state.folderNoteMap)
      state.tagNoteMap = new Map(state.tagNoteMap)
      action.notes.forEach((note) => {
-        const uniqueKey = note.key
+        const uniqueKey = note.storage + '-' + note.key
        const folderKey = note.storage + '-' + note.folder
        state.noteMap.set(uniqueKey, note)

@@ -483,7 +483,7 @@ function data (state = defaultDataMap(), action) {
        state.tagNoteMap = new Map(state.tagNoteMap)
        state.starredSet = new Set(state.starredSet)
        notes.forEach((note) => {
-          const noteKey = note.key
+          const noteKey = storage.key + '-' + note.key
          state.noteMap.delete(noteKey)
          state.starredSet.delete(noteKey)
          note.tags.forEach((tag) => {
--- a/browser/styles/index.styl
+++ b/browser/styles/index.styl
@@ -5,7 +5,7 @@ $danger-color = #c9302c
 $danger-lighten-color = lighten(#c9302c, 5%)

 // Layouts
-$statusBar-height = 22px
+$statusBar-height = 0px
 $sideNav-width = 200px
 $sideNav--folded-width = 44px
 $topBar-height = 60px
@@ -347,4 +347,4 @@ modalSolarizedDark()
  width 100%
  background-color $ui-solarized-dark-backgroundColor
  overflow hidden
-  border-radius $modal-border-radius
+  border-radius $modal-border-radius
--- a/contributing.md
+++ b/contributing.md
@@ -9,7 +9,7 @@ Thank you for your help in advance.

 ### About copyright of Pull Request

-If you make a pull request, It means you agree to transfer the copyright of the code changes to BoostIO.
+If you make a pull request, It means you agree to transfer the copyright of the code changes to Maisin&Co.

 It doesn't mean Boostnote will become a paid app. If we want to earn some money, We will try other way, which is some kind of cloud storage, Mobile app integration or some SPECIAL features.
 Because GPL v3 is too strict to be compatible with any other License, We thought this is needed to replace the license with much freer one(like BSD, MIT) somewhen.
@@ -27,7 +27,7 @@ Because GPL v3 is too strict to be compatible with any other License, We thought

 ### Об авторских правах Pull Request

-Если вы делаете pull request, значит вы согласны передать авторские права на изменения кода в BoostIO.
+Если вы делаете pull request, значит вы согласны передать авторские права на изменения кода в Maisin&Co.

 Это не означает, что Boostnote станет платным приложением. Если мы захотим заработать немного денег, мы найдем другой способ. Например, использование облачного хранилища, интеграцией мобильных приложений или другими специальными функциями.
 Так как лицензия GPL v3 слишком строгая, чтобы быть совместимой с любой другой лицензией, мы думаем, что нужно заменить лицензию на более свободную (например, BSD, MIT).
@@ -45,7 +45,7 @@ Because GPL v3 is too strict to be compatible with any other License, We thought

 ### Pull Request의 저작권에 관하여

-당신이 pull request를 요청하면, 코드 변경에 대한 저작권을 BoostIO에 양도한다는 것에 동의한다는 의미입니다.
+당신이 pull request를 요청하면, 코드 변경에 대한 저작권을 Maisin&Co에 양도한다는 것에 동의한다는 의미입니다.

 이것은 Boostnote가 유료화가 되는 것을 의미하는 건 아닙니다. 만약 우리가 자금이 필요하다면, 우리는 클라우드 연동, 모바일 앱 통합 혹은 특수한 기능 같은 것을 사용해 수입 창출을 시도할 것입니다.
 GPL v3 라이센스는 다른 라이센스와 혼합해 사용하기엔 너무 엄격하므로, 우리는 BSD, MIT 라이센스와 같은 더 자유로운 라이센스로 교체하는 것을 생각하고 있습니다.
@@ -63,7 +63,7 @@ GPL v3 라이센스는 다른 라이센스와 혼합해 사용하기엔 너무

 ### Pull requestの著作権について

-Pull requestをすることはその変化分のコードの著作権をBoostIOに譲渡することに同意することになります。
+Pull requestをすることはその変化分のコードの著作権をMaisin&Co.に譲渡することに同意することになります。

 アプリケーションのLicenseをいつでも変える選択肢を残したいと思うからです。
 これはいずれかBoostnoteが有料の商用アプリになる可能性がある話ではありません。
@@ -83,7 +83,7 @@ Pull requestをすることはその変化分のコードの著作権をBoostIO
 感谢您对我们的支持。  

 ### 关于您提供的Pull Request的著作权（版权）问题
-如果您提供了一个Pull Request，这表示您将您所修改的代码的著作权移交给BoostIO。  
+如果您提供了一个Pull Request，这表示您将您所修改的代码的著作权移交给Maisin&Co。  

 这并不表示Boostnote会成为一个需要付费的软件。如果我们想获得收益，我们会尝试一些其他的方法，比如说云存储、绑定手机软件等。  
 因为GPLv3过于严格，不能和其他的一些协议兼容，所以我们有可能在将来会把BoostNote的协议改为一些较为宽松的协议，比如说BSD、MIT。  
--- a/docs/de/build.md
+++ b/docs/de/build.md
@@ -1,5 +1,5 @@
 # Build
-Diese Seite ist auch verfügbar in [Japanisch](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/build.md), [Koreanisch](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/build.md), [Russisch](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/build.md), [Vereinfachtem Chinesisch](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/build.md), [Französisch](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/build.md) und [Deutsch](https://github.com/BoostIO/Boostnote/blob/master/docs/de/build.md).
+Diese Seite ist auch verfügbar in [Japanese](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/build.md), [Korean](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/build.md), [Russain](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/build.md), [Simplified Chinese](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/build.md), [French](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/build.md) and [German](https://github.com/BoostIO/Boostnote/blob/master/docs/de/build.md).

 ## Umgebungen
 * npm: 4.x
--- a/docs/de/debug.md
+++ b/docs/de/debug.md
@@ -1,31 +1,25 @@
 # How to debug Boostnote (Electron app)
+Diese Seite ist auch verfügbar in [Japanese](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/debug.md), [Korean](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/debug.md), [Russain](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/debug.md), [Simplified Chinese](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/debug.md), [French](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/debug.md) and [German](https://github.com/BoostIO/Boostnote/blob/add-german-documents/docs/de/debug.md).

-Diese Seite ist auch verfügbar in [Japanisch](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/debug.md), [Koreanisch](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/debug.md), [Russisch](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/debug.md), [Vereinfachtem Chinesisch](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/debug.md), [Französisch](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/debug.md) und [Deutsch](https://github.com/BoostIO/Boostnote/blob/master/docs/de/debug.md).
-
-
-Boostnote ist eine Electron App und basiert auf Chromium. 
-
-Zum Entwicklen verwendest du am Besten die `Developer Tools` von Google Chrome verwenden. Diese kannst du ganz einfach im unter dem Menüpunkt `View` mit `Toggle Developer Tools` aktivieren:
+Boostnote is eine Electron app, somit basiert sie auf Chromium; Entwickler können die `Developer Tools` verwenden, wie Google Chrome.

+Du kannst die `Developer Tools` so einschalten:
 ![how_to_toggle_devTools](https://cloud.githubusercontent.com/assets/11307908/24343585/162187e2-127c-11e7-9c01-23578db03ecf.png)

-Die Anzeige der `Developer Tools` sieht in etwa so aus:
-
+Die `Developer Tools` schauen dann ungefähr so aus:
 ![Developer_Tools](https://cloud.githubusercontent.com/assets/11307908/24343545/eff9f3a6-127b-11e7-94cf-cb67bfda634a.png)

+Wenn Fehler vorkommen, werden die Fehlermeldungen in der `console` ausgegeben.

 ## Debugging
-
-Fehlermeldungen werden in der Regel in der `console` ausgegeben, die du über den gleichnamigen Reiter der `Developer Tools`  anzeigen lassen kannst. Zum Debuggen kannst du beispielsweise über den `debugger` Haltepunkte im Code setzen.
-
+Zum Beispiel kannst du mit dem `debugger` Haltepunkte im Code setzen wie hier veranschaulicht:
 ![debugger](https://cloud.githubusercontent.com/assets/11307908/24343879/9459efea-127d-11e7-9943-f60bf7f66d4a.png)

-Du kannst aber natürlich auch die Art von Debugging verwenden mit der du am besten zurecht kommst.
+Das ist ledigtlich ein Beispiel, du kannst die Art von Debugging verwenden die für dich am besten ist.

 ## Referenz
-
 * [Official document of Google Chrome about debugging](https://developer.chrome.com/devtools)

 ---

-Special thanks: Translated by [gino909](https://github.com/gino909), [mdeuerlein](https://github.com/mdeuerlein) 
+Special thanks: Translated by [gino909](https://github.com/gino909)
--- a/docs/debug.md
+++ b/docs/debug.md
@@ -1,5 +1,5 @@
 # How to debug Boostnote (Electron app)
-This page is also available in [Japanese](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/debug.md), [Korean](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/debug.md), [Russain](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/debug.md), [Simplified Chinese](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/debug.md), [French](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/debug.md) and [German](https://github.com/BoostIO/Boostnote/blob/master/docs/de/debug.md).
+This page is also available in [Japanese](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/debug.md), [Korean](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/debug.md), [Russain](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/debug.md), [Simplified Chinese](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/debug.md), [French](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/debug.md) and [German](https://github.com/BoostIO/Boostnote/blob/add-german-documents/docs/de/debug.md).

 Boostnote is an Electron app so it's based on Chromium; developers can use `Developer Tools` just like Google Chrome.

--- a/docs/fr/build.md
+++ b/docs/fr/build.md
@@ -1,5 +1,5 @@
 # Build
-Cette page est également disponible en [Angalis](https://github.com/BoostIO/Boostnote/blob/master/docs/build.md), [Japonais](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/build.md), [Coréen](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/build.md), [Russe](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/build.md), [Chinois Simplifié](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/build.md) et en [Allemand](https://github.com/BoostIO/Boostnote/blob/master/docs/de/build.md)
+Cette page est également disponible en [Japonais](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/build.md), [Coréen](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/build.md), [Russe](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/build.md), et en [Chinois Simplifié](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/build.md).

 ## Environnements
 * npm: 4.x
--- a/docs/fr/debug.md
+++ b/docs/fr/debug.md
@@ -1,5 +1,5 @@
 # Comment débugger Boostnote (Application Electron)
-Cette page est également disponible en [Angalis](https://github.com/BoostIO/Boostnote/blob/master/docs/debug.md), [Japonais](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/debug.md), [Coréen](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/debug.md), [Russe](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/debug.md), [Chinois Simplifié](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/debug.md) et en [Allemand](https://github.com/BoostIO/Boostnote/blob/master/docs/de/debug.md)
+Cette page est également disponible en [Japonais](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/debug.md), [Coréen](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/debug.md), [Russe](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/debug.md), et en [Chinois Simplifié](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/debug.md)

 Boostnote est une application Electron donc basée sur Chromium. Il est possible d'utiliser les `Developer Tools` comme dans Google Chrome.

@@ -19,4 +19,4 @@ Par exemple, vous pouvez utiliser le `debugger` pour placer un point d'arrêt da
 C'est une façon comme une autre de faire, vous pouvez trouver une façon de débugger que vous trouverez plus adaptée.

 ## Références
-* [Documentation officiel de Google Chrome sur le debugging](https://developer.chrome.com/devtools)
+* [Documentation officiel de Google Chrome sur le debugging](https://developer.chrome.com/devtools)
--- a/docs/zh_TW/build.md
+++ b/docs/zh_TW/build.md
@@ -1,86 +0,0 @@
-# 編譯
-此文件還提供下列的語言 [日文](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/build.md), [韓文](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/build.md), [俄文](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/build.md), [簡體中文](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/build.md), [法文](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/build.md) and [德文](https://github.com/BoostIO/Boostnote/blob/master/docs/de/build.md).
-
-## 環境
-* npm: 4.x
-* node: 7.x
-
-`$ grunt pre-build` 在 `npm v5.x` 有問題，所以只能用 `npm v4.x` 。
-
-## 開發
-
-我們使用 Webpack HMR 來開發 Boostnote。
-
-在專案根目錄底下執行下列指令，將會以原始設置啟動 Boostnote。
-
-**用 yarn 來安裝必要 packages**
-
-```bash
-$ yarn
-```
-
-**開始開發**
-
-```
-$ yarn run dev-start
-```
-
-上述指令同時運行了 `yarn run webpack` 及 `yarn run hot`，相當於將這兩個指令在不同的 terminal 中運行。
-
-`webpack` 會同時監控修改過的程式碼，並
-The `webpack` will watch for code changes and then apply them automatically.
-
-If the following error occurs: `Failed to load resource: net::ERR_CONNECTION_REFUSED`, please reload Boostnote.
-
-![net::ERR_CONNECTION_REFUSED](https://cloud.githubusercontent.com/assets/11307908/24343004/081e66ae-1279-11e7-8d9e-7f478043d835.png)
-
-> ### Notice
-> There are some cases where you have to refresh the app manually.
-> 1. When editing a constructor method of a component
-> 2. When adding a new css class (similar to 1: the CSS class is re-written by each component. This process occurs at the Constructor method.)
-
-## Deploy
-
-We use Grunt to automate deployment.
-You can build the program by using `grunt`. However, we don't recommend this because the default task includes codesign and authenticode.
-
-So, we've prepared a separate script which just makes an executable file.
-
-This build doesn't work on npm v5.3.0. So you need to use v5.2.0 when you build it.
-
-```
-grunt pre-build
-```
-
-You will find the executable in the `dist` directory. Note, the auto updater won't work because the app isn't signed.
-
-If you find it necessary, you can use codesign or authenticode with this executable.
-
-## Make own distribution packages (deb, rpm)
-
-Distribution packages are created by exec `grunt build` on Linux platform (e.g. Ubuntu, Fedora).
-
-> Note: You can create both `.deb` and `.rpm` in a single environment.
-
-After installing the supported version of `node` and `npm`, install build dependency packages.
-
-
-Ubuntu/Debian:
-
-```
-$ sudo apt-get install -y rpm fakeroot
-```
-
-Fedora:
-
-```
-$ sudo dnf install -y dpkg dpkg-dev rpm-build fakeroot
-```
-
-Then execute `grunt build`.
-
-```
-$ grunt build
-```
-
-You will find `.deb` and `.rpm` in the `dist` directory.
--- a/extra_scripts/boost/boostNewLineIndentContinueMarkdownList.js
+++ b/extra_scripts/boost/boostNewLineIndentContinueMarkdownList.js
@@ -1,52 +0,0 @@
-(function (mod) {
-  if (typeof exports === 'object' && typeof module === 'object') { // Common JS
-    mod(require('../codemirror/lib/codemirror'))
-  } else if (typeof define === 'function' && define.amd) { // AMD
-    define(['../codemirror/lib/codemirror'], mod)
-  } else { // Plain browser env
-    mod(CodeMirror)
-  }
-})(function (CodeMirror) {
-  'use strict'
-
-  var listRE = /^(\s*)(>[> ]*|[*+-] \[[x ]\]\s|[*+-]\s|(\d+)([.)]))(\s*)/
-  var emptyListRE = /^(\s*)(>[> ]*|[*+-] \[[x ]\]|[*+-]|(\d+)[.)])(\s*)$/
-  var unorderedListRE = /[*+-]\s/
-
-  CodeMirror.commands.boostNewLineAndIndentContinueMarkdownList = function (cm) {
-    if (cm.getOption('disableInput')) return CodeMirror.Pass
-    var ranges = cm.listSelections()
-    var replacements = []
-    for (var i = 0; i < ranges.length; i++) {
-      var pos = ranges[i].head
-      var eolState = cm.getStateAfter(pos.line)
-      var inList = eolState.list !== false
-      var inQuote = eolState.quote !== 0
-      var line = cm.getLine(pos.line)
-      var match = listRE.exec(line)
-      if (!ranges[i].empty() || (!inList && !inQuote) || !match || pos.ch < match[2].length - 1) {
-        cm.execCommand('newlineAndIndent')
-        return
-      }
-      if (emptyListRE.test(line)) {
-        if (!/>\s*$/.test(line)) {
-          cm.replaceRange('', {
-            line: pos.line, ch: 0
-          }, {
-            line: pos.line, ch: pos.ch + 1
-          })
-        }
-        replacements[i] = '\n'
-      } else {
-        var indent = match[1]
-        var after = match[5]
-        var bullet = unorderedListRE.test(match[2]) || match[2].indexOf('>') >= 0
-          ? match[2].replace('x', ' ')
-          : (parseInt(match[3], 10) + 1) + match[4]
-        replacements[i] = '\n' + indent + bullet + after
-      }
-    }
-
-    cm.replaceSelections(replacements)
-  }
-})
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -19,7 +19,7 @@ module.exports = function (grunt) {
  var initConfig = {
    pkg: grunt.file.readJSON('package.json'),
    'create-windows-installer': {
-      x64: {
+      ia32: {
        appDirectory: path.join(__dirname, 'dist', 'Boostnote-win32-x64'),
        outputDirectory: path.join(__dirname, 'dist'),
        authors: 'MAISIN&CO., Inc.',
@@ -109,7 +109,7 @@ module.exports = function (grunt) {
    var done = this.async()
    var opts = {
      name: 'Boostnote',
-      arch: 'x64',
+      arch: 'ia32',
      dir: __dirname,
      version: grunt.config.get('pkg.config.electron-version'),
      'app-version': grunt.config.get('pkg.version'),
--- a/lib/main-menu.js
+++ b/lib/main-menu.js
@@ -1,7 +1,6 @@
 const electron = require('electron')
 const BrowserWindow = electron.BrowserWindow
 const shell = electron.shell
-const ipc = electron.ipcMain
 const mainWindow = require('./main-window')

 const macOS = process.platform === 'darwin'
@@ -260,23 +259,6 @@ const view = {
  ]
 }

-let editorFocused
-
-// Define extra shortcut keys
-mainWindow.webContents.on('before-input-event', (event, input) => {
-  // Synonyms for Search (Find)
-  if (input.control && input.key === 'f' && input.type === 'keyDown') {
-    if (!editorFocused) {
-      mainWindow.webContents.send('top:focus-search')
-      event.preventDefault()
-    }
-  }
-})
-
-ipc.on('editor:focused', (event, isFocused) => {
-  editorFocused = isFocused
-})
-
 const window = {
  label: 'Window',
  submenu: [
@@ -285,11 +267,6 @@ const window = {
      accelerator: 'Command+M',
      selector: 'performMiniaturize:'
    },
-    {
-      label: 'Toggle Full Screen',
-      accelerator: 'Command+Control+F',
-      selector: 'toggleFullScreen:'
-    },
    {
      label: 'Close',
      accelerator: 'Command+W',
--- a/lib/main.html
+++ b/lib/main.html
@@ -78,7 +78,7 @@
  <script src="../node_modules/codemirror/keymap/emacs.js"></script>
  <script src="../node_modules/codemirror/addon/runmode/runmode.js"></script>

-  <script src="../extra_scripts/boost/boostNewLineIndentContinueMarkdownList.js"></script>
+  <script src="../node_modules/codemirror/addon/edit/continuelist.js"></script>

  <script src="../node_modules/codemirror/addon/edit/closebrackets.js"></script>

--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "boost",
  "productName": "Boostnote",
-  "version": "0.11.2",
+  "version": "0.9.0",
  "main": "index.js",
  "description": "Boostnote",
  "license": "GPL-3.0",
@@ -56,12 +56,12 @@
    "codemirror-mode-elixir": "^1.1.1",
    "electron-config": "^0.2.1",
    "electron-gh-releases": "^2.0.2",
+    "electron-windows-installer": "^1.7.8",
    "flowchart.js": "^1.6.5",
    "font-awesome": "^4.3.0",
-    "iconv-lite": "^0.4.19",
    "immutable": "^3.8.1",
    "js-sequence-diagrams": "^1000000.0.6",
-    "katex": "^0.9.0",
+    "katex": "^0.8.3",
    "lodash": "^4.11.1",
    "lodash-move": "^1.1.1",
    "markdown-it": "^6.0.1",
@@ -85,11 +85,9 @@
    "react-sortable-hoc": "^0.6.7",
    "redux": "^3.5.2",
    "sander": "^0.5.1",
-    "sanitize-html": "^1.18.2",
    "striptags": "^2.2.1",
    "superagent": "^1.2.0",
-    "superagent-promise": "^1.0.3",
-    "uuid": "^3.2.1"
+    "superagent-promise": "^1.0.3"
  },
  "devDependencies": {
    "ava": "^0.16.0",
@@ -116,6 +114,7 @@
    "faker": "^3.1.0",
    "grunt": "^0.4.5",
    "grunt-electron-installer": "2.1.0",
+    "gulp": "^3.9.1",
    "history": "^1.17.0",
    "jsdom": "^9.4.2",
    "json-loader": "^0.5.4",
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,4 @@
-:mega: We've launched a blogging platform with markdown called **[Boostlog](https://boostlog.io/)**.
+:mega: Open sourcing our [Android and iOS apps](https://github.com/BoostIO/Boostnote-mobile)!

 ![Boostnote app screenshot](./resources/repository/top.png)

@@ -25,8 +25,8 @@ Boostnote is an open source project. It's an independent project with its ongoin
 ## Community
 - [Facebook Group](https://www.facebook.com/groups/boostnote/)
 - [Twitter](https://twitter.com/boostnoteapp)
- [Slack Group](https://join.slack.com/t/boostnote-group/shared_invite/enQtMzI3NTIxMTQzMTQzLTUyYWZmZWM1YzcwYzQ5OWQ5YzA3Y2M2NzUzNmIwNzYzMjg5NmQyOGJlNzcyZDJhMGY0ZDc0ZjdlZDFhMDdiMWE)
- [Blog](https://boostlog.io/tags/boostnote)
+- [Slack Group](https://join.slack.com/t/boostnote-group/shared_invite/enQtMzAzMjI1MTIyNTQ3LTc2MjNiYWU3NTc1YjZlMTk3NzFmOWE1ZWU1MGRhMzBkMGIwMWFjOWMxMDRiM2I2NzkzYzc4OGZhNmVhZjYzZTM)
+- [Blog](https://medium.com/boostnote)
 - [Reddit](https://www.reddit.com/r/Boostnote/)


--- a/tests/fixtures/TestDummy.js
+++ b/tests/fixtures/TestDummy.js
@@ -22,7 +22,7 @@ function dummyBoostnoteJSONData (override = {}, isLegacy = false) {
  if (override.folders == null) {
    data.folders = []

-    var folderCount = Math.floor((Math.random() * 5)) + 2
+    var folderCount = Math.floor((Math.random() * 5)) + 1
    for (var i = 0; i < folderCount; i++) {
      var key = keygen()
      while (data.folders.some((folder) => folder.key === key)) {
@@ -105,11 +105,11 @@ function dummyStorage (storagePath, override = {}) {

  sander.writeFileSync(path.join(storagePath, 'boostnote.json'), JSON.stringify(jsonData))
  var notesData = []
-  var noteCount = Math.floor((Math.random() * 15)) + 2
+  var noteCount = Math.floor((Math.random() * 15)) + 1
  for (var i = 0; i < noteCount; i++) {
-    var key = keygen(true)
+    var key = keygen()
    while (notesData.some((note) => note.key === key)) {
-      key = keygen(true)
+      key = keygen()
    }

    var noteData = dummyNote({
@@ -149,9 +149,9 @@ function dummyLegacyStorage (storagePath, override = {}) {
    var folderNotes = []
    var noteCount = Math.floor((Math.random() * 5)) + 1
    for (var i = 0; i < noteCount; i++) {
-      var key = keygen(true)
+      var key = keygen(6)
      while (folderNotes.some((note) => note.key === key)) {
-        key = keygen(true)
+        key = keygen(6)
      }

      var noteData = dummyNote({
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Masahide Morio	9d98f0cb03	for v0.9	2018-02-04 05:51:39 +09:00
Masahide Morio	3503233631	Merge remote-tracking branch 'upstream/master'	2018-02-04 05:40:24 +09:00
Masahide Morio	c39393c453	for Windows 32bit	2018-02-04 05:40:15 +09:00
Masahide Morio	564cc80ef7	for Windows 32bit	2018-01-17 01:01:45 +09:00
Masahide.MORIO	77f7144fbf	test	2018-01-16 10:01:20 +09:00