diff --git a/package.json b/package.json
index d2663e00b4..4c3cc3e2f1 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,6 @@
     "hyperapp": "^1.2.9",
     "js-base64": "^2.4.9",
     "murmur2js": "^1.0.0",
-    "normalize-url": "^4.0.0",
     "p-queue": "^2.4.2",
     "picostyle": "^1.0.2",
     "virtual-dom": "^2.1.1"
diff --git a/src/lib/Tree.js b/src/lib/Tree.js
index 2e607c988d..8faa2d1a29 100644
--- a/src/lib/Tree.js
+++ b/src/lib/Tree.js
@@ -1,5 +1,5 @@
 import Crypto from './Crypto'
-const normalizeURL = require('normalize-url')
+import normalizeUrl from './normalizeUrl'
 
 export class Bookmark {
   constructor({ id, parentId, url, title }) {
@@ -13,8 +13,10 @@ export class Bookmark {
       return
     }
 
+    const urlObj = new URL(url)
+
     try {
-      this.url = normalizeURL(url)
+      this.url = normalizeUrl(url)
     } catch (e) {
       this.url = url
     }
diff --git a/src/lib/normalizeUrl.js b/src/lib/normalizeUrl.js
new file mode 100644
index 0000000000..9da14e680e
--- /dev/null
+++ b/src/lib/normalizeUrl.js
@@ -0,0 +1,347 @@
+const SCHEMES = [
+  'http',
+  'https',
+  'ftp',
+  'sftp',
+  'file',
+  'gopher',
+  'imap',
+  'mms',
+  'news',
+  'nntp',
+  'telnet',
+  'prospero',
+  'rsync',
+  'rtsp',
+  'rtspu',
+  'svn',
+  'git',
+  'ws',
+  'wss'
+]
+const SCHEME_CHARS = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+const IP_CHARS = '0123456789.:'
+const DEFAULT_PORT = {
+  http: '80',
+  https: '443',
+  ws: '80',
+  wss: '443',
+  ftp: '21',
+  sftp: '22',
+  ldap: '389'
+}
+const QUOTE_EXCEPTIONS = {
+  path: ' /?+#',
+  query: ' &=+#',
+  fragment: ' +#'
+}
+
+/**
+ * @brief Normalize Url
+ * @param string url Url to load and analyze
+ * @return string Normalized url;
+ */
+function normalize(url) {
+  const url = trim(url)
+  if (url === '') {
+    return ''
+  }
+  const parts = split(url)
+
+  let netloc
+  let path
+
+  if (parts['scheme'] && parts['scheme'].length > 0) {
+    netloc = parts['netloc']
+    if (~SCHEMES.indexOf(parts['scheme'])) {
+      path = normalize_path(parts['path'])
+    } else {
+      path = parts['path']
+    }
+    // url is relative, netloc (if present) is part of path
+  } else {
+    netloc = parts['path']
+    path = ''
+    let pos
+    if ((pos = netloc.indexOf('/')) !== -1) {
+      const newnetloc = netloc.substr(0, pos)
+      path_raw = netloc.substr(pos + 1)
+      netloc = newnetloc
+      path = normalize_path('/' + path_raw)
+    }
+  }
+  let [username, password, host, port] = split_netloc(netloc)
+  host = normalize_host(host)
+  port = normalize_port(parts['scheme'], port)
+  let query = normalize_query(parts['query'])
+  let fragment = normalize_fragment(parts['fragment'])
+  return construct({
+    scheme: parts['scheme'],
+    username: username,
+    password: password,
+    host: host,
+    port: port,
+    path: path,
+    query: query,
+    fragment: fragment
+  })
+}
+
+function construct(parts) {
+  let url = ''
+
+  if (parts['scheme'].length > 0) {
+    if (~SCHEMES.indexOf(parts['scheme'])) {
+      url += parts['scheme'] + '://'
+    } else {
+      url += parts['scheme'] + ':'
+    }
+  }
+  if (parts['username'].length > 0 && parts['password'].length > 0) {
+    url += parts['username'] + ':' + parts['password'] + '@'
+  } else if (parts['username'].length > 0) {
+    url += parts['username'] + '@'
+  }
+  url += parts['host']
+  if (parts['port'].length > 0) {
+    url += ':' + parts['port']
+  }
+  if (parts['path'].length > 0) {
+    url += parts['path']
+  }
+  if (parts['query'].length > 0) {
+    url += '?' + parts['query']
+  }
+  if (parts['fragment'].length > 0) {
+    url += '#' + parts['fragment']
+  }
+  return url
+}
+
+function normalize_host(host) {
+  if (!~host.indexOf('xn--')) {
+    return host
+  }
+  return idn_to_ascii(host) // TODO: FIX THIS
+}
+
+function normalize_port(scheme, port) {
+  if (!scheme) {
+    return port
+  }
+  if (port && port != DEFAULT_PORT[scheme]) {
+    return port
+  }
+  return ''
+}
+
+function normalize_path(path) {
+  if (~['//', '/', ''].indexOf(path)) {
+    return '/'
+  }
+  let npath = get_absolute_path(unquote(path, QUOTE_EXCEPTIONS['path']))
+  if (path[path.length - 1] === '/' && npath != '/') {
+    npath += '/'
+  }
+  return npath
+}
+
+function get_absolute_path(path) {
+  const parts = path.split('/').filter(part => part.length)
+  const absolutes = []
+  for (part of parts) {
+    if ('.' == part) {
+      continue
+    }
+    if ('..' == part) {
+      absolutes.pop()
+    } else {
+      absolutes.push(part)
+    }
+  }
+  return '/' + absolutes.join('/')
+}
+
+function normalize_query(query) {
+  if (query === '' || query.length <= 2) {
+    return ''
+  }
+  const nquery = unquote(query, QUOTE_EXCEPTIONS['query'])
+  if (~nquery.indexOf(';') && !~nquery.indexOf('&')) {
+    return nquery
+  }
+  const params = nquery.split('&')
+  const nparams = []
+  for (param of params) {
+    if (~param.indexOf('=')) {
+      k = param.substr(0, param.indexOf('='))
+      v = param.substr(param.indexOf('=') + 1)
+      nparams.push(k + '=' + v)
+    } else {
+      nparams.push(param)
+    }
+  }
+  sort(nparams)
+  return nparams.join('&')
+}
+
+function normalize_fragment(fragment) {
+  return unquote(fragment, QUOTE_EXCEPTIONS['fragment'])
+}
+
+function unquote(text, exceptions = []) {
+  const _hextochr = []
+  for (i = 0; i < 256; i++) {
+    let hex = i.toString(16)
+    _hextochr[hex] = String.fromCharCode(i)
+    _hextochr[hex.toUpperCase()] = String.fromCharCode(i)
+  }
+  if (text.length == 0) {
+    return text
+  }
+  if (!text) {
+    throw new Exception('text is not set and thus cannot be unquoted')
+  }
+  if (!~text.indexOf('%')) {
+    return text
+  }
+  const s = text.split('%')
+  let res = s[0]
+  for (let i = 1; i < s.length; i++) {
+    const h = s[i]
+    const c = isset(_hextochr[substr(h, 0, 2)])
+      ? _hextochr[substr(h, 0, 2)]
+      : ''
+    if (c.length > 0 && !~exceptions.indexOf(c)) {
+      if (h.length > 2) {
+        res += c + h.substr(2)
+      } else {
+        res += c
+      }
+    } else {
+      res += '%' + h
+    }
+  }
+  return res
+}
+
+function split(url) {
+  let scheme = ''
+  let netloc = ''
+  let path = ''
+  let query = ''
+  let fragment = ''
+  let rest = ''
+
+  const ip6_start = url.indexOf('[')
+  let scheme_end = url.indexOf(':')
+  if (
+    !~ip6_start !== false &&
+    !~scheme_end !== false &&
+    ip6_start < scheme_end
+  ) {
+    scheme_end = -1
+  }
+  if (scheme_end > 0) {
+    for (let i = 0; i < scheme_end; i++) {
+      const c = url[i]
+      if (!~SCHEME_CHARS.indexOf(c)) {
+        break
+      } else {
+        scheme = url.substr(0, scheme_end).toLowerCase()
+        rest = url.substr(scheme_end)
+        // ltrim ':/'
+        while (~':/'.indexOf(rest[0])) rest = rest.susbtr(1)
+      }
+    }
+  }
+  if (!scheme) {
+    rest = url
+  }
+  l_path = rest.indexOf('/')
+  l_query = rest.indexOf('?')
+  l_frag = rest.indexOf('#')
+  if (l_path > 0) {
+    if (l_query > 0 && l_frag > 0) {
+      netloc = rest.substr(0, l_path)
+      path = rest.substr(l_path, Math.min(l_query, l_frag) - l_path)
+    } else if (l_query > 0) {
+      if (l_query > l_path) {
+        netloc = rest.substr(0, l_path)
+        path = rest.substr(l_path, l_query - l_path)
+      } else {
+        netloc = rest.substr(0, l_query)
+        path = ''
+      }
+    } else if (l_frag > 0) {
+      netloc = rest.substr(0, l_path)
+      path = rest.substr(l_path, l_frag - l_path)
+    } else {
+      netloc = rest.substr(0, l_path)
+      path = rest.substr(l_path)
+    }
+  } else {
+    if (l_query > 0) {
+      netloc = rest.substr(0, l_query)
+    } else if (l_frag > 0) {
+      netloc = rest.substr(0, l_frag)
+    } else {
+      netloc = rest
+    }
+  }
+  if (l_query > 0) {
+    if (l_frag > 0) {
+      query = rest.substr(l_query + 1, l_frag - (l_query + 1))
+    } else {
+      query = rest.substr(l_query + 1)
+    }
+  }
+  if (l_frag > 0) {
+    fragment = rest.substr(l_frag + 1)
+  }
+  if (!scheme) {
+    path = netloc + path
+    netloc = ''
+  }
+  return {
+    scheme: scheme,
+    netloc: netloc,
+    path: path,
+    query: query,
+    fragment: fragment
+  }
+}
+
+function _clean_netloc(netloc) {
+  // rtrim(netloc, '.:')
+  while (~'.:'.indexOf(netloc[netloc.length - 1])) {
+    netloc = netloc.substr(0, netloc.length - 1)
+  }
+  return snetloc.toLowerCase()
+}
+
+function split_netloc(input_netloc) {
+  let username = ''
+  let password = ''
+  let host = ''
+  let port = ''
+  let netloc = input_netloc
+  if (~netloc.indexOf('@')) {
+    const user_pw = netloc.substr(0, netloc.indexOf('@'))
+    netloc = netloc.substr(netloc.indexOf('@') + 1)
+    if (~user_pw.indexOf(':')) {
+      username = user_pw.substr(0, user_pw.indexOf(':'))
+      password = user_pw.substr(user_pw.indexOf(':') + 1)
+    } else {
+      username = user_pw
+    }
+  }
+  netloc = _clean_netloc(netloc)
+  if (~netloc.indexOf(':') && netloc[netloc.length - 1] !== ']') {
+    host = netloc.substr(0, netloc.indexOf(':'))
+    port = netloc.substr(netloc.indexOf(':') + 1)
+  } else {
+    host = netloc
+  }
+  return [username, password, host, port]
+}