diff --git a/oni-org/icons/bs-building.svg b/oni-org/icons/bs-building.svg
new file mode 100644
index 0000000..eb90b93
--- /dev/null
+++ b/oni-org/icons/bs-building.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-building" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M14.763.075A.5.5 0 0 1 15 .5v15a.5.5 0 0 1-.5.5h-3a.5.5 0 0 1-.5-.5V14h-1v1.5a.5.5 0 0 1-.5.5h-9a.5.5 0 0 1-.5-.5V10a.5.5 0 0 1 .342-.474L6 7.64V4.5a.5.5 0 0 1 .276-.447l8-4a.5.5 0 0 1 .487.022zM6 8.694 1 10.36V15h5V8.694zM7 15h2v-1.5a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5V15h2V1.309l-7 3.5V15z"/>
+  <path d="M2 11h1v1H2v-1zm2 0h1v1H4v-1zm-2 2h1v1H2v-1zm2 0h1v1H4v-1zm4-4h1v1H8V9zm2 0h1v1h-1V9zm-2 2h1v1H8v-1zm2 0h1v1h-1v-1zm2-2h1v1h-1V9zm0 2h1v1h-1v-1zM8 7h1v1H8V7zm2 0h1v1h-1V7zm2 0h1v1h-1V7zM8 5h1v1H8V5zm2 0h1v1h-1V5zm2 0h1v1h-1V5zm0-2h1v1h-1V3z"/>
+</svg>
\ No newline at end of file
diff --git a/oni-org/icons/bs-kanban.svg b/oni-org/icons/bs-kanban.svg
new file mode 100644
index 0000000..c5cdaaf
--- /dev/null
+++ b/oni-org/icons/bs-kanban.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-kanban" viewBox="0 0 16 16">
+  <path d="M13.5 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1h-11a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h11zm-11-1a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h11a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2h-11z"/>
+  <path d="M6.5 3a1 1 0 0 1 1-1h1a1 1 0 0 1 1 1v3a1 1 0 0 1-1 1h-1a1 1 0 0 1-1-1V3zm-4 0a1 1 0 0 1 1-1h1a1 1 0 0 1 1 1v7a1 1 0 0 1-1 1h-1a1 1 0 0 1-1-1V3zm8 0a1 1 0 0 1 1-1h1a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1h-1a1 1 0 0 1-1-1V3z"/>
+</svg>
\ No newline at end of file
diff --git a/oni-org/icons/bx-bug.svg b/oni-org/icons/bx-bug.svg
new file mode 100644
index 0000000..d24b78c
--- /dev/null
+++ b/oni-org/icons/bx-bug.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M16.895,6.519l2.813-2.812l-1.414-1.414l-2.846,2.846c-0.233-0.166-0.473-0.321-0.723-0.454 c-1.723-0.91-3.726-0.911-5.45,0c-0.25,0.132-0.488,0.287-0.722,0.453L5.707,2.293L4.293,3.707l2.813,2.812 C6.53,7.242,6.08,8.079,5.756,9H2v2h2.307C4.242,11.495,4.2,11.997,4.2,12.5c0,0.507,0.042,1.013,0.107,1.511H2v2h2.753 c0.013,0.039,0.021,0.08,0.034,0.118c0.188,0.555,0.421,1.093,0.695,1.6c0.044,0.081,0.095,0.155,0.141,0.234l-2.33,2.33 l1.414,1.414l2.11-2.111c0.235,0.254,0.478,0.498,0.736,0.716c0.418,0.354,0.867,0.657,1.332,0.903 c0.479,0.253,0.982,0.449,1.496,0.58C10.911,21.931,11.455,22,12,22s1.089-0.069,1.618-0.204c0.514-0.131,1.017-0.327,1.496-0.58 c0.465-0.246,0.914-0.55,1.333-0.904c0.258-0.218,0.5-0.462,0.734-0.716l2.111,2.111l1.414-1.414l-2.33-2.33 c0.047-0.08,0.098-0.155,0.142-0.236c0.273-0.505,0.507-1.043,0.694-1.599c0.013-0.039,0.021-0.079,0.034-0.118H22v-2h-2.308 c0.065-0.499,0.107-1.004,0.107-1.511c0-0.503-0.042-1.005-0.106-1.5H22V9h-3.756C17.92,8.079,17.47,7.242,16.895,6.519z M8.681,7.748c0.445-0.558,0.96-0.993,1.528-1.294c1.141-0.603,2.442-0.602,3.581,0c0.569,0.301,1.084,0.736,1.53,1.295 c0.299,0.373,0.54,0.8,0.753,1.251H7.927C8.141,8.549,8.381,8.121,8.681,7.748z M17.8,12.5c0,0.522-0.042,1.044-0.126,1.553 c-0.079,0.49-0.199,0.973-0.355,1.436c-0.151,0.449-0.34,0.882-0.559,1.288c-0.217,0.399-0.463,0.772-0.733,1.11 c-0.267,0.333-0.56,0.636-0.869,0.898c-0.31,0.261-0.639,0.484-0.979,0.664s-0.695,0.317-1.057,0.41 c-0.04,0.01-0.082,0.014-0.122,0.023V14h-2v5.881c-0.04-0.009-0.082-0.013-0.122-0.023c-0.361-0.093-0.717-0.23-1.057-0.41 s-0.669-0.403-0.978-0.664c-0.311-0.263-0.604-0.565-0.871-0.899c-0.27-0.337-0.516-0.71-0.731-1.108 c-0.22-0.407-0.408-0.84-0.56-1.289c-0.156-0.463-0.276-0.946-0.356-1.438C6.242,13.544,6.2,13.022,6.2,12.5 c0-0.505,0.041-1.009,0.119-1.5h11.361C17.759,11.491,17.8,11.995,17.8,12.5z"/></svg>
\ No newline at end of file
diff --git a/oni-org/icons/bx-desktop.svg b/oni-org/icons/bx-desktop.svg
new file mode 100644
index 0000000..8c2f85e
--- /dev/null
+++ b/oni-org/icons/bx-desktop.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20,3H4C2.897,3,2,3.897,2,5v11c0,1.103,0.897,2,2,2h7v2H8v2h3h2h3v-2h-3v-2h7c1.103,0,2-0.897,2-2V5 C22,3.897,21.103,3,20,3z M4,14V5h16l0.002,9H4z"/></svg>
\ No newline at end of file
diff --git a/oni-org/icons/bx-shopping-bag.svg b/oni-org/icons/bx-shopping-bag.svg
new file mode 100644
index 0000000..d60e83a
--- /dev/null
+++ b/oni-org/icons/bx-shopping-bag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M5,22h14c1.103,0,2-0.897,2-2V9c0-0.553-0.447-1-1-1h-3V7c0-2.757-2.243-5-5-5S7,4.243,7,7v1H4C3.447,8,3,8.447,3,9v11 C3,21.103,3.897,22,5,22z M9,7c0-1.654,1.346-3,3-3s3,1.346,3,3v1H9V7z M5,10h2v2h2v-2h6v2h2v-2h2l0.002,10H5V10z"/></svg>
\ No newline at end of file
diff --git a/oni-org/icons/bx-task.svg b/oni-org/icons/bx-task.svg
new file mode 100644
index 0000000..e613d6a
--- /dev/null
+++ b/oni-org/icons/bx-task.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M5,22h14c1.103,0,2-0.897,2-2V5c0-1.103-0.897-2-2-2h-2c0-0.553-0.447-1-1-1H8C7.447,2,7,2.447,7,3H5C3.897,3,3,3.897,3,5 v15C3,21.103,3.897,22,5,22z M5,5h2v2h10V5h2v15H5V5z"/><path d="M11 13.586L9.207 11.793 7.793 13.207 11 16.414 16.207 11.207 14.793 9.793z"/></svg>
\ No newline at end of file
diff --git a/oni-org/icons/bxs-book-content.svg b/oni-org/icons/bxs-book-content.svg
new file mode 100644
index 0000000..8c87e85
--- /dev/null
+++ b/oni-org/icons/bxs-book-content.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20,3H4C2.897,3,2,3.897,2,5v14c0,1.103,0.897,2,2,2h16c1.103,0,2-0.897,2-2V5C22,3.897,21.103,3,20,3z M19,7v2h-5V7H19z M14,11h5v2h-5V11z M4,19V5h7v14H4z"/></svg>
\ No newline at end of file
diff --git a/oni-org/icons/bxs-bulb.svg b/oni-org/icons/bxs-bulb.svg
new file mode 100644
index 0000000..b2793bc
--- /dev/null
+++ b/oni-org/icons/bxs-bulb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M9 20H15V22H9zM16.906 13.712C17.936 12.506 19 11.259 19 9c0-3.859-3.141-7-7-7S5 5.141 5 9c0 2.285 1.067 3.528 2.101 4.73.358.418.729.851 1.084 1.349.144.206.38.996.591 1.921H7.984v2h1.178 5.675 1.179v-2h-.79c.213-.927.45-1.719.593-1.925C16.171 14.572 16.545 14.135 16.906 13.712z"/></svg>
\ No newline at end of file
diff --git a/oni-org/icons/bxs-coffee.svg b/oni-org/icons/bxs-coffee.svg
new file mode 100644
index 0000000..2b82cf3
--- /dev/null
+++ b/oni-org/icons/bxs-coffee.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M5 2H7V5H5zM9 2H11V5H9zM13 2H15V5H13zM19 9h-2V8c0-.553-.447-1-1-1H4C3.447 7 3 7.447 3 8v10c0 1.657 1.343 3 3 3h8c1.657 0 3-1.343 3-3h2c1.103 0 2-.897 2-2v-5C21 9.897 20.103 9 19 9zM17 16v-5h2l.002 5H17z"/></svg>
\ No newline at end of file
diff --git a/oni-org/icons/bxs-game.svg b/oni-org/icons/bxs-game.svg
new file mode 100644
index 0000000..5dec3bf
--- /dev/null
+++ b/oni-org/icons/bxs-game.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12,22c3.719,0,7.063-2.035,8.809-5.314L13,12l7.809-4.686C19.063,4.035,15.719,2,12,2C6.486,2,2,6.486,2,12 S6.486,22,12,22z M11.5,6C12.328,6,13,6.672,13,7.5S12.328,9,11.5,9S10,8.328,10,7.5S10.672,6,11.5,6z"/></svg>
\ No newline at end of file
diff --git a/oni-org/icons/bxs-inbox.svg b/oni-org/icons/bxs-inbox.svg
new file mode 100644
index 0000000..92a8695
--- /dev/null
+++ b/oni-org/icons/bxs-inbox.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20,3H4C2.897,3,2,3.897,2,5v8v1v5c0,1.104,0.896,2,2,2h16c1.104,0,2-0.896,2-2v-5v-1V5C22,3.897,21.103,3,20,3z M19,12h-3 h-0.142c-0.446,1.722-1.997,3-3.858,3s-3.412-1.278-3.858-3H8H4V5h16v7H19z"/></svg>
\ No newline at end of file
diff --git a/oni-org/icons/bxs-music.svg b/oni-org/icons/bxs-music.svg
new file mode 100644
index 0000000..07f8cbe
--- /dev/null
+++ b/oni-org/icons/bxs-music.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M6,18.573c2.206,0,4-1.794,4-4V4.428L19,7.7v7.43c-0.591-0.345-1.269-0.557-2-0.557c-2.206,0-4,1.794-4,4s1.794,4,4,4 s4-1.794,4-4V7c0-0.421-0.263-0.796-0.658-0.939l-11-4c-0.308-0.113-0.648-0.067-0.915,0.12C8.159,2.368,8,2.674,8,3v8.13 c-0.591-0.345-1.269-0.557-2-0.557c-2.206,0-4,1.794-4,4S3.794,18.573,6,18.573z"/></svg>
\ No newline at end of file
diff --git a/oni-org/icons/bxs-truck.svg b/oni-org/icons/bxs-truck.svg
new file mode 100644
index 0000000..d5220a9
--- /dev/null
+++ b/oni-org/icons/bxs-truck.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M17.434 9L15 9 15 12 19.233 12z"/><circle fill="none" cx="16.5" cy="17.5" r="1.5"/><circle fill="none" cx="6.5" cy="17.5" r="1.5"/><path d="M19.148,7.971C18.789,7.372,18.132,7,17.434,7H15V5c0-0.553-0.447-1-1-1H4C2.897,4,2,4.897,2,6v10 c0,0.746,0.416,1.391,1.023,1.734C3.146,19.553,4.65,21,6.5,21c1.759,0,3.204-1.309,3.449-3h3.102c0.245,1.691,1.69,3,3.449,3 s3.204-1.309,3.449-3H20c1.103,0,2-0.897,2-2v-3c0-0.182-0.049-0.359-0.143-0.515L19.148,7.971z M15,9h2.434l1.8,3H15V9z M6.5,19 C5.673,19,5,18.327,5,17.5S5.673,16,6.5,16S8,16.673,8,17.5S7.327,19,6.5,19z M16.5,19c-0.827,0-1.5-0.673-1.5-1.5 s0.673-1.5,1.5-1.5s1.5,0.673,1.5,1.5S17.327,19,16.5,19z"/></svg>
\ No newline at end of file
diff --git a/oni-org/icons/emacs.svg b/oni-org/icons/emacs.svg
new file mode 100644
index 0000000..a2bc441
--- /dev/null
+++ b/oni-org/icons/emacs.svg
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xml:space="preserve"
+   id="svg4768"
+   viewBox="0.171 0.201 512 512"
+   height="48"
+   width="48"
+   version="1.0"><metadata
+     id="metadata70"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><!-- Gnu Emacs Icon
+   Copyright (C) 2008-2021 Free Software Foundation, Inc.
+
+   Author: Nicolas Petton <nicolas@petton.fr>
+
+   This file is part of GNU Emacs.
+
+   GNU Emacs is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   GNU Emacs is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+--><!-- Created with Inkscape (http://www.inkscape.org/) --><defs
+     id="defs4770"><linearGradient
+       id="linearGradient4292"><stop
+         id="stop4294"
+         offset="0"
+         style="stop-color:#411f5d;stop-opacity:1" /><stop
+         id="stop4296"
+         offset="1"
+         style="stop-color:#5b2a85;stop-opacity:1" /></linearGradient><linearGradient
+       id="linearGradient4284"><stop
+         offset="0"
+         style="stop-color:#8381c5;stop-opacity:1"
+         id="stop4286" /><stop
+         id="stop4290"
+         style="stop-color:#7e55b3;stop-opacity:0.99607843"
+         offset="0.56639391" /><stop
+         offset="1"
+         style="stop-color:#a52ecb;stop-opacity:0.99215686"
+         id="stop4288" /></linearGradient><linearGradient
+       id="linearGradient4898"><stop
+         id="stop4278"
+         style="stop-color:#bab8db;stop-opacity:1"
+         offset="0" /><stop
+         id="stop4280"
+         style="stop-color:#5955a9;stop-opacity:0.99159664"
+         offset="1" /></linearGradient><linearGradient
+       id="linearGradient3294"><stop
+         offset="0"
+         style="stop-color:#6376e6;stop-opacity:1"
+         id="stop3296" /><stop
+         offset="0.50094414"
+         style="stop-color:#222989;stop-opacity:1"
+         id="stop3302" /><stop
+         offset="1"
+         style="stop-color:#00003d;stop-opacity:1"
+         id="stop3298" /></linearGradient><linearGradient
+       id="linearGradient3284"><stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3286" /><stop
+         offset="0.84845906"
+         style="stop-color:#000000;stop-opacity:0.49803922"
+         id="stop3292" /><stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3288" /></linearGradient><linearGradient
+       id="linearGradient3274"><stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3276" /><stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3278" /></linearGradient><linearGradient
+       id="linearGradient3262"><stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3264" /><stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3266" /></linearGradient><linearGradient
+       id="linearGradient3242"><stop
+         offset="0"
+         style="stop-color:#282828;stop-opacity:1"
+         id="stop3244" /><stop
+         offset="0.39253417"
+         style="stop-color:#808080;stop-opacity:1"
+         id="stop3252" /><stop
+         offset="1"
+         style="stop-color:#d9d9d9;stop-opacity:1"
+         id="stop3246" /></linearGradient><linearGradient
+       id="linearGradient3202"><stop
+         offset="0"
+         style="stop-color:#2b2b2b;stop-opacity:1"
+         id="stop3204" /><stop
+         offset="0.5"
+         style="stop-color:#828383;stop-opacity:1"
+         id="stop3250" /><stop
+         offset="1"
+         style="stop-color:#dadbdb;stop-opacity:1"
+         id="stop3206" /></linearGradient><linearGradient
+       id="linearGradient4966"><stop
+         offset="0"
+         style="stop-color:#b6b3d8;stop-opacity:1"
+         id="stop4968" /><stop
+         offset="1"
+         style="stop-color:#b6b3d8;stop-opacity:0"
+         id="stop4970" /></linearGradient><linearGradient
+       id="linearGradient4938"><stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop4940" /><stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop4942" /></linearGradient><linearGradient
+       id="linearGradient4282"><stop
+         offset="0"
+         style="stop-color:#bab8db;stop-opacity:1"
+         id="stop4900" /><stop
+         offset="1"
+         style="stop-color:#5955a9;stop-opacity:0.99159664"
+         id="stop4902" /></linearGradient><linearGradient
+       id="linearGradient4876"><stop
+         offset="0"
+         style="stop-color:#d3d2e8;stop-opacity:1"
+         id="stop4878" /><stop
+         offset="1"
+         style="stop-color:#5955a9;stop-opacity:0.99159664"
+         id="stop4880" /></linearGradient><radialGradient
+       gradientTransform="matrix(0.6817439,0,0,0.5905355,-3.8523706,-28.935273)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4898"
+       id="radialGradient4892"
+       fy="-108.96888"
+       fx="20.951529"
+       r="266.76535"
+       cy="-108.96888"
+       cx="20.951529" /><radialGradient
+       gradientTransform="matrix(1,0,0,0.1854103,0,383.88493)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4938"
+       id="radialGradient4944"
+       fy="471.26172"
+       fx="233.8876"
+       r="170.49393"
+       cy="471.26172"
+       cx="233.8876" /><radialGradient
+       gradientTransform="matrix(1,0,0,0.9121621,0,32.654948)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4966"
+       id="radialGradient4972"
+       fy="371.76376"
+       fx="299.70135"
+       r="76.696358"
+       cy="371.76376"
+       cx="299.70135" /><radialGradient
+       gradientTransform="matrix(0.414705,0.3300575,-0.5059004,0.6356454,346.95314,49.479585)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3202"
+       id="radialGradient3210"
+       fy="390.45248"
+       fx="289.44067"
+       r="17.67668"
+       cy="390.45248"
+       cx="289.44067" /><radialGradient
+       gradientTransform="matrix(0.414705,0.3300575,-0.5059004,0.6356454,448.41009,-65.398074)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3202"
+       id="radialGradient3238"
+       fy="382.14804"
+       fx="283.50717"
+       r="17.67668"
+       cy="382.14804"
+       cx="283.50717" /><radialGradient
+       gradientTransform="matrix(-6.5565014e-2,-5.9721765e-2,1.6871024,-1.8521705,171.90774,540.51473)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3242"
+       id="radialGradient3248"
+       fy="181.18982"
+       fx="418.45551"
+       r="63.068935"
+       cy="181.18982"
+       cx="418.45551" /><radialGradient
+       gradientTransform="matrix(0.4055116,-3.3440123e-2,0.1034174,4.3988695,177.23251,-1191.6649)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3262"
+       id="radialGradient3268"
+       fy="357.33591"
+       fx="354.51709"
+       r="33.712105"
+       cy="357.33591"
+       cx="354.51709" /><radialGradient
+       gradientTransform="matrix(-0.1339874,-0.1146812,0.3079048,-0.3597394,444.23592,395.03849)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3274"
+       id="radialGradient3280"
+       fy="223.55537"
+       fx="510.58469"
+       r="132.28336"
+       cy="223.55537"
+       cx="510.58469" /><radialGradient
+       gradientTransform="matrix(-1.2497569,1.3798305,-9.6289463e-2,-7.2974479e-2,674.3826,-70.590682)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3284"
+       id="radialGradient3290"
+       fy="-158.17821"
+       fx="284.4671"
+       r="110.2972"
+       cy="-158.17821"
+       cx="284.4671" /><radialGradient
+       gradientTransform="matrix(-0.1008165,-8.0872321e-2,1.0745309,-1.3395252,13.843287,784.79288)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3294"
+       id="radialGradient3300"
+       fy="356.62274"
+       fx="425.51019"
+       r="143.34167"
+       cy="356.62274"
+       cx="425.51019" /><filter
+       height="1.088351"
+       y="-0.044175496"
+       width="1.0892536"
+       x="-0.044626798"
+       id="filter4350"
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
+         id="feGaussianBlur4352"
+         stdDeviation="8.7848425" /></filter><linearGradient
+       y2="300.73987"
+       x2="236.61363"
+       y1="-161.8512"
+       x1="-122.20192"
+       spreadMethod="pad"
+       gradientTransform="matrix(0.87385837,0,0,0.82818057,246.00762,250.28138)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4245"
+       xlink:href="#linearGradient4284" /><linearGradient
+       y2="66.018341"
+       x2="173.94518"
+       y1="396.6066"
+       x1="447.80933"
+       gradientTransform="matrix(0.98684959,0,0,0.98684959,3.0344187,2.5250397)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4247"
+       xlink:href="#linearGradient4292" /></defs><rect
+     style="fill:none;display:none"
+     id="rect4772"
+     y="0.20100001"
+     x="0.171"
+     height="512"
+     width="512" /><g
+     style="display:none"
+     id="g4788"><g
+       style="display:inline"
+       id="g4790" /></g><g
+     style="display:none"
+     id="g4806"><g
+       style="display:inline"
+       id="g4808"><path
+         style="fill:#050505;display:none"
+         id="path4810"
+         d="M 349.098,256.651 C 348.833,256.397 386.735,284.256 388.519,281.663 C 394.881,272.411 470.565,188.526 473.303,165.427 C 473.545,163.424 472.787,161.331 472.787,161.331 C 472.787,161.331 471.597,161.187 466.462,157.017 C 463.77,154.825 460.979,152.436 460.979,152.436 C 444.925,153.434 403.094,193.995 349.917,256.004" /></g></g><path
+     style="opacity:0.40500004;fill:#211f46;fill-opacity:0.99607843;stroke:#0a0b1b;stroke-width:8.53333378;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4350)"
+     id="path4233"
+     d="m 491.66937,257.75916 c 0,131.79436 -105.76,238.63481 -236.22155,238.63481 -130.46155,0 -236.221539,-106.84045 -236.221539,-238.63481 0,-131.79437 105.759989,-238.634808 236.221539,-238.634808 130.46155,0 236.22155,106.840438 236.22155,238.634808 z"
+     transform="matrix(0.98684957,0,0,0.98684957,3.0344041,2.5250397)" /><path
+     d="m 488.23812,256.89456 c 0,130.06121 -104.3692,235.49665 -233.1151,235.49665 -128.7459,0 -233.115201,-105.43544 -233.115201,-235.49665 0,-130.06123 104.369301,-235.49666 233.115201,-235.49666 128.7459,0 233.1151,105.43543 233.1151,235.49666 z"
+     id="path4235"
+     style="opacity:1;fill:url(#linearGradient4245);fill-opacity:1;stroke:url(#linearGradient4247);stroke-width:13.33816814;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+     d="m 175.0003,422.31057 c 0,0 19.7385,1.39634 45.1312,-0.84159 10.2834,-0.9063 49.3267,-4.74128 78.5169,-11.14289 0,0 35.5899,-7.61669 54.6301,-14.63335 19.9225,-7.34185 30.7636,-13.57304 35.6433,-22.40243 -0.2128,-1.80907 1.5024,-8.22438 -7.685,-12.07788 -23.4887,-9.85199 -50.73,-8.06998 -104.6338,-9.21285 -59.7772,-2.05391 -79.6627,-12.05971 -90.2556,-20.11838 -10.1579,-8.17519 -5.05,-30.79254 38.4742,-50.71499 21.9244,-10.60898 107.8705,-30.18698 107.8705,-30.18698 -28.9451,-14.30725 -82.9186,-39.45893 -94.0134,-44.89023 -9.7308,-4.76348 -25.303,-11.93595 -28.6785,-20.61368 -3.8271,-8.33089 9.0383,-15.50726 16.2248,-17.56236 23.1448,-6.67602 55.8182,-10.82538 85.5548,-11.29122 14.9472,-0.23417 17.3734,-1.19586 17.3734,-1.19586 20.6243,-3.42116 34.2014,-17.53175 28.5446,-39.87876 -5.0783,-22.81046 -31.8617,-36.21365 -57.3138,-31.57361 -23.9682,4.36956 -81.7378,21.15007 -81.7378,21.15007 71.4075,-0.61803 83.3592,0.57378 88.697,8.03676 3.1523,4.40742 -1.4324,10.45068 -20.4765,13.56099 -20.733,3.38616 -63.8312,7.46399 -63.8312,7.46399 -41.3449,2.4554 -70.4682,2.61974 -79.203,21.11314 -5.7065,12.08196 6.0854,22.7633 11.2538,29.4493 21.8407,24.28905 53.3882,37.38879 73.6948,47.03553 7.6405,3.62963 30.0586,10.48407 30.0586,10.48407 -65.8782,-3.62335 -113.4003,16.6055 -141.2764,39.89622 -31.5288,29.16261 -17.581403,63.92354 47.0124,85.3268 38.1517,12.6416 57.0725,18.58695 113.9815,13.46232 33.52,-1.80673 38.8041,-0.73155 39.1383,2.01892 0.4705,3.87242 -37.2311,13.49165 -47.524,16.4606 -26.1853,7.55306 -94.8276,22.80438 -95.1712,22.87835 z"
+     id="path4237"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></svg>
diff --git a/oni-org/icons/icons8-blog-64.png b/oni-org/icons/icons8-blog-64.png
deleted file mode 100644
index de64a0e..0000000
Binary files a/oni-org/icons/icons8-blog-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-book-64.png b/oni-org/icons/icons8-book-64.png
deleted file mode 100644
index 56a85fb..0000000
Binary files a/oni-org/icons/icons8-book-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-bug-64.png b/oni-org/icons/icons8-bug-64.png
deleted file mode 100644
index f2da9b0..0000000
Binary files a/oni-org/icons/icons8-bug-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-checkmark-64.png b/oni-org/icons/icons8-checkmark-64.png
deleted file mode 100644
index 783a104..0000000
Binary files a/oni-org/icons/icons8-checkmark-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-code-64.png b/oni-org/icons/icons8-code-64.png
deleted file mode 100644
index 75c36ca..0000000
Binary files a/oni-org/icons/icons8-code-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-ebook-64.png b/oni-org/icons/icons8-ebook-64.png
deleted file mode 100644
index ed07fc8..0000000
Binary files a/oni-org/icons/icons8-ebook-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-email-64.png b/oni-org/icons/icons8-email-64.png
deleted file mode 100644
index 7941b8e..0000000
Binary files a/oni-org/icons/icons8-email-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-game-controller-64.png b/oni-org/icons/icons8-game-controller-64.png
deleted file mode 100644
index 496ef80..0000000
Binary files a/oni-org/icons/icons8-game-controller-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-inbox-64.png b/oni-org/icons/icons8-inbox-64.png
deleted file mode 100644
index 303f154..0000000
Binary files a/oni-org/icons/icons8-inbox-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-light-64.png b/oni-org/icons/icons8-light-64.png
deleted file mode 100644
index 755c692..0000000
Binary files a/oni-org/icons/icons8-light-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-musical-notes-64.png b/oni-org/icons/icons8-musical-notes-64.png
deleted file mode 100644
index a1e74cc..0000000
Binary files a/oni-org/icons/icons8-musical-notes-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-paper-64.png b/oni-org/icons/icons8-paper-64.png
deleted file mode 100644
index 9998ece..0000000
Binary files a/oni-org/icons/icons8-paper-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-project-64.png b/oni-org/icons/icons8-project-64.png
deleted file mode 100644
index 9ee32ee..0000000
Binary files a/oni-org/icons/icons8-project-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-question-mark-64.png b/oni-org/icons/icons8-question-mark-64.png
deleted file mode 100644
index 82cd7c3..0000000
Binary files a/oni-org/icons/icons8-question-mark-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-shopping-cart-64.png b/oni-org/icons/icons8-shopping-cart-64.png
deleted file mode 100644
index 1018718..0000000
Binary files a/oni-org/icons/icons8-shopping-cart-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-sprout-64.png b/oni-org/icons/icons8-sprout-64.png
deleted file mode 100644
index 03ecb67..0000000
Binary files a/oni-org/icons/icons8-sprout-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-tea-64.png b/oni-org/icons/icons8-tea-64.png
deleted file mode 100644
index 9750258..0000000
Binary files a/oni-org/icons/icons8-tea-64.png and /dev/null differ
diff --git a/oni-org/icons/icons8-workstation-64.png b/oni-org/icons/icons8-workstation-64.png
deleted file mode 100644
index a542fb4..0000000
Binary files a/oni-org/icons/icons8-workstation-64.png and /dev/null differ
diff --git a/oni-org/icons/mat-book-open-variant.svg b/oni-org/icons/mat-book-open-variant.svg
new file mode 100644
index 0000000..a05efc5
--- /dev/null
+++ b/oni-org/icons/mat-book-open-variant.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="mdi-book-open-variant" width="24" height="24" viewBox="0 0 24 24"><path d="M17.5 14.33C18.29 14.33 19.13 14.41 20 14.57V16.07C19.38 15.91 18.54 15.83 17.5 15.83C15.6 15.83 14.11 16.16 13 16.82V15.13C14.17 14.6 15.67 14.33 17.5 14.33M13 12.46C14.29 11.93 15.79 11.67 17.5 11.67C18.29 11.67 19.13 11.74 20 11.9V13.4C19.38 13.24 18.54 13.16 17.5 13.16C15.6 13.16 14.11 13.5 13 14.15M17.5 10.5C15.6 10.5 14.11 10.82 13 11.5V9.84C14.23 9.28 15.73 9 17.5 9C18.29 9 19.13 9.08 20 9.23V10.78C19.26 10.59 18.41 10.5 17.5 10.5M21 18.5V7C19.96 6.67 18.79 6.5 17.5 6.5C15.45 6.5 13.62 7 12 8V19.5C13.62 18.5 15.45 18 17.5 18C18.69 18 19.86 18.16 21 18.5M17.5 4.5C19.85 4.5 21.69 5 23 6V20.56C23 20.68 22.95 20.8 22.84 20.91C22.73 21 22.61 21.08 22.5 21.08C22.39 21.08 22.31 21.06 22.25 21.03C20.97 20.34 19.38 20 17.5 20C15.45 20 13.62 20.5 12 21.5C10.66 20.5 8.83 20 6.5 20C4.84 20 3.25 20.36 1.75 21.07C1.72 21.08 1.68 21.08 1.63 21.1C1.59 21.11 1.55 21.12 1.5 21.12C1.39 21.12 1.27 21.08 1.16 21C1.05 20.89 1 20.78 1 20.65V6C2.34 5 4.18 4.5 6.5 4.5C8.83 4.5 10.66 5 12 6C13.34 5 15.17 4.5 17.5 4.5Z" /></svg>
\ No newline at end of file
diff --git a/oni-org/icons/mat-email.svg b/oni-org/icons/mat-email.svg
new file mode 100644
index 0000000..7b6f938
--- /dev/null
+++ b/oni-org/icons/mat-email.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="mdi-email" width="24" height="24" viewBox="0 0 24 24"><path d="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z" /></svg>
\ No newline at end of file
diff --git a/oni-org/icons/mat-head-question.svg b/oni-org/icons/mat-head-question.svg
new file mode 100644
index 0000000..1344511
--- /dev/null
+++ b/oni-org/icons/mat-head-question.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="mdi-head-question" width="24" height="24" viewBox="0 0 24 24"><path d="M13 3C9.23 3 6.19 5.95 6 9.66L4.08 12.19C3.84 12.5 4.08 13 4.5 13H6V16C6 17.11 6.89 18 8 18H9V21H16V16.31C18.37 15.19 20 12.8 20 10C20 6.14 16.88 3 13 3M14 14H12V12H14V14M15.75 8.81C15.46 9.21 15.09 9.5 14.64 9.74C14.39 9.9 14.22 10.07 14.13 10.26C14.04 10.44 14 10.69 14 11H12C12 10.5 12.11 10.08 12.31 9.82C12.5 9.55 12.85 9.25 13.36 8.91C13.62 8.75 13.83 8.55 13.97 8.32C14.13 8.09 14.2 7.82 14.2 7.5C14.2 7.2 14.12 6.94 13.94 6.75C13.76 6.57 13.5 6.47 13.19 6.47C12.93 6.47 12.71 6.55 12.53 6.7C12.35 6.86 12.26 7.09 12.25 7.39H10.32L10.31 7.36C10.3 6.57 10.56 6 11.08 5.59C11.62 5.2 12.32 5 13.19 5C14.12 5 14.85 5.23 15.38 5.68C15.92 6.13 16.19 6.74 16.19 7.5C16.19 8 16.04 8.41 15.75 8.81Z" /></svg>
\ No newline at end of file
diff --git a/oni-org/icons/mat-note-text-outline.svg b/oni-org/icons/mat-note-text-outline.svg
new file mode 100644
index 0000000..8dbeb0c
--- /dev/null
+++ b/oni-org/icons/mat-note-text-outline.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="mdi-note-text-outline" width="24" height="24" viewBox="0 0 24 24"><path d="M15 3H5A2 2 0 0 0 3 5V19A2 2 0 0 0 5 21H19A2 2 0 0 0 21 19V9L15 3M19 19H5V5H14V10H19M17 14H7V12H17M14 17H7V15H14" /></svg>
\ No newline at end of file
diff --git a/oni-org/icons/mat-one-up.svg b/oni-org/icons/mat-one-up.svg
new file mode 100644
index 0000000..114ccba
--- /dev/null
+++ b/oni-org/icons/mat-one-up.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="mdi-one-up" width="24" height="24" viewBox="0 0 24 24"><path d="M10,19V19C9.4,19 9,18.6 9,18V17C9,16.5 9.4,16 10,16V16C10.5,16 11,16.4 11,17V18C11,18.6 10.6,19 10,19M15,18V17C15,16.5 14.6,16 14,16V16C13.5,16 13,16.4 13,17V18C13,18.5 13.4,19 14,19V19C14.6,19 15,18.6 15,18M22,12C22,14.6 20.4,16.9 18,18.4V20A2,2 0 0,1 16,22H8A2,2 0 0,1 6,20V18.4C3.6,16.9 2,14.6 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12M7,10C7,8.9 6.4,7.9 5.5,7.4C4.5,8.7 4,10.3 4,12C4,12.3 4,12.7 4.1,13C5.7,12.9 7,11.6 7,10M9,9C9,10.7 10.3,12 12,12C13.7,12 15,10.7 15,9C15,7.3 13.7,6 12,6C10.3,6 9,7.3 9,9M16,20V15.5C14.8,15.2 13.4,15 12,15C10.6,15 9.2,15.2 8,15.5V20H16M19.9,13C20,12.7 20,12.3 20,12C20,10.3 19.5,8.7 18.5,7.4C17.6,7.9 17,8.9 17,10C17,11.6 18.3,12.9 19.9,13Z" /></svg>
\ No newline at end of file
diff --git a/oni-org/icons/mat-post-outline.svg b/oni-org/icons/mat-post-outline.svg
new file mode 100644
index 0000000..6751614
--- /dev/null
+++ b/oni-org/icons/mat-post-outline.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="mdi-post-outline" width="24" height="24" viewBox="0 0 24 24"><path d="M19 5V19H5V5H19M21 3H3V21H21V3M17 17H7V16H17V17M17 15H7V14H17V15M17 12H7V7H17V12Z" /></svg>
\ No newline at end of file
diff --git a/oni-org/icons/mat-security.svg b/oni-org/icons/mat-security.svg
new file mode 100644
index 0000000..59b1ab9
--- /dev/null
+++ b/oni-org/icons/mat-security.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="mdi-security" width="24" height="24" viewBox="0 0 24 24"><path d="M12,12H19C18.47,16.11 15.72,19.78 12,20.92V12H5V6.3L12,3.19M12,1L3,5V11C3,16.55 6.84,21.73 12,23C17.16,21.73 21,16.55 21,11V5L12,1Z" /></svg>
\ No newline at end of file
diff --git a/oni-org/icons/mat-star-circle-outline.svg b/oni-org/icons/mat-star-circle-outline.svg
new file mode 100644
index 0000000..22f963c
--- /dev/null
+++ b/oni-org/icons/mat-star-circle-outline.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="mdi-star-circle-outline" width="24" height="24" viewBox="0 0 24 24"><path d="M8.58,17.25L9.5,13.36L6.5,10.78L10.45,10.41L12,6.8L13.55,10.45L17.5,10.78L14.5,13.36L15.42,17.25L12,15.19L8.58,17.25M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2M12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4Z" /></svg>
\ No newline at end of file
diff --git a/oni-org/icons/mat-web.svg b/oni-org/icons/mat-web.svg
new file mode 100644
index 0000000..9304331
--- /dev/null
+++ b/oni-org/icons/mat-web.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="mdi-web" width="24" height="24" viewBox="0 0 24 24"><path d="M16.36,14C16.44,13.34 16.5,12.68 16.5,12C16.5,11.32 16.44,10.66 16.36,10H19.74C19.9,10.64 20,11.31 20,12C20,12.69 19.9,13.36 19.74,14M14.59,19.56C15.19,18.45 15.65,17.25 15.97,16H18.92C17.96,17.65 16.43,18.93 14.59,19.56M14.34,14H9.66C9.56,13.34 9.5,12.68 9.5,12C9.5,11.32 9.56,10.65 9.66,10H14.34C14.43,10.65 14.5,11.32 14.5,12C14.5,12.68 14.43,13.34 14.34,14M12,19.96C11.17,18.76 10.5,17.43 10.09,16H13.91C13.5,17.43 12.83,18.76 12,19.96M8,8H5.08C6.03,6.34 7.57,5.06 9.4,4.44C8.8,5.55 8.35,6.75 8,8M5.08,16H8C8.35,17.25 8.8,18.45 9.4,19.56C7.57,18.93 6.03,17.65 5.08,16M4.26,14C4.1,13.36 4,12.69 4,12C4,11.31 4.1,10.64 4.26,10H7.64C7.56,10.66 7.5,11.32 7.5,12C7.5,12.68 7.56,13.34 7.64,14M12,4.03C12.83,5.23 13.5,6.57 13.91,8H10.09C10.5,6.57 11.17,5.23 12,4.03M18.92,8H15.97C15.65,6.75 15.19,5.55 14.59,4.44C16.43,5.07 17.96,6.34 18.92,8M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" /></svg>
\ No newline at end of file
diff --git a/oni-org/oni-org.el b/oni-org/oni-org.el
index 5095c5a..5a3f9a3 100644
--- a/oni-org/oni-org.el
+++ b/oni-org/oni-org.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0407.195144
+;; Version: 2021.0407.213253
 ;; Package-Requires: (oni-yasnippet oni-alert oni-hydra org-plus-contrib org-bullets org-edna diminish all-the-icons org-journal)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -327,27 +327,32 @@ also move point to the start of the heading."
 (defun oni-org-set-agenda-category-icons ()
   "Set ‘org-agenda-category-icon-alist’."
   (let* ((icon-height (window-default-font-height))
-         (defaults `(png nil :height ,icon-height :ascent center)))
+         (defaults `(nil :height ,icon-height :ascent center))
+         (svg `(svg ,@defaults)))
     (setq org-agenda-category-icon-alist
-          `((,(rx string-start "task" string-end) ,(expand-file-name "icons8-checkmark-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "inbox" string-end) ,(expand-file-name "icons8-inbox-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "email" string-end) ,(expand-file-name "icons8-email-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "life" string-end) ,(expand-file-name "icons8-sprout-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "feature" string-end) ,(expand-file-name "icons8-code-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "work" string-end) ,(expand-file-name "icons8-workstation-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "game" string-end) ,(expand-file-name "icons8-game-controller-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "shopping" string-end) ,(expand-file-name "icons8-shopping-cart-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "bug" string-end) ,(expand-file-name "icons8-bug-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "idea" string-end) ,(expand-file-name "icons8-light-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "article" string-end) ,(expand-file-name "icons8-blog-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "project" string-end) ,(expand-file-name "icons8-project-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "ebook" string-end) ,(expand-file-name "icons8-ebook-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "book" string-end) ,(expand-file-name "icons8-book-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "Morning Cup of Coding" string-end) ,(expand-file-name "icons8-tea-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "paper" string-end) ,(expand-file-name "icons8-paper-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "question" string-end) ,(expand-file-name "icons8-question-mark-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "music" string-end) ,(expand-file-name "icons8-musical-notes-64.png" oni-org-icons-dir) ,@defaults)
-            (,(rx string-start "emacs" string-end) ,(expand-file-name "emacs.svg" oni-org-icons-dir) svg nil :height ,icon-height :ascent center)))))
+          `((,(rx string-start "task" string-end) ,(expand-file-name "bx-task.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "inbox" string-end) ,(expand-file-name "bxs-inbox.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "email" string-end) ,(expand-file-name "mat-email.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "life" string-end) ,(expand-file-name "mat-one-up.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "feature" string-end) ,(expand-file-name "mat-star-circle-outline.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "work" string-end) ,(expand-file-name "bs-building.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "game" string-end) ,(expand-file-name "bxs-game.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "shopping" string-end) ,(expand-file-name "bx-shopping-bag.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "bug" string-end) ,(expand-file-name "bx-bug.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "idea" string-end) ,(expand-file-name "bxs-bulb.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "article" string-end) ,(expand-file-name "mat-post-outline.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "project" string-end) ,(expand-file-name "bs-kanban.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "ebook" string-end) ,(expand-file-name "bxs-book-content.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "book" string-end) ,(expand-file-name "mat-book-open-variant.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "Morning Cup of Coding" string-end) ,(expand-file-name "bxs-coffee.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "paper" string-end) ,(expand-file-name "mat-note-text-outline.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "question" string-end) ,(expand-file-name "mat-head-question.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "music" string-end) ,(expand-file-name "bxs-music.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "emacs" string-end) ,(expand-file-name "emacs.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "moving" string-end) ,(expand-file-name "bxs-truck.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "security" string-end) ,(expand-file-name "mat-security.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "website" string-end) ,(expand-file-name "mat-web.svg" oni-org-icons-dir) ,@svg)
+            (,(rx string-start "desktop" string-end) ,(expand-file-name "bx-desktop.svg" oni-org-icons-dir) ,@svg)))))
 
 (setq org-agenda-files
       (cons org-default-notes-file