diff --git a/plugins.md b/plugins.md
index 040d48cc66acce67e10aae0b4908736af15f9227..d9dd38d9baef2b661b6fffd5fe718b04a70b1bf3 100644
--- a/plugins.md
+++ b/plugins.md
@@ -165,7 +165,7 @@ Since Ion does not support autocompletion via plugins, a lot of oh-my-zsh plugin
 |--------------------------+--------------------------------|
 | fedora                   | Not happening                  |
 |--------------------------+--------------------------------|
-| firewalld                | Planned                        |
+| firewalld                | Done                           |
 |--------------------------+--------------------------------|
 | forklift                 | Not sure                       |
 |--------------------------+--------------------------------|
diff --git a/tools/firewalld.ion b/tools/firewalld.ion
new file mode 100644
index 0000000000000000000000000000000000000000..2de250265a100b3bdfc0bcb7be2647034306fd74
--- /dev/null
+++ b/tools/firewalld.ion
@@ -0,0 +1,18 @@
+# This plugin adds some aliases and functions for FirewallD using the `firewalld-cmd` command
+
+alias fw = 'sudo firewall-cmd'
+alias fwp = 'sudo firewall-cmd --permanent'
+alias fwr = 'sudo firewall-cmd --reload'
+alias fwrp = 'sudo firewall-cmd --runtime-to-permanent'
+
+fn fwl
+  # converts output to zsh array ()
+  let zones = @split($(sudo firewall-cmd --get-active-zones | grep -v 'interfaces\|sources') '\n')
+
+  for i in @zones
+    sudo firewall-cmd --zone $i --list-all
+  end
+
+  echo 'Direct Rules:'
+  sudo firewall-cmd --direct --get-all-rules
+end
diff --git a/tools/frontend-search.ion b/tools/frontend-search.ion
index 67dfab758d97a7506f8c50a4a3fd461ecdfecf71..26a4ededda6b70a6d9e6ee0e5097841c0be7ff39 100644
--- a/tools/frontend-search.ion
+++ b/tools/frontend-search.ion
@@ -29,34 +29,34 @@ alias vuejs='frontend vuejs'
 
 # define search context URLS
 let _frontend_urls:hmap[str] = [
-  angular       = 'https://angular.io/?search=' \
-  angularjs     = 'https://google.com/search?as_sitesearch=angularjs.org&as_q=' \
-  bem           = 'https://google.com/search?as_sitesearch=bem.info&as_q=' \
-  bootsnipp     = 'https://bootsnipp.com/search?q=' \
-  bundlephobia  = 'https://bundlephobia.com/result?p=' \
-  caniuse       = 'https://caniuse.com/#search=' \
-  codepen       = 'https://codepen.io/search?q=' \
-  compassdoc    = 'http://compass-style.org/search?q=' \
-  cssflow       = 'http://www.cssflow.com/search?q=' \
-  dartlang      = 'https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:' \
-  emberjs       = 'https://www.google.com/search?as_sitesearch=emberjs.com/&as_q=' \
-  flowtype      = 'https://google.com/search?as_sitesearch=flow.org/en/docs/&as_q=' \
-  fontello      = 'http://fontello.com/#search=' \
-  github        = 'https://github.com/search?q=' \
-  html5please   = 'https://html5please.com/#' \
-  jestjs        = 'https://www.google.com/search?as_sitesearch=jestjs.io&as_q=' \
-  jquery        = 'https://api.jquery.com/?s=' \
-  lodash        = 'https://devdocs.io/lodash/index#' \
-  mdn           = 'https://developer.mozilla.org/search?q=' \
-  nodejs        = 'https://www.google.com/search?as_sitesearch=nodejs.org/en/docs/&as_q=' \
-  npmjs         = 'https://www.npmjs.com/search?q=' \
-  qunit         = 'https://api.qunitjs.com/?s=' \
-  reactjs       = 'https://google.com/search?as_sitesearch=facebook.github.io/react&as_q=' \
-  smacss        = 'https://google.com/search?as_sitesearch=smacss.com&as_q=' \
-  stackoverflow = 'https://stackoverflow.com/search?q=' \
-  typescript    = 'https://google.com/search?as_sitesearch=www.typescriptlang.org/docs&as_q=' \
-  unheap        = 'http://www.unheap.com/?s=' \
-  vuejs         = 'https://www.google.com/search?as_sitesearch=vuejs.org&as_q=' \
+  angular='https://angular.io/?search=' \
+  angularjs='https://google.com/search?as_sitesearch=angularjs.org&as_q=' \
+  bem='https://google.com/search?as_sitesearch=bem.info&as_q=' \
+  bootsnipp='https://bootsnipp.com/search?q=' \
+  bundlephobia='https://bundlephobia.com/result?p=' \
+  caniuse='https://caniuse.com/#search=' \
+  codepen='https://codepen.io/search?q=' \
+  compassdoc='http://compass-style.org/search?q=' \
+  cssflow='http://www.cssflow.com/search?q=' \
+  dartlang='https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:' \
+  emberjs='https://www.google.com/search?as_sitesearch=emberjs.com/&as_q=' \
+  flowtype='https://google.com/search?as_sitesearch=flow.org/en/docs/&as_q=' \
+  fontello='http://fontello.com/#search=' \
+  github='https://github.com/search?q=' \
+  html5please='https://html5please.com/#' \
+  jestjs='https://www.google.com/search?as_sitesearch=jestjs.io&as_q=' \
+  jquery='https://api.jquery.com/?s=' \
+  lodash='https://devdocs.io/lodash/index#' \
+  mdn='https://developer.mozilla.org/search?q=' \
+  nodejs='https://www.google.com/search?as_sitesearch=nodejs.org/en/docs/&as_q=' \
+  npmjs='https://www.npmjs.com/search?q=' \
+  qunit='https://api.qunitjs.com/?s=' \
+  reactjs='https://google.com/search?as_sitesearch=facebook.github.io/react&as_q=' \
+  smacss='https://google.com/search?as_sitesearch=smacss.com&as_q=' \
+  stackoverflow='https://stackoverflow.com/search?q=' \
+  typescript='https://google.com/search?as_sitesearch=www.typescriptlang.org/docs&as_q=' \
+  unheap='http://www.unheap.com/?s=' \
+  vuejs='https://www.google.com/search?as_sitesearch=vuejs.org&as_q=' \
 ]
 
 fn frontend engine:str terms:[str]
@@ -82,4 +82,4 @@ fn frontend engine:str terms:[str]
 
   # TODO: open_command like zsh
   xdg-open "$url"
-}
+end