Restore PublicDictionary's details_only option

omg don't query for every reference!
Fix scss disliking / as division sign for no reason
2026-09-24 13:07:11 +02:00 · 2023-10-31 16:25:42 -06:00 · 2023-10-31 16:23:58 -06:00 · 2022-08-26 12:56:34 -06:00 · 2022-08-26 12:56:01 -06:00 · 2021-12-03 22:10:11 -07:00
52 changed files with 3576 additions and 2960 deletions
--- a/README.md
+++ b/README.md
@ -4,6 +4,9 @@ This is the light-as-possible rewrite of Lexiconga.

 ## Installation

+0. Some dev tools require build tools.
+  - On Windows, install them with `npm install --global windows-build-tools`.
+  - Alternatively, you can just install the newest Python and Visual Studio (with Desktop C++ devkit).
 1. Clone and run `yarn` and `composer install` to install dependencies.
 1. Import `src/structure.sql` into a database called 'lexiconga' on your MariaDB server to get the database structure.
 1. Copy `src/php/api/config.php.changeme` to `src/php/api/config.php` and update the values within to enable connections to your lexiconga database.
@ -22,6 +25,8 @@ This is the light-as-possible rewrite of Lexiconga.

 It's less useful, but `npm run serve-frontend-only` will bundle and serve _only_ the front end stuff from `localhost:1234`. The bundled files all still get bundled into `dist`.

+Parcel Bundler version < 2 doesn't use PostCSS 8+, so upgrading autoprefixer will not work. Keep autoprefixer at the highest version within the 9 major version until you're able to figure out how parcel-bundler 2+ works.
+
 ## Production

 `npm run bundle` bundles and minifies the frontend stuff and also copies the backend stuff to `dist`. Be sure to run `npm run clear` to delete the contents of `dist` and `.cache` before using `npm run bundle` to make sure you don't get old dev versions of the bundled code included in your upload.
@ -40,4 +45,3 @@ Be sure you set up email senders/receivers for at least these 3 email addresses:

 - help (can be forwarder)
 - donotreply (must be sender)
- ads (can be forwarder)
--- a/ads.json
+++ b/ads.json
@ -1,56 +0,0 @@
-[
-  {
-    "header": "Do You Like Lexiconga?",
-    "body": "You can contribute a small amount each month toward keeping Lexiconga online and help us keep working on new features. We appreciate whatever you can offer!",
-    "cta": "Support Lexiconga!",
-    "link": "https://liberapay.com/robbieantenesse/donate",
-    "start": "June 1, 2019",
-    "end": "August 1, 2099",
-    "isPriority": false
-  },
-  {
-    "header": "Support Lexiconga's Developer",
-    "body": "If you enjoy Lexiconga, you can make a one-time donation to the developer toward keeping it online and adding new features. Your donations are much appreciated!",
-    "cta": "Buy Me a Coffee!",
-    "link": "https://buymeacoffee.com/robbieantenesse",
-    "start": "June 1, 2019",
-    "end": "August 1, 2099",
-    "isPriority": false
-  },
-  {
-    "header": "A New Way to Role-Play",
-    "body": "The GUTS+ System is a tabletop role-playing game system that aims to be approachable enough for newcomers and flexible enough for any setting.",
-    "cta": "Learn to Play for Free!",
-    "link": "https://guts.plus",
-    "start": "June 1, 2019",
-    "end": "March 1, 2020",
-    "isPriority": false
-  },
-  {
-    "header": "Protect Your Readers",
-    "body": "RedFlag puts a wall between your readers or followers and content that you want to share. Choose up to 3 different warnings to help them be aware of what they're about to view!",
-    "cta": "Use RedFlag for Free",
-    "link": "https://redflag.ga",
-    "start": "June 1, 2019",
-    "end": "January 1, 2020",
-    "isPriority": false
-  },
-  {
-    "header": "Get Theonite: Planet Adyn free!",
-    "body": "\"This book is the superhero fantasy you didn't know you needed. Magic, Afrofuturism, and heart-pumping suspense - this book has it all!\" - WeReadFantasy.com",
-    "cta": "Read Free Now",
-    "link": "https://mailchi.mp/ce525124aec3/theonite-planet-adyn-free-copy",
-    "start": "June 1, 2019",
-    "end": "January 1, 2020",
-    "isPriority": false
-  },
-  {
-    "header": "The Sword of Kaigen: A Theonite War Story",
-    "body": "\"Fantasy and martial arts aficionados alike should enjoy this emotionally supercharged novel... which pierces readers' hearts with the precision of a samurai's razor-sharp blade.\" - Blue Ink Review",
-    "cta": "Buy Now",
-    "link": "https://www.amazon.com/Sword-Kaigen-Theonite-War-Story/dp/172019386X/",
-    "start": "June 1, 2019",
-    "end": "January 1, 2020",
-    "isPriority": false
-  }
-]
--- a/advertising.html
+++ b/advertising.html
@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Advertising on Lexiconga</title>
-  <meta property="description" content="Buy advertisement space on Lexiconga">
-  <meta name="keywords" content="Lexiconga, advertising, ads, conlanging, dictionary, dictionaries, lexicon, conlangs, constructed languages, glossopoeia">
-  
-  <meta property="og:site_name" content="Lexiconga">
-  <meta property="og:url" content="https://lexicon.ga/advertising.html">
-  <meta property="og:type" content="article">
-  <meta property="og:title" content="Advertising on Lexiconga">
-  <meta property="og:description" content="Buy advertisement space on Lexiconga">
-  <meta property="og:image" content="processedImages/logo.png">
-  
-  <meta name="twitter:card" content="summary">
-  <meta name="twitter:image:alt" content="Lexiconga logo">
-
-  <link rel="icon" href="processedImages/favicon.png" type="image/x-icon">
-  <link rel="stylesheet" href="src/main.scss">
-</head>
-<body id="defaultTheme">
-  <header id="top">
-    <a href="/" title="Lexiconga"><svg id="title" alt="Lexiconga Logo" viewBox="0 0 249.78 55.087">
-      <g transform="translate(-107.53 -155.84)">
-        <g id="lexi">
-          <path d="m144.03 159.39-11.339 22.409h-21.62l11.339-22.409z" />
-          <path d="m132.69 183.97 11.339 22.409h-21.62l-11.339-22.409z" />
-          <path d="m160.1 186.76v7.0042h-6.1056q-1.2442 0-1.7741 0.36864-0.50688 0.36864-0.50688 1.2442 0 0.99072 0.52992 1.3133 0.52992 0.29952 2.1658 0.29952h6.2899v8.9856h-7.3498q-5.184 0-7.9258-2.4653-2.7418-2.4883-2.7418-7.1655v-12.326q0-4.5159 2.5805-7.0042 2.6035-2.4883 7.3037-2.4883h8.1332v9.0317h-5.9674q-2.4192 0-2.4192 1.5667 0 0.92161 0.576 1.2902 0.57601 0.3456 2.0506 0.3456z" />
-          <path d="m187.75 174.53-8.1792 15.299 8.4557 16.151h-9.8381l-3.8707-7.6263-3.2717 7.6263h-9.6768l8.64-15.898-8.1792-15.552h9.746l3.6634 7.1424 2.9491-7.1424z" />
-          <path d="m198.95 174.53v31.45h-9.3543v-31.45z" />
-        </g>
-        <g id="conga">
-          <path d="m218.5 205.38h-3.2347q-7.6994 0-10.114-3.918-1.8223-2.9613-1.8223-11.481 0-7.5172 1.8223-10.478 2.4146-3.918 9.294-3.918h4.7381q6.5604 0 8.7928 1.8679 2.5513 2.1413 2.5513 8.4739-0.77449-0.13667-1.4123-0.13667-0.68338 0-2.0501 0.13667-1.3668 0.13668-2.0957 0.13668l-1.7768-0.13668q0-2.5057-1.5946-3.3713-1.0934-0.59227-3.6902-0.59227h-1.8679q-3.3258 0-4.5559 1.8679-0.95673 1.4579-0.95673 4.647 0 1.1845 0.0456 3.098 0.0911 1.9135 0.0911 1.959 0 4.0092 1.7768 4.9203 1.0478 0.5467 5.6493 0.5467 2.1868 0 3.0069-0.22779 2.0957-0.59226 2.0957-3.6447 0.45558-0.13668 1.139-0.27335 0.72894-0.13668 1.1845-0.13668 0.68338 0 2.0501 0.2278 1.3668 0.22779 2.0957 0.22779 0.5467 0 0.86561-0.0456 0 6.606-2.7791 8.6106-2.2324 1.6401-9.2484 1.6401zm3.0069-31.208q3.8269 0.68338 7.0616 1.549 0.63782 1.0023 1.0934 2.1412 0.50114 1.139 0.50114 2.0046l-1.5946-3.0524-3.5991-1.4123q-1.4579-0.18224-2.1868-0.18224-0.68338 0-1.6401 0h-3.8725q1.0478-0.13667 2.1868-0.36447 1.6401-0.36447 2.0501-0.68338zm10.797 13.303q-0.50115 0-2.1868-0.45559-0.82006-0.22779-1.3668-0.22779-0.27335 0-0.63782 0.0911-0.31891 0.0456-0.82006 0.2278-1.7312-0.18224-2.7335-0.31891-1.0023-0.13668-1.0934-0.31891l4.5559-0.13668q0.7745 0 1.5034 0 0.72894 0 1.5946 0.13668l-0.0911-8.0183q0.22779 2.1413 0.59226 4.3281 0.36447 2.1412 0.95673 4.6925h-0.27335zm-0.59226 13.531-1.2301-0.22779 0.31891-0.59227q0.0456-0.0911 0.0456-0.91117v-1.3668q0-0.91117 0.2278-1.8679 0.22779-1.0023 0.50114-1.959l0.13668 5.1481v1.7768zm-23.28-25.604q0.13668-0.0456 0.63782-0.31891 0.54671-0.27336 0.72894-0.27336l0.13668 0.18224q0.22779 0 0.68338-0.22779 0.50114-0.27336 0.72893-0.36447 0.2278-0.0911 1.6857-0.13668 1.4579-0.0911 2.7791-0.0911l-3.7358 0.68338-3.6447 0.54671zm8.6561-0.59227-0.95673 0.36447-1.9135-0.13667q1.3212-0.41003 2.688-0.82006l2.369-0.13667q-0.5467 0.13667-1.0023 0.27335-0.41003 0.0911-1.1845 0.45558zm-5.786 14.032q0-0.5467 0.0911-1.0023 0.13668-0.50114 0.36447-1.139v0.50114q0 0.13668 0.31891 2.1413 0.0911 0.59226 0.0911 1.2756v5.5582l-0.86562-4.1458 0.18224-0.59226q0-0.0911-0.0911-1.139-0.0911-1.0478-0.0911-1.4579zm0.72894-5.4215 0.82006-0.63782q-0.36447 0.82005-0.36447 1.6401v0.31891l-0.68338 1.3668zm0.45559 13.759q0.18223 0.0455 1.0023 0.31891 1.0934 0.27335 1.6857 0.27335l3.3258-0.68338q0.27335-0.0456 1.0023-0.18224 0.7745 0 1.5946 0l1.4123-2.4602q-0.36447 1.0478-0.45559 1.4579-0.22779 0.86561-0.22779 1.4579l0.0911 0.22779 0.13667-0.0456q-4.237 0.41002-8.4739 0.77449l-1.0934-1.139zm19.18 4.9659q-0.68338 0.63782-1.6857 1.2756-0.95673 0.63782-1.7312 0.91118 0.41003-0.36447 1.2756-1.0934 0.50115-0.45559 1.139-1.1845l1.0023 0.0911zm-4.8292 3.4169-1.5034 0.0456 2.7335-1.0934q-0.31891 0.22779-0.63782 0.50115-0.31891 0.22779-0.59226 0.5467zm-24.921-21.64-0.13667-4.5103 1.5946-2.2779q1.0023-0.22779 1.6401-0.77449 0.95673-1.0478 1.959-2.1413 0.31891-0.31891 1.7768-0.45558 1.4579-0.13668 3.9636-0.2278-1.0023 0.2278-2.0501 0.50115-1.0478 0.22779-1.959 0.50114-1.7768 0.63782-3.7814 2.2324-2.4146 1.9135-2.5968 3.4625zm5.3759 22.233q-2.688-2.7335-3.9636-7.4716-1.0023-3.7814-1.0023-8.5195 0.22779 1.5946 0.68338 4.647 0.45559 3.0069 1.1845 5.0114 0.13668 0.41002 0.45559 1.2756 0.31891 0.86561 0.63782 1.3668l1.6401 2.1868zm-4.9659-16.811v-2.8702q0-0.41003 0.50115-2.7335 0.50114-2.3235 1.3212-5.6493 0.27335-0.18223 1.7768-1.1845 1.549-1.0478 1.5946-1.4123l0.95673 0.82006q-0.63782 0.0911-1.8679 0.86561-0.86561 0.54671-1.6857 1.2301-0.18223 0.95673-0.50114 1.9135-0.27335 0.95673-0.63782 1.6857 0 0.0456-0.31891 0.45559-0.13668 0.22779-0.18224 0.41003zm20.957 16.447q0.59226 0 0.86561 0.0911-2.1412 0.45558-4.6925 0.95673-2.5057 0.5467-3.6902 0.5467-1.3668 0-3.2802-0.27335-1.8679-0.27335-3.1891-0.63782l-0.72894-1.0478 5.9682 0.7745q0.27335 0.0456 0.91117-0.0456 0.68338-0.0911 0.82005-0.0911 0.0911 0 1.0478 0.0911 1.0023 0.0911 1.3668 0.0911 0.59226 0 2.9158-0.31891 1.0023-0.13668 1.6857-0.13668zm-21.003-9.8407q0.31891 0.54671 0.59226 2.5513 0.0911 0.86561 0.27336 1.0478l0.50114 0.63782-0.0456 0.18224 0.18224 0.36447q0.45558 0.63782 0.59226 1.7312 0.18223 1.0478 0.31891 2.0046l2.0501 2.2779-2.4146-1.8679q-0.72894-2.0046-1.3668-4.0092-0.77449-2.5057-1.8679-6.8794l1.1845 1.959zm26.06-1.2756q-0.68338 0-1.9135-0.0911-1.1845-0.13668-2.5513-0.27336 0.68338-0.36446 3.5991-0.50114 2.9158-0.18223 2.9613-0.18223l-0.63782 0.68337-1.4579 0.36447zm-9.1117-12.027 2.8702 1.0478 0.27335 1.0934q-2.1868-1.0023-4.4192-1.549-2.2324-0.59227-4.4647-0.59227z" />
-          <path d="m262.61 195.81q0 0.77449-0.0911 2.6424-0.0911 1.8223-0.0911 1.959-1.2301 1.7768-2.9613 3.7358 0.91118-1.2756 1.4579-2.1868 1.0934-1.7312 1.0934-2.4146 0-2.4146-0.0911-4.4192-0.31891-6.9249-0.31891-7.426 0-0.59226-0.13668-1.4123-0.31891-1.959-0.31891-2.4146 0-0.72894 0.18224-1.5946 0.18223-0.86561 0.36447-1.7312 0.36446 3.5536 0.63782 7.7905 0.27335 4.1914 0.27335 7.4716zm-12.939 8.9295h-4.0547q-5.9682 0-8.7472-2.688-2.7791-2.688-2.7791-8.6561v-5.1026q0-5.6037 2.9158-8.2917 2.9158-2.688 8.565-2.688h3.6447q5.7859 0 8.7928 2.5513 3.1891 2.7335 3.1891 8.4283v5.1026q0 6.1504-2.688 8.7472-2.688 2.5968-8.8384 2.5968zm4.4192-16.264q0-3.098-1.0934-4.2825-1.0934-1.1845-4.1914-1.1845h-2.4146q-3.0069 0-4.1003 1.1845-1.0934 1.1845-1.0934 4.1914v4.7836q0 3.1435 1.0478 4.4647 1.0934 1.3212 4.1458 1.3212h2.4146q3.0524 0 4.1458-1.3212 1.139-1.3668 1.139-4.5103zm-1.2301-11.8q1.4123 0.45558 3.508 1.5034 1.7312 0.91117 3.4624 1.8224 0.41003 0.59226 0.68338 1.5034 0.0911 0.27335 0.22779 0.86561l0.27336-2.8702q-3.0524-0.63782-5.8315-1.2301-2.7335-0.59226-3.098-0.7745l-1.4123-1.1845q0.54671 0.0911 1.139 0.18223 0.63782 0.0456 1.0478 0.18224zm-14.67 2.0501q-1.8679 1.2756-2.4602 1.9135-0.5467 0.63782-0.82005 1.5946 1.5034-1.549 2.8702-2.8702 1.7312-1.6401 3.0524-2.5968 1.8679-0.22779 3.8269-0.50114t3.5991-0.27335q0.50114 0 1.139 0.13667 0.63782 0.13668 1.4579 0.31891-1.139 0.36447-2.2779 0.50115-1.139 0.0911-2.7791 0.0911-0.86561 0-2.4146-0.0456-1.5034-0.0456-2.1413-0.0456-0.41002 0-1.549 0.72894-0.77449 0.5467-1.5034 1.0478zm17.221 25.832q1.0934-0.50115 2.4146-1.2301 1.5946-0.86562 2.2779-1.2756l-6.3782 4.1458-2.369-1.3212q0.59227-0.13668 2.1868-0.18224 1.6401-0.0455 1.8679-0.13667zm-3.7358 1.6401q-0.68338-0.13668-1.4579-0.27335-0.72894-0.0911-1.139-0.0911l-0.27335 0.0911q-0.22779-0.0911-0.68338-0.27335-0.45558-0.13668-0.82005-0.36447zm-18.315-24.055q1.5946-1.139 3.1891-2.5057 1.9135-1.5946 3.0069-2.8246-0.82006 0.2278-1.549 0.45559-0.72893 0.22779-0.77449 0.27335-1.959 1.6857-2.8246 3.3713-0.86562 1.6401-0.86562 4.1003 0 0.45559 0.18224 1.4579 0.18223 1.0023 0.18223 1.5034l-0.13668 9.5673q-0.13667-1.2756-0.36446-2.9613-0.45559-3.3713-0.45559-5.0114 0-3.7358 0.41003-7.426zm4.4647 21.549q3.3713 1.7312 6.9705 2.0501 0.86561 0.0911 1.6401 0.18224 0.7745 0.0911 1.1845 0.27335-1.6857-0.68338-4.2825-1.2756-6.4693-1.4123-7.3805-1.7312-0.54671-0.63782-1.139-2.0957-0.59226-1.4579-1.2756-4.0547 0.72894 1.4123 2.0501 3.5991 1.7312 2.7791 2.2324 3.0524zm14.989-13.622 0.45558 0.86561-0.0911 6.1048-0.59226-1.5034q0.27335-2.0046 0.27335-3.9636l-0.0456-1.5034zm-0.31891-4.647q0.59226 0.45558 0.82005 1.4123 0.2278 0.95674 0.2278 2.0046l-0.13668 1.2301zm-10.023 0.77449q0 0.68338 0.13667 2.0501 0.13668 1.3668 0.13668 2.0957v2.1868q0 1.3212 0.22779 2.1412 0.41003 1.0934 0.68338 2.0046 0.18223-0.0456 0.82006 0.68338 0.63782 0.68338 0.82005 1.0023l-1.1845-0.36447q-1.5946-1.7768-2.0501-3.4624-0.41003-1.7312-0.41003-4.647v-1.4579q0-1.2756 0.27335-2.3235 0.31891-1.0934 1.1845-1.8224zm9.5673-2.3235q-0.36447 0.41002-1.2301 0.72893-0.82005 0.27336-1.5034 0.27336h-3.508l-1.5034-1.0934 7.745 0.0911zm-4.7836 13.986q0.59226-0.0911 1.2756-0.2278 0.68338-0.13667 1.0934-0.13667l2.4146 0.13667-3.3258 0.72894z" />
-          <path d="m287.51 205.02q-0.82006 0-1.6401 0-0.68338-0.13668-1.0023-0.18224l-11.891-20.274v20.866h-7.1071v-29.431q3.0524-0.36447 5.7859-0.36447 2.4602 0 5.1481 0.36447 2.1412 5.057 4.8292 10.023 2.4146 4.4192 5.7404 9.5673 0-3.2802-0.0911-5.8771-0.31891-9.1573-0.31891-9.7951 0-2.7335 0.0455-3.1436 0.0456-0.45558 0.36447-2.0046h7.0616v29.75q-0.95673 0.13668-2.9158 0.31891-1.9135 0.18224-4.0092 0.18224zm-10.114-31.39q0.0911 0.22779 0.31891 0.63782 0.22779 0.41003 0.31891 0.7745l-0.0456-0.18224q0.2278 0.45559 0.72894 1.4579 0.45559 1.2301 0.91117 2.4146l-1.2301-0.45558q-0.0911-1.0934-0.36447-2.0957-0.22779-1.0023-0.63782-2.5513zm18.725 1.3668v1.959q0 2.6424-0.27335 4.647-0.27335 1.959-1.139 3.2347 0.31891-2.6424 0.45558-5.1026 0.18224-2.4602 0.18224-4.7381zm-0.95673 30.752 0.0456-19.772q0 3.2802 0.31891 9.8407t0.31891 9.8407l-2.2779 0.59226q-1.4123 0-3.1891-0.2278-1.7768-0.22779-3.4169-0.41002l8.2005 0.13667zm-8.4283-12.665q-2.0046-3.4624-4.0092-6.9705-3.0524-5.5126-3.0524-6.8338 2.4146 3.918 3.7358 6.1504 2.4602 4.1914 2.4602 6.3782 0 0.31891-0.0911 0.68338t-0.18223 0.72894l1.139-0.13668zm-14.533-18.406q-2.5057 0.27335-5.2848 0.7745l-1.3212-1.2301zm3.8269-0.22779 1.0023 0.5467-3.3713-0.27335zm5.1026 24.966q2.1868 3.4169 4.5103 6.3782l4.5103 0.27335-4.6014 0.72894q-0.18223-0.27335-0.7745-0.7745-0.5467-0.45558-0.77449-0.91117-1.549-2.8246-3.0524-5.6948-1.7312-3.1891-3.3258-5.7404-1.959-3.098-3.6902-5.1481l1.0934-0.22779q0.27336 2.4602 2.5057 5.9682 1.7768 2.5968 3.5991 5.1481zm-15.9 5.6493q-0.27336-1.7768-0.59227-3.8269-0.27335-2.0501-0.27335-3.4624 0-2.4602 0.63782-12.392 0.27335-4.237 0.27335-7.426 0-0.82006-0.0911-1.4123t-0.31891-2.0957q-0.13668 0.63782-0.2278 1.2301-0.0911 0.5467-0.0911 1.2301 0 2.3235 0.18223 8.2006 0.18224 5.8771 0.31891 10.342 0.18224 4.4647 0.18224 9.6129zm7.6083 0.59227q0.41003-2.6424 0.50115-4.3736 0.13667-1.7768 0.13667-4.8748-0.0456-2.3235-0.0911-4.647-0.0455-2.369-0.0455-4.6925 0.63782 3.6902 0.68337 4.1003 0.0911 0.36447 0.31891 2.2324 0.2278 0.2278 0.27336 1.3212 0.0455 1.0478 0.0455 1.9135l0.18224-0.18223q-0.18224 0.5467-0.36447 1.0934-0.45559 1.4123-1.0023 1.4123-0.41003 0-0.59226-0.31891-0.13668-0.36447-0.13668-0.77449v-0.2278h1.2756l0.0456 8.155-1.2301-0.13667zm-8.4283-28.747q0 1.2756-0.41003 12.848-0.13667 3.8725-0.13667 7.6994h0.45558q0-5.1481-0.22779-11.162-0.22779-6.0137-0.68338-10.57l1.2301-1.0934q-0.22779 1.2756-0.22779 2.2779zm0.68338 29.613 0.18223-0.95673h0.50115q1.7312 0 3.7814 0.22779 2.0957 0.22779 3.7814 0.59226zm29.294-33.076 1.6401 0.59226-0.59226 0.63782q-0.86562-0.0911-1.7768-0.18224-0.91117-0.0911-1.6857-0.0911h-2.2324l-2.7335 0.0911q1.0023-0.59226 2.0046-0.82005 1.0478-0.22779 2.2324-0.22779z" />
-          <path d="m314.06 205.29h-3.1891q-6.4693 0-9.4306-4.2825-2.5513-3.6902-2.5513-10.478 0-7.5627 1.8223-10.752 2.4602-4.2825 9.294-4.2825h4.6014q4.8748 0 7.9728 2.2324 3.508 2.5057 3.508 7.1982h-7.426q-0.31891-1.9135-2.1868-2.5968-1.2756-0.45558-3.6902-0.45558h-1.1845q-3.2347 0-4.3281 1.7312-0.82006 1.3212-0.82006 4.7837v3.5536q0 4.5103 1.3212 5.7404 1.3212 1.1845 5.8771 1.1845 3.5991 0 4.4192-1.0478 0.68337-0.86562 0.68337-4.5559h-5.1937v-5.6948q1.4123 0 4.2825 0.18224 2.8702 0.13667 3.918 0.13667 2.2779 0 4.3281-0.31891v7.4716q0 5.6493-3.2802 8.1094-2.8702 2.1413-8.7472 2.1413zm10.114-29.203 2.0501 2.8246q0.27336 0.86561 0.54671 3.2802 0.13667 1.3212 0.36447 3.3713 0.0456-0.18223-0.45559-0.45558-0.50114-0.27335-0.50114-0.41003 0-0.0911 0.0911-0.59226 0.13668-0.50115 0.13668-0.7745 0-0.77449-0.86561-2.5968-0.86562-1.8679-1.4579-2.2324 0.22779-0.59226 0.59226-0.95673-0.18223-0.13667-0.63782-0.27335-0.41003-0.13668-0.59226-0.22779l0.72894-0.95673zm-3.098-0.31891-3.4169-0.82006q-0.95673 0.0456-1.9135 0.0911-0.95673 0.0456-1.9135 0.0456-0.31891 0-0.63782 0-0.27336 0-0.59227-0.0456l-7.016-0.63782 12.848 0.22779 2.6424 1.139zm2.2779 0.45558v0.27335l-1.7768-0.31891 1.7768 0.0456zm3.9636 14.305-0.13667 0.7745q-0.18224 0.91117-0.31891 2.5057-0.13668 1.549-0.27336 2.7791v-0.36446q0-1.1845 0.0911-3.1436 0.13668-2.0046 0.13668-2.4146 0-0.68338-0.0911-1.2301-0.0911-0.5467-0.13668-0.86561 0.13668 0.41003 0.31891 0.95673 0.2278 0.54671 0.41003 1.0023zm-16.037-7.6538h1.6401q1.549 0.63782 3.2802 1.3212 1.7312 0.63782 3.0069 0.86561l4.7836 0.18223 2.369 0.0911-1.0934 0.63782q-1.7768-0.13667-3.8269-0.27335-2.0501-0.18223-3.098-0.50114-0.18224-0.0456-1.8224-1.2301-1.6401-1.1845-1.9135-1.2756l-3.1435-0.27333zm-8.0639-6.9249q-0.68338 0.5467-2.0501 1.959-1.0023 1.0478-2.0046 2.0501 1.139-2.0957 2.2779-4.237l3.8269-0.68338zm8.9295 17.449q0-1.0934 0.0911-3.6902 0.0911-2.6424 0.0911-2.8246l0.72894 0.18224-0.0456 0.86561q0 0.86561 0.0456 2.5968t0.0456 2.6424l3.6447 1.2756 1.4579 2.688-0.27335-2.5513q-0.0456-0.45559-1.0023-0.59227-0.91117-0.18223-2.4146-0.18223-0.54671 0-1.0023 0.0456-0.41003 0-0.72894 0-0.63782 0-0.63782-0.45559zm11.207 11.162q0.63782 0 0.91118-0.59226 0.68337-1.5946 1.139-3.1891 0.45559-1.6401 0.68338-3.3258l1.139 0.45558-0.36446-0.86561q-0.13668 0.31891-0.36447 1.0023-0.18224 0.68338-0.41003 1.4579-0.86561 2.5968-1.0478 2.8702-0.41003 0.68338-2.369 2.2779-0.18223 0.18223-0.63782 0.27335-0.41002 0.0911-0.77449 0.0911l1.139-0.63783q0.54671 0.18224 0.95673 0.18224zm-15.718-10.433q0-0.22779-0.0911-3.4169-0.0911-3.1891-0.0911-4.5103v-0.5467q0-0.91117 0.18224-1.2301 0.22779-0.31891 0.5467-0.31891t0.59226 0.41003q0.0911 0.13667 0.0911 0.31891 0 1.0934-0.7745 4.4647-1.0934 4.8292-1.139 4.9659l1.6401 3.2802-0.0911 0.0456q-0.0911-0.31891-0.0911-1.139 0-0.82006-0.0911-1.0478-0.0456-0.22779-0.50115-0.86561-0.18223-0.2278-0.18223-0.41003zm1.0934 12.073q2.0501 0 6.1049-0.36447 4.0547-0.36447 6.0593-0.36447l-1.139 0.82006q-0.63782-0.36447-1.0478-0.45559-0.36447-0.0911-1.5946-0.27335-0.50115-0.0456-2.9613 0.50114-2.4602 0.54671-3.0069 0.82006zm-10.433-11.071q-0.31891 0.0911-0.50114 0.45559l1.0478 1.1845q-0.68338-1.4123-0.86562-2.5057-0.13667-1.139-0.13667-3.0069v-2.4146q0-0.59226 0.31891-3.0069 0.13667-1.0478 0.13667-1.7312 0-0.13668-0.27335-0.50115-0.27335-0.36446-0.27335-0.59226 0-0.50114 2.8246-4.6925 2.688-3.9636 2.9613-4.1914l1.8224-0.82006q-1.2756 1.0934-4.4192 5.6493-3.1435 4.5103-3.1435 5.467l-0.0456 3.9636q0 1.3212 0.13668 3.918 0.18223 2.5968 0.41002 2.8246zm-1.6857-5.9226q0.27335 2.3235 0.68338 4.4192 0.41002 2.0501 0.63782 2.4146l-0.2278 0.59226q2.4602 2.5968 4.8292 4.6014 3.098 2.6424 5.9226 4.0547 3.4169 1.7312 6.3782 1.7312l4.1914-0.27335q-1.139-0.18223-5.9682-0.45558-4.8292-0.27336-7.6538-1.3668-0.18224-0.0911-1.9135-1.6857-1.3212-1.2301-1.8679-1.7768-1.7768-1.7768-2.2779-2.369-1.4123-1.6401-1.5946-2.7335-0.13667-1.0934-0.13667-2.0501 0-0.86561 0.13667-2.6424 0.13668-1.7768 0.13668-2.5968zm12.756 8.6561 8.2006-0.0911-0.82005 0.50114-6.4693 0.0456-0.91118-0.45558zm4.6014-10.843 10.57 0.31891q-1.0023 0-2.2324 0.0456-1.1845 0-2.6424 0h-0.95673q-1.139 0-2.5968-0.0456-1.4579-0.0456-2.1413-0.31891z" />
-          <path d="m345.75 204.47-1.6401-6.3782h-8.1094l-1.7312 6.3782h-5.8771l7.0616-26.515h9.1117l7.0616 26.515zm-5.7404-21.504-2.9158 10.752h5.8315zm-2.1413-6.3326q0.18224 0 1.3212 0.13667 1.139 0.0911 1.7768 0.0911 0.59226 0 1.139 0 0.59226-0.0456 1.1845-0.0456h0.82005l-0.0456 0.63782q-0.18223 0-2.9613 0.0911-2.7335 0.0911-3.9636 0.0911h-2.5513q0.45559-0.13668 0.91117-0.36447 0.68338-0.36447 0.72894-0.59226 0.27335-0.0456 0.68338-0.0456t0.95673 0zm7.0616 0.63782 1.139 0.5467q0.59226 2.8246 0.86561 4.237 0.54671 2.5513 1.0934 4.237-1.0934-2.6424-1.7312-4.4647-0.86561-2.4602-1.3668-4.5559zm5.7404 22.688-0.18224 0.41003q-0.0456-0.59226-0.0911-1.2301 0-4.2825-1.0934-7.4716-0.45559-1.3212-1.8679-4.647l0.95673-0.36447q0.59226 3.5536 1.0478 5.467 0.22779 1.0023 2.2779 8.8839l-1.0478-1.0478zm1.0478 1.7312q0.36446 0.95673 0.95673 1.8223 0.95673 1.4123 1.0934 1.5946l-1.0478-0.18223q-0.13667-0.36447-0.45558-1.0478-0.27335-0.68338-0.36447-1.0934-0.0911-0.45558-0.18223-1.0934zm-17.631-22.962 0.68338-0.36446q-1.0023 3.5536-2.1413 7.5172-1.2756 4.4192-2.2324 7.5172-0.41003 1.3212-2.369 7.5627 1.3212-5.6037 2.8702-11.162 0.45558-1.6857 3.1891-11.071zm6.2871 19.454q0.86562 0 1.959 0.18223 0.36447 0.0456 1.139 0.18223l-0.18223-0.45558q-2.9158 0-4.2825 0.50114-0.31891 0.13668-2.7791 1.1845l0.54671-1.4579zm-13.394 6.2415q0.86561-1.0934 2.369-7.0616 0.95673-3.9636 1.9135-7.9728l-3.4625 15.809zm6.1048-24.647 0.27335-0.18223q-0.7745 2.9158-1.7312 6.196-0.91117 3.2802-2.0046 6.7427 0.68337-3.2347 1.4123-6.4693 1.0023-4.0547 2.0501-6.2871zm10.387 20q0.36447-0.0456 1.0023 2.5513 0.68338 2.5968 1.0478 2.5968 0.86561 0 1.8223 0t2.0046-0.0456q1.3212 0 2.0957 0.0456 0.82006 0.0456 1.5946 0.27335-0.50114 0.31891-1.6857 0.41003-1.139 0.0911-2.0046 0.0911l-5.1026-0.13667q-0.13668 0.0456-0.18224-0.13668 0-0.18223 0-0.63782v-0.68338q0-0.63782-0.18223-1.7768-0.18224-1.1845-0.41003-2.5513zm-7.745 0.77449q0.18223 0.59226 0.18223 1.4579 0 0.5467-0.0456 1.1845-0.0455 0.63782-0.0455 0.68338l0.13667 1.4123h-1.8679q-1.139 0-3.7814-0.0911-2.6424-0.0911-2.8246-0.0911 4.237 0 7.6538-0.36447 0.13667-0.45558 0.18223-1.2301 0.0456-0.77449 0.0456-0.86561 0.18223-0.0911 0.27335-1.0023 0.0911-0.95673 0.0911-1.0934zm6.0137-11.982-1.2301-2.5057 1.0934 4.237zm0.54671 4.5559-0.54671 0.22779-0.0456-0.86561v-0.27335l0.0456-0.50115zm-2.2779-8.7017-1.9135 8.7017 3.0524-0.0456 0.0911 0.41003h-3.6447l2.4146-9.0662z" />
-        </g>
-      </g>
-    </svg></a>
-  </header>
-  <main>
-    <section id="mainColumn">
-      <section id="detailsSection">
-        <h2 id="dictionaryName">Advertising on Lexiconga</h2>
-        <article id="detailsPanel" style="max-height:unset;">
-          <h3>About</h3>
-          <p>
-            Advertisements are shown in-line with dictionary entries as plain text with a link to your advertised content.
-            You get up to 50 characters for your headline, up to 200 characters for your body text, and 30 characters for the
-            text in a button that links wherever you would like it to go.
-          </p>
-          <figure>
-            <img src="src/images/ad-example.jpg" alt="Inline Ad Example" style="max-width:100%;">
-            <figcaption>Your in-line advertisement will look like this.</figcaption>
-          </figure>
-          <p>
-            At Lexiconga, we only want to display advertisements that will appeal to our users, so we work directly with our
-            advertisers to maintain a manually curated selection of ads. As an advertiser, you will be creating a professional
-            relationship with Lexiconga to ensure that your advertisements are up to par with what we want our users to see.
-            All this means is that as long as your advertisement is relevant and your product is not predatory, you're good to go.
-          </p>
-          <p>
-            "Relevant" advertisements include but are not limited to:
-          </p>
-          <ul>
-            <li>Books and Authors</li>
-            <li>Conlanging tools</li>
-            <li>Writing tutorials and resoruces</li>
-            <li>Art tutorials and resources</li>
-            <li>Video and tabletop games</li>
-            <li>Blogs and vlogs</li>
-            <li>Cool and interesting products</li>
-            <li>Kickstarters related to the above</li>
-          </ul>
-          <p>
-            We want to help you get the word out about your project or product to Lexiconga users in a way that doesn't
-            interfere with their work while also allowing them to find your cool, interesting, and helpful things.
-          </p>
-
-          <h3>Pricing</h3>
-          <p>
-            As with the advertisements themselves, the pricing structure is fairly simple, too:
-          </p>
-          <ul>
-            <li>
-              <strong>Monthly:</strong> $5.00 per ad
-              <ul>
-                <li>With Priority: $20.00 per ad</li>
-              </ul>
-            </li>
-            <li>
-              <strong>Yearly:</strong> $50.00 per ad <em>(2 months discounted)</em>
-              <ul>
-                <li>With Priority: $200.00 per ad</li>
-              </ul>
-            </li>
-          </ul>
-
-          <h3>What's Priority?</h3>
-          <p>
-            All current advertisements are shuffled and then displayed to Lexiconga users once every 10 words. If you
-            rent your ad space with Priority, then your ads will be shuffled among any other Priority ads and shown
-            <em>before</em> any other ads that were not rented with priority.
-          </p>
-
-          <h3>Get in Touch</h3>
-          <p>
-            If you would like to advertise on Lexiconga or if you have any questions, please contact us at
-            <a href="mailto:ads@lexicon.ga?subject=Advertising%20on%20Lexiconga">ads@lexicon.ga</a> to get started.
-            We look forward to working with you!
-          </p>
-        </article>
-      </section>
-    </section>
-  </main>
-  <footer id="bottom">
-    <a href="https://liberapay.com/robbieantenesse" target="_blank" rel="noopener" class="small button">Support Lexiconga</a>
-    <a href="https://blog.lexicon.ga" target="_blank" rel="noopener" class="small button">Blog</a>
-    <a href="." target="_blank" class="small button">Advertise</a>
-    <a href="https://github.com/Alamantus/Lexiconga/issues" target="_blank" rel="noopener" class="small button">Issues</a>
-    <a href="https://github.com/Alamantus/Lexiconga/releases" target="_blank" rel="noopener" class="small button">Updates</a>
-    <span class="separator">|</span>
-    <a class="button" id="helpInfoButton">Help</a>
-    <a class="button" id="termsInfoButton">Terms</a>
-    <a class="button" id="privacyInfoButton">Privacy</a>
-  </footer>
-</body>
-</html>
--- a/dev/resize-images.js
+++ b/dev/resize-images.js
@ -9,7 +9,7 @@ if (!fs.existsSync(folder)) {

 const favicon = sharp('./src/images/favicon.svg');

-sharp('./src/images/logo.svg').toFile(folder + 'logo.png', (err, info) => {
+sharp('./src/images/social.jpg').toFile(folder + 'social.jpg', (err, info) => {
  if (err) return console.error(err);
  console.log(info);
 });
--- a/offline.html
+++ b/offline.html
@ -12,7 +12,7 @@
  <meta property="og:type" content="website">
  <meta property="og:title" content="Lexiconga (OFFLINE)">
  <meta property="og:description" content="The quick and easy (offline) dictionary builder for constructed languages.">
-  <meta property="og:image" content="processedImages/logo.png">
+  <meta property="og:image" content="processedImages/social.jpg">

  <meta name="twitter:card" content="summary">
  <meta name="twitter:image:alt" content="Lexiconga logo">
@ -139,6 +139,17 @@
        <label>Details<span class="red">*</span><a class="label-button maximize-button">Maximize</a><br>
          <textarea id="wordDetails" placeholder="Markdown formatting allowed"></textarea>
        </label>
+        <label>
+          <a id="expandAdvancedForm" class="small button expand-advanced-form">Show Advanced Fields</a>
+        </label>
+        <div id="advancedForm" class="advanced-word-form" style="display:none;">
+          <label>Etymology / Root Words<br>
+            <input id="wordEtymology" maxlength="2500" placeholder="comma,separated,root,words">
+          </label>
+          <label>Related Words<br>
+            <input id="wordRelated" maxlength="2500" placeholder="comma,separated,related,words">
+          </label>
+        </div>
        <div id="wordErrorMessage"></div>
        <a class="button" id="addWordButton">Add Word</a>
      </form>
@ -177,7 +188,6 @@
  <footer id="bottom">
    <a href="https://liberapay.com/robbieantenesse" target="_blank" rel="noopener" class="small button">Support Lexiconga</a>
    <a href="https://blog.lexicon.ga" target="_blank" rel="noopener" class="small button">Blog</a>
-    <a href="./advertising.html" target="_blank" class="small button">Advertise</a>
    <a href="https://github.com/Alamantus/Lexiconga/issues" target="_blank" rel="noopener" class="small button">Issues</a>
    <a href="https://github.com/Alamantus/Lexiconga/releases" target="_blank" rel="noopener" class="small button">Updates</a>
    <span class="separator">|</span>
--- a/package.json
+++ b/package.json
@ -1,16 +1,16 @@
 {
-  "name": "lexiconga-lite",
-  "version": "1.0.0",
-  "description": "A light-as-possible rewrite of Lexiconga",
+  "name": "lexiconga",
+  "version": "2.2.1",
+  "description": "The quick and easy dictionary builder for constructed languages.",
  "main": "template-index.html",
-  "repository": "https://cybre.tech/Alamantus/lexiconga-lite.git",
+  "repository": "https://github.com/Alamantus/Lexiconga.git",
  "author": "Robbie Antenesse <dev@alamantus.com>",
  "license": "UNLICENCED",
  "scripts": {
-    "start": "npm run process-images && concurrently \"npm run watch-js\" \"npm run watch-php\" \"npm run copy-files\"",
+    "dev": "npm run process-images && concurrently \"npm run watch-js\" \"npm run watch-php\" \"npm run copy-files\"",
    "watch-js": "parcel watch template-index.html offline.html template-view.html template-passwordreset.html --no-hmr --public-url /lexiconga/",
    "watch-php": "cpx \"src/php/**/{*,.*}\" dist -v -w",
-    "bundle": "npm run process-images && npm run bundle-js && npm run copy-files && npm run copy-php",
+    "build": "npm run process-images && npm run bundle-js && npm run copy-files && npm run copy-php",
    "bundle-js": "parcel build template-index.html offline.html template-view.html template-passwordreset.html --no-source-maps",
    "copy-files": "cpx \"node_modules/upup/dist/*.min.js\" dist -v",
    "copy-php": "cpx \"src/php/**/{*,.*}\" dist",
@ -21,18 +21,19 @@
    "clear-cache": "rimraf .cache/{*,.*}"
  },
  "devDependencies": {
-    "autoprefixer": "^9.6.1",
-    "concurrently": "^4.1.1",
+    "autoprefixer": "9.8.6",
+    "concurrently": "^6.4.0",
    "cpx": "^1.5.0",
-    "parcel-bundler": "^1.12.3",
-    "rimraf": "^2.6.3",
-    "sass": "^1.22.4",
-    "sharp": "^0.22.1"
+    "parcel-bundler": "^1.12.5",
+    "parcel-plugin-goodie-bag": "^2.0.0",
+    "rimraf": "^3.0.2",
+    "sass": "^1.32.6",
+    "sharp": "^0.29.3"
  },
  "dependencies": {
-    "marked": "^0.6.3",
+    "marked": "^3.0.8",
    "normalize.css": "^8.0.1",
-    "papaparse": "^4.6.3",
+    "papaparse": "^5.3.0",
    "upup": "^1.1.0"
  }
 }
--- a/src/constants.js
+++ b/src/constants.js
@ -35,6 +35,9 @@ export const DEFAULT_DICTIONARY = {
      partOfSpeech: '',
      definition: '',
      details: '',
+      etymology: [],
+      related: [],
+      principalParts: [],
      wordId: 0
    }, */
  ],
@ -54,11 +57,11 @@ export const DEFAULT_DICTIONARY = {
 export const DEFAULT_SETTINGS = {
  useIPAPronunciationField: true,
  useHotkeys: true,
+  showAdvanced: false,
  defaultTheme: 'default',
+  templates: [],
 };

-export const DISPLAY_AD_EVERY = 10;
-
 export const DEFAULT_PAGE_SIZE = 50;

 export const LOCAL_STORAGE_KEY = 'dictionary';
--- a/src/helpers.js
+++ b/src/helpers.js
@ -69,15 +69,6 @@ export function removeTags(html) {
  return html;
 }

-export function shuffle(array) {
-  // Fisher-Yates shuffle
-  for (let i = array.length - 1; i > 0; i--) {
-    const j = Math.floor(Math.random() * (i + 1));
-    [array[i], array[j]] = [array[j], array[i]];
-  }
-  return array;
-}
-
 export function slugify(string) {
  return removeDiacritics(string).replace(/[^a-zA-Z0-9-_]/g, '-');
 }
--- a/src/images/social.jpg
+++ b/src/images/social.jpg
--- a/src/index.js
+++ b/src/index.js
@ -4,7 +4,6 @@ import { renderAll } from './js/render';
 import { hasToken, addMessage } from './js/utilities';
 import { loadDictionary } from './js/dictionaryManagement';
 import { loadSettings } from './js/settings';
-import { setupAds } from './js/ads';

 function initialize() {
  if (window.isOffline) {
@ -23,7 +22,6 @@ function initialize() {
    });
  }

-  setupAds();
  renderAll();
 }

--- a/src/js/KeyboardFire/phondue/ipa-table.html
+++ b/src/js/KeyboardFire/phondue/ipa-table.html
@ -1,5 +1,5 @@
 <p>
-  <em>Hover over characters to see their Phondue shortcuts.</em>
+  <em>Hover over characters to see their Phondue shortcuts. Use Field Help to show full Phondue instructions.</em>
 </p>
 <table className='table is-bordered'>
  <thead>
@ -583,6 +583,9 @@
      <th id='cell_9_9' class='td-lbl' colspan="7">
        Diacritics
      </th>
+      <th id='cell_9_10' class='td-lbl' colspan="1">
+        Tones
+      </th>
    </tr>
  </thead>
  <tbody>
@ -647,35 +650,42 @@
      <td id='cell_10_13' class='td-lbl'>
      </td>
      <td id='cell_10_14' class='td-btn'>
-        <button title=''>
+        <button title='O_ o_ _O _o'>
          ̥
        </button>
      </td>
      <td id='cell_10_15' class='td-btn'>
-        <button title=''>
+        <button title='U_ u_ _U _u'>
          ̬
        </button>
      </td>
      <td id='cell_10_16' class='td-btn'>
-        <button title=''>
+        <button title=':_ _:'>
          ̤
        </button>
      </td>
      <td id='cell_10_17' class='td-btn'>
-        <button title=''>
+        <button title='~_ _~'>
          ̰
        </button>
      </td>
      <td id='cell_10_18' class='td-btn'>
-        <button title=''>
+        <button title='_|'>
          ̩
        </button>
      </td>
      <td id='cell_10_19' class='td-btn'>
-        <button title=''>
+        <button title='^_ _^'>
          ̯
        </button>
      </td>
+      <td id='cell_10_20' class='td-lbl'>
+      </td>
+      <td id='cell_10_21' class='td-btn'>
+        <button title='5|'>
+          ˥
+        </button>
+      </td>
    </tr>
    <tr>
      <th id='cell_11_0' class='td-lbl' colspan="1">
@ -729,35 +739,42 @@
      <td id='cell_11_13' class='td-lbl'>
      </td>
      <td id='cell_11_14' class='td-btn'>
-        <button title=''>
+        <button title='[_ _['>
          ̪
        </button>
      </td>
      <td id='cell_11_15' class='td-btn'>
-        <button title=''>
+        <button title='{_ _{'>
          ̼
        </button>
      </td>
      <td id='cell_11_16' class='td-btn'>
-        <button title=''>
+        <button title=']_ _]'>
          ̺
        </button>
      </td>
      <td id='cell_11_17' class='td-btn'>
-        <button title=''>
+        <button title='#_ _# []'>
          ̻
        </button>
      </td>
      <td id='cell_11_18' class='td-btn'>
-        <button title=''>
+        <button title='h^ ^h'>
          ʰ
        </button>
      </td>
      <td id='cell_11_19' class='td-btn'>
-        <button title=''>
+        <button title='>^ ^>'>
          ̚
        </button>
      </td>
+      <td id='cell_10_20' class='td-lbl'>
+      </td>
+      <td id='cell_10_21' class='td-btn'>
+        <button title='4|'>
+          ˦
+        </button>
+      </td>
    </tr>
    <tr>
      <th id='cell_12_0' class='td-lbl' colspan="1">
@ -820,35 +837,42 @@
      <td id='cell_12_13' class='td-lbl'>
      </td>
      <td id='cell_12_14' class='td-btn'>
-        <button title=''>
+        <button title='+_ _+'>
          ̟
        </button>
      </td>
      <td id='cell_12_15' class='td-btn'>
-        <button title=''>
+        <button title='__'>
          ̠
        </button>
      </td>
      <td id='cell_12_16' class='td-btn'>
-        <button title=''>
+        <button title=':^ ^:'>
          ̈
        </button>
      </td>
      <td id='cell_12_17' class='td-btn'>
-        <button title=''>
+        <button title='x^ ^x'>
          ̽
        </button>
      </td>
      <td id='cell_12_18' class='td-btn'>
-        <button title=''>
+        <button title="'-_ -'_">
          ̝
        </button>
      </td>
      <td id='cell_12_19' class='td-btn'>
-        <button title=''>
+        <button title=',-_ -,_'>
          ̞
        </button>
      </td>
+      <td id='cell_10_20' class='td-lbl'>
+      </td>
+      <td id='cell_10_21' class='td-btn'>
+        <button title='3|'>
+          ˧
+        </button>
+      </td>
    </tr>
    <tr>
      <th id='cell_13_0' class='td-lbl' colspan="1">
@ -877,7 +901,7 @@
        </button>
      </td>
      <td id='cell_13_9' class='td-btn'>
-        <button title='&quot)'>
+        <button title="')">
          ʼ
        </button>
      </td>
@ -896,40 +920,45 @@
      <td id='cell_13_13' class='td-lbl'>
      </td>
      <td id='cell_13_14' class='td-btn'>
-        <button title=''>
+        <button title='w^ ^w'>
          ʷ
        </button>
      </td>
      <td id='cell_13_15' class='td-btn'>
-        <button title=''>
+        <button title='j^ ^j'>
          ʲ
        </button>
      </td>
      <td id='cell_13_16' class='td-btn'>
-        <button title=''>
+        <button title='h/^'>
          ᶣ
        </button>
      </td>
      <td id='cell_13_17' class='td-btn'>
-        <button title=''>
+        <button title='vO^ v0^'>
          ᶹ
        </button>
      </td>
      <td id='cell_13_18' class='td-btn'>
-        <button title=''>
+        <button title='XO^'>
          ˠ
        </button>
      </td>
      <td id='cell_13_19' class='td-btn'>
-        <button title=''>
+        <button title='?/^'>
          ˤ
        </button>
      </td>
      <td id='cell_13_20' class='td-btn'>
-        <button title=''>
+        <button title='~^ ^~'>
          ̴
        </button>
      </td>
+      <td id='cell_10_21' class='td-btn'>
+        <button title='2|'>
+          ˨
+        </button>
+      </td>
    </tr>
    <tr>
      <th id='cell_14_0' class='td-lbl' colspan="1">
@ -992,35 +1021,42 @@
      <td id='cell_14_13' class='td-lbl'>
      </td>
      <td id='cell_14_14' class='td-btn'>
-        <button title=''>
+        <button title=')_ _)'>
          ̹
        </button>
      </td>
      <td id='cell_14_15' class='td-btn'>
-        <button title=''>
+        <button title='(_ _('>
          ̜
        </button>
      </td>
      <td id='cell_14_16' class='td-btn'>
-        <button title=''>
+        <button title='<|_ |<_'>
          ̘
        </button>
      </td>
      <td id='cell_14_17' class='td-btn'>
-        <button title=''>
+        <button title='>|_ |>_'>
          ̙
        </button>
      </td>
      <td id='cell_14_18' class='td-btn'>
-        <button title=''>
+        <button title='~^ ^~'>
          ̃
        </button>
      </td>
      <td id='cell_14_19' class='td-btn'>
-        <button title=''>
+        <button title='>r r>'>
          ˞
        </button>
      </td>
+      <td id='cell_10_20' class='td-lbl'>
+      </td>
+      <td id='cell_10_21' class='td-btn'>
+        <button title='1|'>
+          ˩
+        </button>
+      </td>
    </tr>
    <tr>
      <th id='cell_15_0' class='td-lbl' colspan="1">
@ -1111,7 +1147,7 @@
        Suprasegmental
      </th>
      <td id='cell_16_12' class='td-btn'>
-        <button title='&quot&quot'>
+        <button title="''">
          ˈ
        </button>
      </td>
@ -1131,7 +1167,7 @@
        </button>
      </td>
      <td id='cell_16_16' class='td-btn'>
-        <button title=''>
+        <button title='u^ ^u'>
          ̆
        </button>
      </td>
--- a/src/js/account/render.js
+++ b/src/js/account/render.js
@ -25,7 +25,6 @@ export function renderLoginForm() {
        <div>
          <h2>Create a New Account</h2>
          <p>Creating an account allows you to save and switch between as many dictionaries as you need and access them from any device for free! If you have a dictionary you've been working on loaded already, it will automatically be uploaded to your account when you log in for the first time.</p>
-          <p>Plus if you allow us to send you emails, we'll make sure that you're the first to hear about any new features that get added or if any of our policies change for any reason. We'll never spam you or sell your information.</p>
          <p>By creating an account, you are indicating that you agree to the Terms of Service and that you understand Lexiconga's Privacy Policy.</p>
          <label>Email<br>
            <input type="email" id="createNewEmail" maxlength="100">
@ -40,9 +39,10 @@ export function renderLoginForm() {
            <input type="text" id="createNewPublicName" maxlength="50">
          </label>
          <label>Allow Emails
-            <input type="checkbox" id="createNewAllowEmails">
+          <input type="checkbox" id="createNewAllowEmails">
          </label>
-          <p>Creating an account is <em>not</em> required to use Lexiconga's core features. Click "Help" in the site footer to learn what accounts provide.</p>
+          <p><small>If you allow emails, you'll be informed if any of our policies change for any reason. We'll <em>never</em> spam you or sell your information.</small></p>
+          <p><strong>Remember:</strong> Creating an account is <em>not</em> required to use Lexiconga's core features. Click "Help" in the site footer to learn what accounts provide.</p>
          <section id="createAccountErrorMessages"></section>
          <button id="createAccountSubmit" class="button">Create Account</button>
        </div>
@ -94,18 +94,22 @@ export function renderAccountActions() {
  const accountActionsHTML = `<h3>Account Actions</h3>
  <label>Change Dictionary<br><select id="accountSettingsChangeDictionary"></select></label>
  <p><a class="button" id="accountSettingsCreateNewDictionary">Create New Dictionary</a></p>
-  <h4>Request Your Data</h4>
-  <p>
-    Per your <a href="https://www.eugdpr.org/" target="_blank">GDPR</a> rights in Articles 13–15 and 20, we allow you to request any and all data we have stored about you. The only data we have about you personally is your email address and your Public Name, if you decided to set one. All other data (your Dictionary data) is visible and accessible via the Export button under your Dictionary's Settings. Send an email to help@lexicon.ga to request your information.
-  </p>
+  <details>
+    <summary><h4>Request Your Data</h4></summary>
+    <p>
+      Per your <a href="https://www.eugdpr.org/" target="_blank">GDPR</a> rights in Articles 13–15 and 20, we allow you to request any and all data we have stored about you. The only data we have about you personally is your email address and your Public Name, if you decided to set one. All other data (your Dictionary data) is visible and accessible via the Export button under your Dictionary's Settings. Send an email to help@lexicon.ga to request your information.
+    </p>
+  </details>

-  <h4>Delete Your Account</h4>
-  <p>
-    Per your <a href="https://www.eugdpr.org/" target="_blank">GDPR</a> rights in Articles 17, if you wish for your account to be deleted, please contact us at help@lexicon.ga, and we will delete your account and all associated dictionaries and words as quickly as possible. Note that you can delete dictionaries yourself via your Dictionary's Settings.
-  </p>
-  <p>
-    Anything that is deleted from our system is permanently and irretrievably removed from our system and cannot be restored, though search engines or internet archives may retain a cached version of your content (there is nothing we can do about this, and you will need to seek out removal of that information by directly contacting the services that are caching your data).
-  </p>
+  <details>
+    <summary><h4>Delete Your Account</h4></summary>
+    <p>
+      Per your <a href="https://www.eugdpr.org/" target="_blank">GDPR</a> rights in Articles 17, if you wish for your account to be deleted, please contact us at help@lexicon.ga, and we will delete your account and all associated dictionaries and words as quickly as possible. Note that you can delete dictionaries yourself via your Dictionary's Settings.
+    </p>
+    <p>
+      Anything that is deleted from our system is permanently and irretrievably removed from our system and cannot be restored, though search engines or internet archives may retain a cached version of your content (there is nothing we can do about this, and you will need to seek out removal of that information by directly contacting the services that are caching your data).
+    </p>
+  </details>
  `;
  accountActionsColumn.innerHTML = accountActionsHTML;

--- a/src/js/account/sync.js
+++ b/src/js/account/sync.js
@ -174,10 +174,11 @@ export function syncWords(remoteWords, deletedWords) {
  }
  
  remoteWords.forEach(remoteWord => {
-    let localWord = words.find(word => word.wordId === remoteWord.wordId);
+    const localWordIndex = words.findIndex(word => word.wordId === remoteWord.wordId);
+    const localWord = words[localWordIndex];
    if (localWord) {
      if (localWord.lastUpdated < remoteWord.lastUpdated) {
-        localWord = remoteWord;
+        words[localWordIndex] = remoteWord;
      } else if (localWord.lastUpdated > remoteWord.lastUpdated) {
        // Add more-recently-updated words to upload
        localWordsToUpload.push(localWord);
--- a/src/js/ads.js
+++ b/src/js/ads.js
@ -1,36 +0,0 @@
-import { DISPLAY_AD_EVERY } from '../constants.js';
-import ads from '../../ads.json';
-import { shuffle } from '../helpers.js';
-
-export function setupAds() {
-  const priority = shuffle(ads.filter(ad => isActive(ad) && ad.isPriority));
-  const regular = shuffle(ads.filter(ad => isActive(ad) && !ad.isPriority));
-  window.ads = [...priority, ...regular];
-}
-
-function isActive(ad) {
-  const date = new Date();
-  return date >= new Date(ad.start) && date < new Date(ad.end);
-}
-
-export function renderAd(wordPosition) {
-  if (window.hasOwnProperty('ads') && window.ads) {
-    if (wordPosition % DISPLAY_AD_EVERY === 3) {
-      const adIndex = Math.floor(wordPosition / DISPLAY_AD_EVERY) % window.ads.length;
-      const ad = window.ads[adIndex];
-      return `<article class="entry">
-        <header>
-          <h4 class="word">${ad.header}</h4>
-        </header>
-        <dl>
-          <dt class="definition">${ad.body}</dt>
-          <dd class="details">
-            <a href="${ad.link}" target="_blank" class="button">${ad.cta}</a>
-          </dd>
-        </dl>
-      </article>`;
-    }
-  }
-
-  return '';
-}
--- a/src/js/dictionaryManagement.js
+++ b/src/js/dictionaryManagement.js
@ -8,7 +8,6 @@ import { addWord, sortWords } from "./wordManagement";
 import { migrateDictionary } from './migration';

 export function updateDictionary () {
-
  renderDictionaryDetails();
 }

@ -49,6 +48,7 @@ export function openEditModal() {
  }

  document.getElementById('editModal').style.display = '';
+  Array.from(document.querySelectorAll('#editModal .modal-content section')).forEach(section => section.scrollTop = 0);
 }

 export function saveEditModal() {
@ -237,21 +237,63 @@ export function importWords() {
              console.error('Error Importing Word: ', err)
            });
          } else {
-            const row = results.data[0];
-            const importedWord = addWord({
+            const row = results.data;
+            const wordToImport = {
              name: removeTags(row.word).trim(),
              pronunciation: removeTags(row.pronunciation).trim(),
              partOfSpeech: removeTags(row['part of speech']).trim(),
              definition: removeTags(row.definition).trim(),
              details: removeTags(row.explanation).trim(),
              wordId: getNextId(),
-            }, false, false, false);
+            };
+            if (typeof row['etymology'] !== 'undefined') {
+              const etymology = removeTags(row['etymology']).trim().split(',').filter(etymology => etymology.trim() !== '');
+              if (etymology.length > 0) {
+                wordToImport.etymology = etymology;
+              }
+            }
+            if (typeof row['etymology (comma-separated)'] !== 'undefined') {
+              const etymology = removeTags(row['etymology (comma-separated)']).trim().split(',').filter(etymology => etymology.trim() !== '');
+              if (etymology.length > 0) {
+                wordToImport.etymology = etymology;
+              }
+            }
+            if (typeof row['related words'] !== 'undefined') {
+              const related = removeTags(row['related words']).trim().split(',').filter(related => related.trim() !== '');
+              if (related.length > 0) {
+                wordToImport.related = related;
+              }
+            }
+            if (typeof row['related words (comma-separated)'] !== 'undefined') {
+              const related = removeTags(row['related words (comma-separated)']).trim().split(',').filter(related => related.trim() !== '');
+              if (related.length > 0) {
+                wordToImport.related = related;
+              }
+            }
+            if (typeof row['principal parts'] !== 'undefined') {
+              const principalParts = removeTags(row['principal parts']).trim().split(',').filter(principalParts => principalParts.trim() !== '');
+              if (principalParts.length > 0) {
+                wordToImport.principalParts = principalParts;
+              }
+            }
+            if (typeof row['principal parts (comma-separated)'] !== 'undefined') {
+              const principalParts = removeTags(row['principal parts (comma-separated)']).trim().split(',').filter(principalParts => principalParts.trim() !== '');
+              if (principalParts.length > 0) {
+                wordToImport.principalParts = principalParts;
+              }
+            }
+            const importedWord = addWord(wordToImport, false);

            importedWords.push(importedWord);
+
+            // Sort and save every 500 words, just in case something goes wrong on large imports
+            if (importedWords.length % 500 == 499) {
+              sortWords(false);
+            }
          }
        },
        complete: () => {
-          saveDictionary(false);
+          sortWords(false);
          renderAll();
          importWordsField.value = '';
          document.getElementById('editModal').style.display = 'none';
@ -301,6 +343,9 @@ export function exportWords() {
        'part of speech': word.partOfSpeech,
        definition: word.definition,
        explanation: word.details,
+        'etymology (comma-separated)': typeof word.etymology !== 'undefined' ? word.etymology.join(',') : '',
+        'related words (comma-separated)': typeof word.related !== 'undefined' ? word.related.join(',') : '',
+        'principal parts (comma-separated)': typeof word.principalParts !== 'undefined' ? word.principalParts.join(',') : '',
      }
    });
    const csv = papa.unparse(words, { quotes: true });
--- a/src/js/migration.js
+++ b/src/js/migration.js
@ -1,5 +1,6 @@
 import { LOCAL_STORAGE_KEY, DEFAULT_DICTIONARY, MIGRATE_VERSION } from "../constants";
 import { saveDictionary } from "./dictionaryManagement";
+import { getTimestampInSeconds } from "../helpers";

 export default function migrate() {
  if (window.location.pathname === '/') {
--- a/src/js/render/details.js
+++ b/src/js/render/details.js
@ -60,7 +60,7 @@ export function renderDetails() {
  const consonantHTML = `<p><strong>Consonants</strong><br>${consonants.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`;
  const vowelHTML = `<p><strong>Vowels</strong><br>${vowels.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`;
  const blendHTML = blends.length > 0 ? `<p><strong>Polyphthongs&nbsp;/&nbsp;Blends</strong><br>${blends.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>` : '';
-  const phonologyNotesHTML = phonology.notes.trim().length > 0 ? '<p><strong>Notes</strong></p><div>' + md(removeTags(phonology.notes)) + '</div>' : '';
+  const phonologyNotesHTML = phonology.notes.trim().length > 0 ? '<p><strong>Notes</strong></p><div>' + md(parseReferences(removeTags(phonology.notes))) + '</div>' : '';
  const phonologyHTML = `<h2>Phonology</h2>
  <div class="split two">
    <div>${consonantHTML}</div>
@ -73,7 +73,7 @@ export function renderDetails() {
  const onsetHTML = `<p><strong>Onset</strong><br>${onset.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`;
  const nucleusHTML = `<p><strong>Nucleus</strong><br>${nucleus.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`;
  const codaHTML = `<p><strong>Coda</strong><br>${coda.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`;
-  const phonotacticsNotesHTML = phonotactics.notes.trim().length > 0 ? '<p><strong>Notes</strong></p><div>' + md(removeTags(phonotactics.notes)) + '</div>' : '';
+  const phonotacticsNotesHTML = phonotactics.notes.trim().length > 0 ? '<p><strong>Notes</strong></p><div>' + md(parseReferences(removeTags(phonotactics.notes))) + '</div>' : '';
  const phonotacticsHTML = onset.length + nucleus.length + coda.length + phonotacticsNotesHTML.length > 0
    ? `<h2>Phonotactics</h2>
  ${onset.length > 0 || nucleus.length > 0 || coda.length > 0
@ -93,14 +93,14 @@ export function renderDetails() {
    }
    return false;
  }).filter(html => html !== false).join(' ')}</p>` : '';
-  const orthographyNotesHTML = orthography.notes.trim().length > 0 ? '<p><strong>Notes</strong><br>' + md(removeTags(orthography.notes)) + '</div>' : '';
+  const orthographyNotesHTML = orthography.notes.trim().length > 0 ? '<p><strong>Notes</strong><br>' + md(parseReferences(removeTags(orthography.notes))) + '</div>' : '';
  const orthographyHTML = translations.length + orthographyNotesHTML.length > 0
    ? `<h2>Orthography</h2>
  ${translationsHTML}
  ${orthographyNotesHTML}`
    : '';
  const grammarHTML = grammar.notes.trim().length > 0 ? '<h2>Grammar</h2><div>'
-    + (grammar.notes.trim().length > 0 ? md(removeTags(grammar.notes)) : '')
+    + (grammar.notes.trim().length > 0 ? md(parseReferences(removeTags(grammar.notes))) : '')
  + '</div>' : '';

  detailsPanel.innerHTML = generalHTML + phonologyHTML + phonotacticsHTML + orthographyHTML + grammarHTML;
@ -123,7 +123,7 @@ export function renderPartsOfSpeech(onlyOptions = false) {
    searchHTML = '<label>Unclassified <input type="checkbox" checked id="searchPartOfSpeech__None"></label>';
  window.currentDictionary.partsOfSpeech.forEach(partOfSpeech => {
    partOfSpeech = removeTags(partOfSpeech);
-    optionsHTML += `<option value="${partOfSpeech}">${partOfSpeech}</option>`;
+    optionsHTML += `<option value="${partOfSpeech.replace(/"/g, '&quot;')}">${partOfSpeech}</option>`;
    searchHTML += `<label>${partOfSpeech} <input type="checkbox" checked id="searchPartOfSpeech_${slugify(partOfSpeech)}"></label>`;
  });
  searchHTML += `<a class="small button" id="checkAllFilters">Check All</a> <a class="small button" id="uncheckAllFilters">Uncheck All</a>`;
--- a/src/js/render/index.js
+++ b/src/js/render/index.js
@ -1,11 +1,13 @@
 import { renderDictionaryDetails, renderPartsOfSpeech } from './details';
 import { renderWords } from './words';
+import { renderTemplateSelectOptions } from './settings';

 export function renderAll() {
  renderTheme();
  renderCustomCSS();
  renderDictionaryDetails();
  renderPartsOfSpeech();
+  renderTemplateSelectOptions();
  renderWords();
 }

--- a/src/js/render/settings.js
+++ b/src/js/render/settings.js
@ -0,0 +1,46 @@
+import { setupTemplateSelectOptions } from "../setupListeners/settings";
+
+export function renderTemplateSelectOptions() {
+  const { templates } = window.settings;
+
+  if (typeof templates !== 'undefined') {
+    const templatesOptionsHTML = templates.map((template, index) => {
+      return `<option value="${index.toString()}">${template.name}</options>`;
+    }).join('');
+
+    Array.from(document.getElementsByClassName('template-select')).forEach(select => {
+      if (select.id !== 'savedDetailsTemplates' && templates.length < 1) {
+        return select.parentElement.style.display = 'none';
+      } else {
+        select.parentElement.style.display = '';
+      }
+      select.innerHTML = '<option value="" selected="selected">None Selected</option>' + templatesOptionsHTML;
+    });
+
+    setupTemplateSelectOptions();
+  }
+}
+
+export function showTemplateEditor(show = true) {
+  document.getElementById('templateFields').style.display = show ? '' : 'none';
+  if (show) {
+    document.getElementById('templateTextarea').focus();
+    document.querySelector('#settingsModal .modal-content section').scrollTop = 9999;
+  } else {
+    clearTemplateEditor();
+  }
+}
+
+export function showSelectedTemplate(template, index) {
+  const nameField = document.getElementById('templateNameField');
+  nameField.value = template.name;
+  nameField.setAttribute('template', index.toString());
+  document.getElementById('templateTextarea').value = template.template;
+  showTemplateEditor(true);
+}
+
+export function clearTemplateEditor() {
+  document.getElementById('savedDetailsTemplates').value = '';
+  document.getElementById('templateNameField').value = '';
+  document.getElementById('templateTextarea').value = '';
+}
--- a/src/js/render/words.js
+++ b/src/js/render/words.js
@ -4,15 +4,66 @@ import { getHomonymnNumber, hasToken } from '../utilities';
 import { getMatchingSearchWords, highlightSearchTerm, getSearchFilters, getSearchTerm } from '../search';
 import {
  setupWordOptionButtons,
-  setupPagination,
+  // setupPagination,
  setupWordOptionSelections,
  setupWordEditFormButtons,
 } from '../setupListeners/words';
-import { getPaginationData } from '../pagination';
-import { getOpenEditForms, translateOrthography, parseReferences } from '../wordManagement';
-import { renderAd } from '../ads';
+// import { getPaginationData } from '../pagination';
+import { getOpenEditForms, translateOrthography, parseReferences, getWordReferenceMarkdown } from '../wordManagement';
 import { getPublicLink } from '../account/utilities';
 import { renderPartsOfSpeech } from './details';
+import { renderTemplateSelectOptions } from './settings';
+
+export function renderWord(savedWord, isPublic) {
+  const word = highlightSearchTerm({
+    name: removeTags(savedWord.name),
+    pronunciation: removeTags(savedWord.pronunciation),
+    partOfSpeech: removeTags(savedWord.partOfSpeech),
+    definition: removeTags(savedWord.definition),
+    details: parseReferences(removeTags(savedWord.details)),
+    etymology: typeof savedWord.etymology === 'undefined' || savedWord.etymology.length < 1 ? null
+      : savedWord.etymology.map(root => getWordReferenceMarkdown(removeTags(root))).join(', '),
+    related: typeof savedWord.related === 'undefined' || savedWord.related.length < 1 ? null
+      : savedWord.related.map(relatedWord => getWordReferenceMarkdown(removeTags(relatedWord))).join(', '),
+    principalParts: typeof savedWord.principalParts === 'undefined' || savedWord.principalParts.length < 1 ? null
+      : savedWord.principalParts.join(', '),
+    wordId: savedWord.wordId,
+  });
+  const homonymnNumber = getHomonymnNumber(savedWord);
+  const shareLink = window.currentDictionary.hasOwnProperty('externalID') ? getPublicLink() + '/' + word.wordId : '';
+
+  let wordNameDisplay = translateOrthography(word.name);
+
+  return `<article class="entry" id="${word.wordId}">
+    <header>
+      <h4 class="word"><span class="orthographic-translation">${wordNameDisplay}</span>${homonymnNumber > 0 ? ' <sub>' + homonymnNumber.toString() + '</sub>' : ''}</h4>
+      ${word.principalParts === null ? '' : `<span class="principalParts">(${word.principalParts})</span>`}
+      <span class="pronunciation">${word.pronunciation}</span>
+      <span class="part-of-speech">${word.partOfSpeech}</span>
+      ${isPublic ? `<a class="small button share-link" href="${shareLink}" target="_blank" title="Public Link to Word">&#10150;</a>` : ''}
+      <span class="small button word-option-button">Options</span>
+      <div class="word-option-list" style="display:none;">
+        <div class="word-option" id="edit_${word.wordId}">Edit</div>
+        <div class="word-option" id="delete_${word.wordId}">Delete</div>
+      </div>
+    </header>
+    <dl>
+      <dt class="definition">${word.definition}</dt>
+      <dd class="details">
+        ${md(word.details)}
+      </dd>
+      ${word.etymology === null && word.related === null ? '' : `<hr>`}
+      ${word.etymology === null ? '' : `<dt>Etymology <small>(Root Word${savedWord.etymology.length !== 1 ? 's' : ''})</small></dt>
+      <dd class="etymology">
+        ${md(word.etymology).replace(/<\/?p>/g, '')}
+      </dd>`}
+      ${word.related === null ? '' : `<dt>Related Word${savedWord.related.length !== 1 ? 's' : ''}</dt>
+      <dd class="related">
+        ${md(word.related).replace(/<\/?p>/g, '')}
+      </dd>`}
+    </dl>
+  </article>`;
+}

 export function renderWords() {
  let wordsHTML = '';
@ -52,42 +103,9 @@ export function renderWords() {

    // const { pageStart, pageEnd } = getPaginationData(words);

-    // words.slice(pageStart, pageEnd).forEach(originalWord => {
-    words.forEach((originalWord, displayIndex) => {
-      const word = highlightSearchTerm({
-        name: removeTags(originalWord.name),
-        pronunciation: removeTags(originalWord.pronunciation),
-        partOfSpeech: removeTags(originalWord.partOfSpeech),
-        definition: removeTags(originalWord.definition),
-        details: parseReferences(removeTags(originalWord.details)),
-        wordId: originalWord.wordId,
-      });
-      const homonymnNumber = getHomonymnNumber(originalWord);
-      const shareLink = window.currentDictionary.hasOwnProperty('externalID') ? getPublicLink() + '/' + word.wordId : '';
-
-      wordsHTML += renderAd(displayIndex);
-
-      let wordNameDisplay = translateOrthography(word.name);
-
-      wordsHTML += `<article class="entry" id="${word.wordId}">
-        <header>
-          <h4 class="word"><span class="orthographic-translation">${wordNameDisplay}</span>${homonymnNumber > 0 ? ' <sub>' + homonymnNumber.toString() + '</sub>' : ''}</h4>
-          <span class="pronunciation">${word.pronunciation}</span>
-          <span class="part-of-speech">${word.partOfSpeech}</span>
-          ${isPublic ? `<a class="small button share-link" href="${shareLink}" target="_blank" title="Public Link to Word">&#10150;</a>` : ''}
-          <span class="small button word-option-button">Options</span>
-          <div class="word-option-list" style="display:none;">
-            <div class="word-option" id="edit_${word.wordId}">Edit</div>
-            <div class="word-option" id="delete_${word.wordId}">Delete</div>
-          </div>
-        </header>
-        <dl>
-          <dt class="definition">${word.definition}</dt>
-          <dd class="details">
-            ${md(word.details)}
-          </dd>
-        </dl>
-      </article>`;
+    // words.slice(pageStart, pageEnd).forEach(savedWord => {
+    words.forEach(savedWord => {
+      wordsHTML += renderWord(savedWord, isPublic);
    });
  }

@ -115,51 +133,73 @@ export function renderWords() {
  // renderPagination(words);
 }

-export function renderPagination(filteredWords) {
-  const paginationData = getPaginationData(filteredWords);
+// export function renderPagination(filteredWords) {
+//   const paginationData = getPaginationData(filteredWords);

-  if (paginationData.pages > 0) {
-    let paginationHTML = (paginationData.currentPage > 0 ? '<span class="button prev-button">&laquo; Previous</span>' : '')
-      + '<select class="page-selector">';
-    for (let i = 0; i < paginationData.pages; i++) {
-      paginationHTML += `<option value="${i}"${paginationData.currentPage === i ? ' selected' : ''}>Page ${i + 1}</option>`;
-    }
-    paginationHTML += '</select>'
-      + (paginationData.currentPage < paginationData.pages - 1 ? '<span class="button next-button">Next &raquo;</span>' : '');
+//   if (paginationData.pages > 0) {
+//     let paginationHTML = (paginationData.currentPage > 0 ? '<span class="button prev-button">&laquo; Previous</span>' : '')
+//       + '<select class="page-selector">';
+//     for (let i = 0; i < paginationData.pages; i++) {
+//       paginationHTML += `<option value="${i}"${paginationData.currentPage === i ? ' selected' : ''}>Page ${i + 1}</option>`;
+//     }
+//     paginationHTML += '</select>'
+//       + (paginationData.currentPage < paginationData.pages - 1 ? '<span class="button next-button">Next &raquo;</span>' : '');

-    Array.from(document.getElementsByClassName('pagination')).forEach(pagination => {
-      pagination.innerHTML = paginationHTML;
-    });
+//     Array.from(document.getElementsByClassName('pagination')).forEach(pagination => {
+//       pagination.innerHTML = paginationHTML;
+//     });

-    setupPagination();
-  }
-}
+//     setupPagination();
+//   }
+// }

 export function renderEditForm(wordId = false) {
  wordId = typeof wordId.target === 'undefined' ? wordId : parseInt(this.id.replace('edit_', ''));
  const word = window.currentDictionary.words.find(w => w.wordId === wordId);
  if (word) {
-    const ipaPronunciationField = `<input id="wordPronunciation_${wordId}" class="ipa-field" maxlength="200" value="${word.pronunciation}"><br>
+    const escapeQuotes = (value) => value.replace(/"/g, '&quot;');
+    const wordHasAdvancedFields = (word.hasOwnProperty('etymology') && word.etymology)
+      || (word.hasOwnProperty('related') && word.related) || (word.hasOwnProperty('principalParts') && word.principalParts);
+    const ipaPronunciationField = `<input id="wordPronunciation_${wordId}" class="ipa-field" maxlength="200" value="${escapeQuotes(word.pronunciation)}"><br>
      <a class="label-help-button ipa-field-help-button">Field Help</a>`;
-    const plainPronunciationField = `<input id="wordPronunciation_${wordId}" maxlength="200" value="${word.pronunciation}">`;
+    const plainPronunciationField = `<input id="wordPronunciation_${wordId}" maxlength="200" value="${escapeQuotes(word.pronunciation)}">`;
    const editForm = `<form id="editForm_${wordId}" class="edit-form">
      <label>Word<span class="red">*</span><br>
-        <input id="wordName_${wordId}" maxlength="200" value="${word.name}">
+        <input id="wordName_${wordId}" maxlength="200" value="${escapeQuotes(word.name)}">
      </label>
      <label>Pronunciation<a class="label-button ipa-table-button">IPA Chart</a><br>
        ${window.settings.useIPAPronunciationField ? ipaPronunciationField : plainPronunciationField}
      </label>
      <label>Part of Speech<br>
        <select id="wordPartOfSpeech_${wordId}" class="part-of-speech-select">
-          <option value="${word.partOfSpeech}" selected>${word.partOfSpeech}</option>
+          <option value="${escapeQuotes(word.partOfSpeech)}" selected>${word.partOfSpeech}</option>
        </select>
      </label>
      <label>Definition<span class="red">*</span><br>
-        <input id="wordDefinition_${wordId}" maxlength="2500" value="${word.definition}" placeholder="Equivalent words">
+        <input id="wordDefinition_${wordId}" maxlength="2500" value="${escapeQuotes(word.definition)}" placeholder="Equivalent words">
      </label>
      <label>Details<span class="red">*</span><a class="label-button maximize-button">Maximize</a><br>
        <textarea id="wordDetails_${wordId}" placeholder="Markdown formatting allowed">${word.details}</textarea>
      </label>
+      <label>
+        <a id="expandAdvancedForm_${wordId}" class="small button expand-advanced-form">${wordHasAdvancedFields || window.settings.showAdvanced ? 'Hide' : 'Show'} Advanced Fields</a>
+      </label>
+      <div id="advancedForm_${wordId}" class="advanced-word-form" style="display:${wordHasAdvancedFields || window.settings.showAdvanced ? 'block' : 'none'};">
+        <label>Details Field Templates
+          <select id="templateSelect_${wordId}" class="template-select">
+          </select>
+          <small>Choose one to fill the details field. (Note: Will erase anything currently there.)</small>
+        </label>
+        <label>Etymology / Root Words<br>
+          <input id="wordEtymology_${wordId}" maxlength="2500" placeholder="comma,separated,root,words" value="${word.hasOwnProperty('etymology') ? escapeQuotes(word.etymology.toString()) : ''}">
+        </label>
+        <label>Related Words<br>
+          <input id="wordRelated_${wordId}" maxlength="2500" placeholder="comma,separated,related,words" value="${word.hasOwnProperty('related') ? escapeQuotes(word.related.toString()) : ''}">
+        </label>
+        <label>Principal Parts<a href="https://en.wikipedia.org/wiki/Principal_parts" target="_blank" class="label-button">What's This?</a><br>
+          <input id="wordPrincipalParts_${wordId}" maxlength="2500" placeholder="comma,separated,principal,parts" value="${word.hasOwnProperty('principalParts') ? escapeQuotes(word.principalParts.toString()) : ''}">
+        </label>
+      </div>
      <div id="wordErrorMessage_${wordId}"></div>
      <a class="button edit-save-changes" id="editWordButton_${wordId}">Save Changes</a>
      <a class="button edit-cancel">Cancel Edit</a>
@ -168,5 +208,6 @@ export function renderEditForm(wordId = false) {
    document.getElementById(wordId.toString()).innerHTML = editForm;
    setupWordEditFormButtons();
    renderPartsOfSpeech(true);
+    renderTemplateSelectOptions();
  }
 }
--- a/src/js/search.js
+++ b/src/js/search.js
@ -42,41 +42,72 @@ export function getSearchFilters() {
  return filters;
 }

+function wordMatchesPartsOfSpeechFilter(word, filters) {
+  if (!filters.allPartsOfSpeechChecked) {
+    const partOfSpeech = word.partOfSpeech === '' ? 'Unclassified' : word.partOfSpeech;
+    return filters.partsOfSpeech.hasOwnProperty(partOfSpeech) && filters.partsOfSpeech[partOfSpeech];
+  }
+  return true;
+}
+
+function wordMatchesSearchTermAndOptions(word, searchTerm, filters) {
+  if (searchTerm === '') return true; // If searchTerm is blank, don't process word.
+
+  searchTerm = filters.ignoreDiacritics ? removeDiacritics(searchTerm) : searchTerm;
+  searchTerm = filters.caseSensitive ? searchTerm : searchTerm.toLowerCase();
+  let name = filters.orthography ? translateOrthography(word.name) : word.name;
+  name = filters.ignoreDiacritics ? removeDiacritics(name) : name;
+  name = filters.caseSensitive ? name : name.toLowerCase();
+  let definition = filters.ignoreDiacritics ? removeDiacritics(word.definition) : word.definition;
+  definition = filters.caseSensitive ? definition : definition.toLowerCase();
+  let details = filters.orthography ? parseReferences(word.details) : word.details;
+  details = filters.ignoreDiacritics ? removeDiacritics(details) : details;
+  details = filters.caseSensitive ? details : details.toLowerCase();
+  let principalParts = typeof word.principalParts === 'undefined' ? [] : word.principalParts;
+  principalParts = filters.orthography ? principalParts.map(part => translateOrthography(part)) : principalParts;
+  principalParts = filters.ignoreDiacritics ? principalParts.map(part => removeDiacritics(part)) : principalParts;
+  principalParts = filters.caseSensitive ? principalParts : principalParts.map(part => part.toLowerCase());
+
+  const isInName = filters.name && (filters.exact
+    ? searchTerm == name
+    : new RegExp(searchTerm, 'g').test(name)
+  );
+  const isInDefinition = filters.definition && (filters.exact
+    ? searchTerm == definition
+    : new RegExp(searchTerm, 'g').test(definition)
+  );
+  const isInDetails = filters.details && new RegExp(searchTerm, 'g').test(details);
+  const isInPrincipalParts = filters.name && (filters.exact
+    ? principalParts.includes(searchTerm)
+    : principalParts.some(part => new RegExp(searchTerm, 'g').test(part))
+  );
+  return isInName || isInDefinition || isInDetails || isInPrincipalParts;
+}
+
 export function getMatchingSearchWords() {
-  let searchTerm = getSearchTerm();
+  const searchTerm = getSearchTerm();
  const filters = getSearchFilters();
  if (searchTerm !== '' || !filters.allPartsOfSpeechChecked) {
-    const matchingWords = window.currentDictionary.words.slice().filter(word => {
-      if (!filters.allPartsOfSpeechChecked) {
-        const partOfSpeech = word.partOfSpeech === '' ? 'Unclassified' : word.partOfSpeech;
-        return filters.partsOfSpeech.hasOwnProperty(partOfSpeech) && filters.partsOfSpeech[partOfSpeech];
-      }
-      return true;
-    }).filter(word => {
-      searchTerm = filters.ignoreDiacritics ? removeDiacritics(searchTerm) : searchTerm;
-      searchTerm = filters.caseSensitive ? searchTerm : searchTerm.toLowerCase();
-      let name = filters.orthography ? translateOrthography(word.name) : word.name;
-      name = filters.ignoreDiacritics ? removeDiacritics(name) : name;
-      name = filters.caseSensitive ? name : name.toLowerCase();
-      let definition = filters.ignoreDiacritics ? removeDiacritics(word.definition) : word.definition;
-      definition = filters.caseSensitive ? definition : definition.toLowerCase();
-      let details = filters.orthography ? parseReferences(word.details) : word.details;
-      details = filters.ignoreDiacritics ? removeDiacritics(details) : details;
-      details = filters.caseSensitive ? details : details.toLowerCase();
-
-      const isInName = filters.name && (filters.exact
-          ? searchTerm == name
-          : new RegExp(searchTerm, 'g').test(name));
-      const isInDefinition = filters.definition && (filters.exact
-          ? searchTerm == definition
-          : new RegExp(searchTerm, 'g').test(definition));
-      const isInDetails = filters.details && new RegExp(searchTerm, 'g').test(details);
-      return searchTerm === '' || isInName || isInDefinition || isInDetails;
-    });
+    const matchingWords = window.currentDictionary.words.slice()
+    .filter(word => wordMatchesPartsOfSpeechFilter(word, filters))
+    .filter(word => wordMatchesSearchTermAndOptions(word, searchTerm, filters));
    return matchingWords;
  }
  
-  return window.currentDictionary.words
+  return window.currentDictionary.words;
+}
+
+export function wordMatchesSearch(word) {
+  const searchTerm = getSearchTerm();
+  const filters = getSearchFilters();
+  if (searchTerm !== '' || !filters.allPartsOfSpeechChecked) {
+    if (searchTerm === '') {
+      return wordMatchesPartsOfSpeechFilter(word, filters);
+    }
+    return wordMatchesPartsOfSpeechFilter(word, filters)
+      && wordMatchesSearchTermAndOptions(word, searchTerm, filters);
+  }
+  return true;
 }

 export function highlightSearchTerm(word) {
@ -99,6 +130,16 @@ export function highlightSearchTerm(word) {
            + '<mark>' + markedUpWord.name.substr(wordIndex, searchTermLength) + '</mark>'
            + markedUpWord.name.substr(wordIndex + searchTermLength);
        });
+
+        if (markedUpWord.principalParts !== null) {
+          const part = getIndicesOf(searchTerm, removeDiacritics(markedUpWord.principalParts), filters.caseSensitive);
+          part.forEach((wordIndex, i) => {
+            wordIndex += '<mark></mark>'.length * i;
+            markedUpWord.principalParts = markedUpWord.principalParts.substring(0, wordIndex)
+              + '<mark>' + markedUpWord.principalParts.substr(wordIndex, searchTermLength) + '</mark>'
+              + markedUpWord.principalParts.substr(wordIndex + searchTermLength);
+          });
+        }
      }
      if (filters.definition) {
        const definitionMatches = getIndicesOf(searchTerm, removeDiacritics(markedUpWord.definition), filters.caseSensitive);
@ -122,6 +163,10 @@ export function highlightSearchTerm(word) {
      const regexMethod = 'g' + (filters.caseSensitive ? '' : 'i');
      if (filters.name) {
        markedUpWord.name = markedUpWord.name.replace(new RegExp(`(${searchTerm})`, regexMethod), `<mark>$1</mark>`);
+        
+        if (markedUpWord.principalParts !== null) {
+          markedUpWord.principalParts = markedUpWord.principalParts.replace(new RegExp(`(${searchTerm})`, regexMethod), `<mark>$1</mark>`);
+        }
      }
      if (filters.definition) {
        markedUpWord.definition = markedUpWord.definition.replace(new RegExp(`(${searchTerm})`, regexMethod), `<mark>$1</mark>`);
--- a/src/js/settings.js
+++ b/src/js/settings.js
@ -4,11 +4,13 @@ import { usePhondueDigraphs } from "./KeyboardFire/phondue/ipaField";
 import { renderWords } from "./render/words";
 import { addMessage, hasToken, objectValuesAreDifferent } from "./utilities";
 import { enableHotKeys, disableHotKeys } from "./hotkeys";
+import { showTemplateEditor, renderTemplateSelectOptions, showSelectedTemplate } from "./render/settings";

 export function loadSettings() {
  const storedSettings = window.localStorage.getItem(SETTINGS_KEY);
  window.settings = storedSettings ? JSON.parse(storedSettings) : cloneObject(DEFAULT_SETTINGS);
  toggleIPAPronunciationFields(false);
+  toggleShowAdvancedFields();
 }

 export function saveSettings() {
@ -17,19 +19,98 @@ export function saveSettings() {
 }

 export function openSettingsModal() {
-  const { useIPAPronunciationField, useHotkeys, defaultTheme } = window.settings;
+  const { useIPAPronunciationField, useHotkeys, showAdvanced, defaultTheme, templates } = window.settings;

  document.getElementById('settingsUseIPA').checked = useIPAPronunciationField;
  document.getElementById('settingsUseHotkeys').checked = useHotkeys;
+  document.getElementById('settingsShowAdvanced').checked = showAdvanced;
  document.getElementById('settingsDefaultTheme').value = defaultTheme;

+  renderTemplateSelectOptions();
+  showTemplateEditor(false);
+
  document.getElementById('settingsModal').style.display = '';
+  document.querySelector('#settingsModal .modal-content section').scrollTop = 0;
+}
+
+export function updateTemplateSelects() {
+  const { templates } = window.settings;
+
+  if (typeof templates !== 'undefined') {
+    const templatesOptionsHTML = templates.map((template, index) => {
+      return `<option value="${index.toString()}">${template.name}</options>`;
+    }).join('');
+    document.getElementById('savedDetailsTemplates').innerHTML = templatesOptionsHTML;
+
+    const templateSelects = document.getElementsByClassName('template-select');
+    Array.from(templateSelects).forEach(select => {
+      select.removeEventListener('click', showWordOptions);
+      select.innerHTML = templatesOptionsHTML;
+      select.addEventListener('click', showWordOptions);
+    })
+  }
+}
+
+export function createTemplate() {
+  window.settings.templates.push({ name: 'New Blank Template', template: '' });
+  const newTemplateIndex = window.settings.templates.length - 1;
+
+  renderTemplateSelectOptions();
+  document.getElementById('savedDetailsTemplates').value = (newTemplateIndex).toString();
+
+  editSavedTemplate(newTemplateIndex);
+}
+
+export function saveTemplate() {
+  const nameField = document.getElementById('templateNameField');
+  const name = nameField.value.trim();
+  const index = parseInt(nameField.getAttribute('template'));
+  const template = document.getElementById('templateTextarea').value;
+  window.settings.templates[index] = { name, template };
+
+  let storedSettings = window.localStorage.getItem(SETTINGS_KEY);
+  storedSettings = storedSettings ? JSON.parse(storedSettings) : cloneObject(DEFAULT_SETTINGS);
+  storedSettings.templates = window.settings.templates;
+  window.localStorage.setItem(SETTINGS_KEY, JSON.stringify(storedSettings));
+  addMessage('Templates Saved!');
+  
+  showTemplateEditor(false);
+
+  renderTemplateSelectOptions();
+}
+
+export function deleteSelectedTemplate() {
+  const nameField = document.getElementById('templateNameField');
+  const index = nameField.getAttribute('template');
+  const name = window.settings.templates[index].name;
+  if (confirm(`Are you sure you want to delete the "${name}" template? This cannot be undone!`)) {
+    delete window.settings.templates[index];
+    window.settings.templates = window.settings.templates.filter(template => template != null);
+
+    saveSettings();
+
+    showTemplateEditor(false);
+
+    renderTemplateSelectOptions();
+  }
+}
+
+export function editSavedTemplate(selectEvent) {
+  const { templates } = window.settings;
+  const selectedIndex = typeof selectEvent.target !== 'undefined' ? selectEvent.target.value : selectEvent;
+
+  if (selectedIndex !== '') {
+    showSelectedTemplate(templates[selectedIndex], selectedIndex);
+  } else {
+    showTemplateEditor(false);
+  }
 }

 export function saveSettingsModal() {
  const updatedSettings = cloneObject(window.settings);
  updatedSettings.useIPAPronunciationField = document.getElementById('settingsUseIPA').checked;
  updatedSettings.useHotkeys = document.getElementById('settingsUseHotkeys').checked;
+  updatedSettings.showAdvanced = document.getElementById('settingsShowAdvanced').checked;
  updatedSettings.defaultTheme = document.getElementById('settingsDefaultTheme').value;

  if (hasToken()) {
@ -62,6 +143,7 @@ export function saveSettingsModal() {
    saveSettings();
    toggleHotkeysEnabled();
    toggleIPAPronunciationFields();
+    toggleShowAdvancedFields();
  } else {
    addMessage('No changes made to Settings.');
  }
@ -101,3 +183,30 @@ export function toggleIPAPronunciationFields(render = true) {
    renderWords();
  }
 }
+
+export function toggleShowAdvancedFields() {
+  const buttons = document.getElementsByClassName('expand-advanced-form'),
+    forms = document.getElementsByClassName('advanced-word-form');
+  const formsWithFilledFields = [];
+
+  Array.from(forms).forEach(form => {
+    const fields = form.querySelectorAll('input, textarea');
+    const formHasFieldFilled = Array.from(fields).some(field => field.value.trim() !== '');
+    if (window.settings.showAdvanced || formHasFieldFilled) {
+      form.style.display = 'block';
+    } else {
+      form.style.display = 'none';
+    }
+    if (formHasFieldFilled) {
+      formsWithFilledFields.push(form.id.replace('advancedForm', ''));
+    }
+  });
+  Array.from(buttons).forEach(button => {
+    const formHasFilledField = formsWithFilledFields.includes(button.id.replace('expandAdvancedForm', ''));
+    if (window.settings.showAdvanced || formHasFilledField) {
+      button.innerText = 'Hide Advanced Fields';
+    } else {
+      button.innerText = 'Show Advanced Fields';
+    }
+  });
+}
--- a/src/js/setupListeners/details.js
+++ b/src/js/setupListeners/details.js
@ -35,7 +35,9 @@ function setupEditFormTabs() {
        document.getElementById('edit' + t.innerText + 'Tab').style.display = 'none';
      });
      tab.classList.add('active');
-      document.getElementById('edit' + tab.innerText + 'Tab').style.display = '';
+      const tabSection = document.getElementById('edit' + tab.innerText + 'Tab');
+      tabSection.style.display = '';
+      tabSection.scrollTop = 0;
    });
  });
 }
--- a/src/js/setupListeners/index.js
+++ b/src/js/setupListeners/index.js
@ -5,14 +5,17 @@ import { fadeOutElement } from '../utilities';
 import { setupDetailsTabs } from './details';
 import { setupWordForm, setupMobileWordFormButton } from './words';
 import { setupIPAButtons, setupHeaderButtons, setupInfoButtons } from './buttons';
+import { setupTemplateForm, setupTemplateSelectOptions } from './settings';

 export default function setupListeners() {
  setupAnnouncements();
  setupDetailsTabs();
+  setupTemplateForm();
  setupHeaderButtons();
  setupWordForm();
  setupMobileWordFormButton();
  setupInfoButtons();
+  setupTemplateSelectOptions();
  if (window.settings.useHotkeys) {
    enableHotKeys();
  }
--- a/src/js/setupListeners/modals.js
+++ b/src/js/setupListeners/modals.js
@ -1,7 +1,16 @@
 import { insertAtCursor, getInputSelection, setSelectionRange } from '../StackOverflow/inputCursorManagement';
-import { openSettingsModal, saveSettingsModal, saveAndCloseSettingsModal } from '../settings';
+import {
+  openSettingsModal,
+  saveSettingsModal,
+  saveAndCloseSettingsModal,
+  createTemplate,
+  saveTemplate
+} from '../settings';

 export function setupSettingsModal() {
+  document.getElementById('createTemplateButton').addEventListener('click', createTemplate);
+  document.getElementById('saveTemplateButton').addEventListener('click', saveTemplate);
+
  document.getElementById('settingsButton').addEventListener('click', openSettingsModal);
  document.getElementById('settingsSave').addEventListener('click', saveSettingsModal);
  document.getElementById('settingsSaveAndClose').addEventListener('click', saveAndCloseSettingsModal);
--- a/src/js/setupListeners/settings.js
+++ b/src/js/setupListeners/settings.js
@ -0,0 +1,31 @@
+import { createTemplate, saveTemplate, editSavedTemplate, deleteSelectedTemplate } from "../settings";
+
+export function setupTemplateForm() {
+  document.getElementById('createTemplateButton').addEventListener('click', createTemplate);
+  document.getElementById('saveTemplateButton').addEventListener('click', saveTemplate);
+  document.getElementById('deleteTemplateButton').addEventListener('click', deleteSelectedTemplate);
+  setupSavedTemplatesSelect();
+}
+
+export function setupSavedTemplatesSelect() {
+  const savedTemplatesSelect = document.getElementById('savedDetailsTemplates');
+
+  savedTemplatesSelect.removeEventListener('change', editSavedTemplate);
+  savedTemplatesSelect.addEventListener('change', editSavedTemplate);
+}
+
+export function setupTemplateSelectOptions() {
+  const fillDetailsWithTemplate = function (e) {
+    if (e.target.value !== '') {
+      const template = window.settings.templates[parseInt(e.target.value)];
+      let detailsId = 'wordDetails' + e.target.id.replace('templateSelect', '');
+      document.getElementById(detailsId).value = template.template;
+    }
+  }
+  Array.from(document.getElementsByClassName('template-select')).forEach(select => {
+    if (select.id !== 'savedDetailsTemplates') {
+      select.removeEventListener('change', fillDetailsWithTemplate);
+      select.addEventListener('change', fillDetailsWithTemplate);
+    }
+  });
+}
--- a/src/js/setupListeners/words.js
+++ b/src/js/setupListeners/words.js
@ -1,17 +1,19 @@
 import { renderEditForm } from '../render/words';
-import { confirmEditWord, cancelEditWord, confirmDeleteWord, submitWordForm } from '../wordManagement';
-import { goToNextPage, goToPreviousPage, goToPage } from '../pagination';
+import { confirmEditWord, cancelEditWord, confirmDeleteWord, expandAdvancedForm, submitWordForm } from '../wordManagement';
+// import { goToNextPage, goToPreviousPage, goToPage } from '../pagination';
 import { setupMaximizeButtons } from './buttons';
 import { setupIPAFields } from '.';

 export function setupWordForm() {
  const wordForm = document.getElementById('wordForm'),
+    expandAdvancedFormButton = document.getElementById('expandAdvancedForm'),
    addWordButton = document.getElementById('addWordButton');
  wordForm.addEventListener('submit', event => {
    // Allow semantic form and prevent it from getting submitted
    event.preventDefault();
    return false;
  });
+  expandAdvancedFormButton.addEventListener('click', expandAdvancedForm);
  addWordButton.addEventListener('click', submitWordForm);

  setupIPAFields();
@ -61,8 +63,13 @@ export function setupWordOptionSelections() {
 }

 export function setupWordEditFormButtons() {
-  const saveChangesButtons = document.getElementsByClassName('edit-save-changes'),
+  const expandAdvancedFormButtons = document.getElementsByClassName('expand-advanced-form'),
+    saveChangesButtons = document.getElementsByClassName('edit-save-changes'),
    cancelChangesButtons = document.getElementsByClassName('edit-cancel');
+  Array.from(expandAdvancedFormButtons).forEach(button => {
+    button.removeEventListener('click', expandAdvancedForm);
+    button.addEventListener('click', expandAdvancedForm);
+  });
  Array.from(saveChangesButtons).forEach(button => {
    button.removeEventListener('click', confirmEditWord);
    button.addEventListener('click', confirmEditWord);
@ -91,22 +98,22 @@ export function setupMobileWordFormButton() {
  });
 }

-export function setupPagination() {
-  const nextButtons = document.getElementsByClassName('next-button'),
-    prevButtons = document.getElementsByClassName('prev-button'),
-    pageSelectors = document.getElementsByClassName('page-selector');
+// export function setupPagination() {
+//   const nextButtons = document.getElementsByClassName('next-button'),
+//     prevButtons = document.getElementsByClassName('prev-button'),
+//     pageSelectors = document.getElementsByClassName('page-selector');

-  Array.from(nextButtons).forEach(nextButton => {
-    nextButton.removeEventListener('click', goToNextPage);
-    nextButton.addEventListener('click', goToNextPage);
-  });
-  Array.from(prevButtons).forEach(prevButton => {
-    prevButton.removeEventListener('click', goToPreviousPage);
-    prevButton.addEventListener('click', goToPreviousPage);
-  });
+//   Array.from(nextButtons).forEach(nextButton => {
+//     nextButton.removeEventListener('click', goToNextPage);
+//     nextButton.addEventListener('click', goToNextPage);
+//   });
+//   Array.from(prevButtons).forEach(prevButton => {
+//     prevButton.removeEventListener('click', goToPreviousPage);
+//     prevButton.addEventListener('click', goToPreviousPage);
+//   });

-  Array.from(pageSelectors).forEach(pageSelector => {
-    pageSelector.removeEventListener('change', goToPage);
-    pageSelector.addEventListener('change', goToPage);
-  });
-}
+//   Array.from(pageSelectors).forEach(pageSelector => {
+//     pageSelector.removeEventListener('change', goToPage);
+//     pageSelector.addEventListener('change', goToPage);
+//   });
+// }
--- a/src/js/utilities.js
+++ b/src/js/utilities.js
@ -1,4 +1,3 @@
-import { addWord } from './wordManagement';
 import { getCookie } from './StackOverflow/cookie';

 export function getNextId() {
--- a/src/js/view/index.js
+++ b/src/js/view/index.js
@ -1,9 +1,7 @@
 import { renderAll } from './render';
 import setupListeners from './setupListeners';
-import { setupAds } from '../ads';

 function initialize() {
-  setupAds();
  renderAll();
  setupListeners();
 }
--- a/src/js/view/render.js
+++ b/src/js/view/render.js
@ -3,7 +3,6 @@ import { removeTags, slugify } from '../../helpers';
 import { getHomonymnNumber } from './utilities';
 import { getMatchingSearchWords, highlightSearchTerm, getSearchFilters, getSearchTerm } from './search';
 import { showSection } from './displayToggles';
-import { renderAd } from '../ads';
 import { setupInfoModal } from '../setupListeners/modals';
 import { setupSearchFilters } from '../setupListeners/search';

@ -66,7 +65,7 @@ export function renderDetails() {
  const consonantHTML = `<p><strong>Consonants</strong><br>${consonants.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`;
  const vowelHTML = `<p><strong>Vowels</strong><br>${vowels.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`;
  const blendHTML = blends.length > 0 ? `<p><strong>Polyphthongs&nbsp;/&nbsp;Blends</strong><br>${blends.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>` : '';
-  const phonologyNotesHTML = phonology.notes.trim().length > 0 ? '<p><strong>Notes</strong></p><div>' + md(removeTags(phonology.notes)) + '</div>' : '';
+  const phonologyNotesHTML = phonology.notes.trim().length > 0 ? '<p><strong>Notes</strong></p><div>' + md(phonology.notes) + '</div>' : '';
  const phonologyHTML = `<h3>Phonology</h3>
  <div class="split two">
    <div>${consonantHTML}</div>
@ -79,11 +78,11 @@ export function renderDetails() {
  const onsetHTML = `<p><strong>Onset</strong><br>${onset.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`;
  const nucleusHTML = `<p><strong>Nucleus</strong><br>${nucleus.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`;
  const codaHTML = `<p><strong>Coda</strong><br>${coda.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`;
-  const phonotacticsNotesHTML = phonotactics.notes.trim().length > 0 ? '<p><strong>Notes</strong></p><div>' + md(removeTags(phonotactics.notes)) + '</div>' : '';
+  const phonotacticsNotesHTML = phonotactics.notes.trim().length > 0 ? '<p><strong>Notes</strong></p><div>' + md(phonotactics.notes) + '</div>' : '';
  const phonotacticsHTML = onset.length + nucleus.length + coda.length + phonotacticsNotesHTML.length > 0
    ? `<h3>Phonotactics</h3>
  ${onset.length > 0 || nucleus.length > 0 || coda.length > 0
-    ? `<div class="split three">
+      ? `<div class="split three">
    <div>${onsetHTML}</div>
    <div>${nucleusHTML}</div>
    <div>${codaHTML}</div>
@ -99,15 +98,17 @@ export function renderDetails() {
    }
    return false;
  }).filter(html => html !== false).join(' ')}</p>` : '';
-  const orthographyNotesHTML = orthography.notes.trim().length > 0 ? '<p><strong>Notes</strong><br>' + md(removeTags(orthography.notes)) + '</div>' : '';
+  const orthographyNotesHTML = orthography.notes.trim().length > 0 ? '<p><strong>Notes</strong><br>' + md(orthography.notes) + '</div>' : '';
  const orthographyHTML = translations.length + orthographyNotesHTML.length > 0
    ? `<h3>Orthography</h3>
  ${translationsHTML}
  ${orthographyNotesHTML}`
    : '';
-  const grammarHTML = grammar.notes.trim().length > 0 ? '<h3>Grammar</h3><div>'
-    + (grammar.notes.trim().length > 0 ? md(removeTags(grammar.notes)) : '')
-  + '</div>' : '';
+  const grammarHTML = grammar.notes.trim().length > 0
+    ? '<h3>Grammar</h3><div>'
+      + (grammar.notes.trim().length > 0 ? md(grammar.notes) : '')
+      + '</div>'
+    : '';

  detailsPanel.innerHTML = generalHTML + phonologyHTML + phonotacticsHTML + orthographyHTML + grammarHTML;
 }
@ -129,7 +130,7 @@ export function renderPartsOfSpeech(onlyOptions = false) {
    searchHTML = '<label>Unclassified <input type="checkbox" checked id="searchPartOfSpeech__None"></label>';
  window.currentDictionary.partsOfSpeech.forEach(partOfSpeech => {
    partOfSpeech = removeTags(partOfSpeech);
-    optionsHTML += `<option value="${partOfSpeech}">${partOfSpeech}</option>`;
+    optionsHTML += `<option value="${partOfSpeech.replace(/"/g, '&quot;')}">${partOfSpeech}</option>`;
    searchHTML += `<label>${partOfSpeech} <input type="checkbox" checked id="searchPartOfSpeech_${slugify(partOfSpeech)}"></label>`;
  });
  searchHTML += `<a class="small button" id="checkAllFilters">Check All</a> <a class="small button" id="uncheckAllFilters">Uncheck All</a>`;
@ -173,24 +174,29 @@ export function renderWords() {
      </article>`;
    }

-    words.forEach((originalWord, displayIndex) => {
+    words.forEach(originalWord => {
      const word = highlightSearchTerm({
        name: removeTags(originalWord.name),
        pronunciation: removeTags(originalWord.pronunciation),
        partOfSpeech: removeTags(originalWord.partOfSpeech),
        definition: removeTags(originalWord.definition),
        details: originalWord.details,
+        etymology: typeof originalWord.etymology === 'undefined' || originalWord.etymology.length < 1 ? null
+          : originalWord.etymology.join(', '),
+        related: typeof originalWord.related === 'undefined' || originalWord.related.length < 1 ? null
+          : originalWord.related.join(', '),
+        principalParts: typeof originalWord.principalParts === 'undefined' || originalWord.principalParts.length < 1 ? null
+          : originalWord.principalParts.join(', '),
        wordId: originalWord.wordId,
      });

      const homonymnNumber = getHomonymnNumber(originalWord);
      const shareLink = window.location.pathname + (window.location.pathname.match(new RegExp(word.wordId + '$')) ? '' : '/' + word.wordId);

-      wordsHTML += renderAd(displayIndex);
-
      wordsHTML += `<article class="entry" id="${word.wordId}">
        <header>
          <h4 class="word"><span class="orthographic-translation">${word.name}</span>${homonymnNumber > 0 ? ' <sub>' + homonymnNumber.toString() + '</sub>' : ''}</h4>
+          ${word.principalParts === null ? '' : `<span class="principalParts">(${word.principalParts})</span>`}
          <span class="pronunciation">${word.pronunciation}</span>
          <span class="part-of-speech">${word.partOfSpeech}</span>
          <a href="${shareLink}" target="_blank" class="small button word-option-button" title="Link to Word">&#10150;</a>
@ -200,6 +206,15 @@ export function renderWords() {
          <dd class="details">
            ${md(word.details)}
          </dd>
+          ${word.etymology === null && word.related === null ? '' : `<hr>`}
+          ${word.etymology === null ? '' : `<dt>Etymology <small>(Root Word${originalWord.etymology.length !== 1 ? 's' : ''})</small></dt>
+          <dd class="etymology">
+            ${md(word.etymology).replace(/<\/?p>/g, '')}
+          </dd>`}
+          ${word.related === null ? '' : `<dt>Related Word${originalWord.related.length !== 1 ? 's' : ''}</dt>
+          <dd class="related">
+            ${md(word.related).replace(/<\/?p>/g, '')}
+          </dd>`}
        </dl>
      </article>`;
    });
--- a/src/js/view/search.js
+++ b/src/js/view/search.js
@ -22,7 +22,7 @@ export function getSearchFilters() {
    caseSensitive: document.getElementById('searchCaseSensitive').checked,
    ignoreDiacritics: document.getElementById('searchIgnoreDiacritics').checked,
    exact: document.getElementById('searchExactWords').checked,
-    orthography: document.getElementById('searchOrthography').checked,
+    // orthography is removed my default because it is already rendered on the backend.
    name: document.getElementById('searchIncludeName').checked,
    definition: document.getElementById('searchIncludeDefinition').checked,
    details: document.getElementById('searchIncludeDetails').checked,
@ -54,23 +54,30 @@ export function getMatchingSearchWords() {
    }).filter(word => {
      searchTerm = filters.ignoreDiacritics ? removeDiacritics(searchTerm) : searchTerm;
      searchTerm = filters.caseSensitive ? searchTerm : searchTerm.toLowerCase();
-      let name = filters.orthography ? translateOrthography(word.name) : word.name;
-      name = filters.ignoreDiacritics ? removeDiacritics(name) : name;
+      let name = filters.ignoreDiacritics ? removeDiacritics(word.name) : word.name;
      name = filters.caseSensitive ? name : name.toLowerCase();
      let definition = filters.ignoreDiacritics ? removeDiacritics(word.definition) : word.definition;
      definition = filters.caseSensitive ? definition : definition.toLowerCase();
-      let details = filters.orthography ? parseReferences(word.details) : word.details;
-      details = filters.ignoreDiacritics ? removeDiacritics(details) : details;
+      let details = filters.ignoreDiacritics ? removeDiacritics(word.details) : word.details;
      details = filters.caseSensitive ? details : details.toLowerCase();
+      let principalParts = typeof word.principalParts === 'undefined' ? [] : word.principalParts;
+      principalParts = filters.ignoreDiacritics ? principalParts.map(part => removeDiacritics(part)) : principalParts;
+      principalParts = filters.caseSensitive ? principalParts : principalParts.map(part => part.toLowerCase());

      const isInName = filters.name && (filters.exact
-          ? searchTerm == name
-          : new RegExp(searchTerm, 'g').test(name));
+        ? searchTerm == name
+        : new RegExp(searchTerm, 'g').test(name)
+      );
      const isInDefinition = filters.definition && (filters.exact
-          ? searchTerm == definition
-          : new RegExp(searchTerm, 'g').test(definition));
+        ? searchTerm == definition
+        : new RegExp(searchTerm, 'g').test(definition)
+      );
      const isInDetails = filters.details && new RegExp(searchTerm, 'g').test(details);
-      return searchTerm === '' || isInName || isInDefinition || isInDetails;
+      const isInPrincipalParts = filters.name && (filters.exact
+        ? principalParts.includes(searchTerm)
+        : principalParts.some(part => new RegExp(searchTerm, 'g').test(part))
+      );
+      return searchTerm === '' || isInName || isInDefinition || isInDetails || isInPrincipalParts;
    });
    return matchingWords;
  }
@ -83,10 +90,6 @@ export function highlightSearchTerm(word) {
  if (searchTerm) {
    const filters = getSearchFilters();
    const markedUpWord = cloneObject(word);
-    if (filters.orthography) {
-      markedUpWord.name = translateOrthography(markedUpWord.name);
-      markedUpWord.details = parseReferences(markedUpWord.details);
-    }
    if (filters.ignoreDiacritics) {
      const searchTermLength = searchTerm.length;
      searchTerm = removeDiacritics(searchTerm);
@ -98,6 +101,16 @@ export function highlightSearchTerm(word) {
            + '<mark>' + markedUpWord.name.substr(wordIndex, searchTermLength) + '</mark>'
            + markedUpWord.name.substr(wordIndex + searchTermLength);
        });
+
+        if (markedUpWord.principalParts !== null) {
+          const part = getIndicesOf(searchTerm, removeDiacritics(markedUpWord.principalParts), filters.caseSensitive);
+          part.forEach((wordIndex, i) => {
+            wordIndex += '<mark></mark>'.length * i;
+            markedUpWord.principalParts = markedUpWord.principalParts.substring(0, wordIndex)
+              + '<mark>' + markedUpWord.principalParts.substr(wordIndex, searchTermLength) + '</mark>'
+              + markedUpWord.principalParts.substr(wordIndex + searchTermLength);
+          });
+        }
      }
      if (filters.definition) {
        const definitionMatches = getIndicesOf(searchTerm, removeDiacritics(markedUpWord.definition), filters.caseSensitive);
@ -121,6 +134,10 @@ export function highlightSearchTerm(word) {
      const regexMethod = 'g' + (filters.caseSensitive ? '' : 'i');
      if (filters.name) {
        markedUpWord.name = markedUpWord.name.replace(new RegExp(`(${searchTerm})`, regexMethod), `<mark>$1</mark>`);
+        
+        if (markedUpWord.principalParts !== null) {
+          markedUpWord.principalParts = markedUpWord.principalParts.replace(new RegExp(`(${searchTerm})`, regexMethod), `<mark>$1</mark>`);
+        }
      }
      if (filters.definition) {
        markedUpWord.definition = markedUpWord.definition.replace(new RegExp(`(${searchTerm})`, regexMethod), `<mark>$1</mark>`);
--- a/src/js/view/wordManagement.js
+++ b/src/js/view/wordManagement.js
@ -1,4 +1,3 @@
-import { wordExists, getHomonymnIndexes } from "./utilities";
 import removeDiacritics from "../StackOverflow/removeDiacritics";

 export function sortWords() {
@ -10,46 +9,3 @@ export function sortWords() {
    return removeDiacritics(wordA[sortBy]).toLowerCase() > removeDiacritics(wordB[sortBy]).toLowerCase() ? 1 : -1;
  });
 }
-
-export function parseReferences(detailsMarkdown) {
-  const references = detailsMarkdown.match(/\{\{.+?\}\}/g);
-  if (references && Array.isArray(references)) {
-    new Set(references).forEach(reference => {
-      let wordToFind = reference.replace(/\{\{|\}\}/g, '');
-      let homonymn = 0;
-      
-      if (wordToFind.includes(':')) {
-        const separator = wordToFind.indexOf(':');
-        homonymn = wordToFind.substr(separator + 1);
-        wordToFind = wordToFind.substring(0, separator);
-        if (homonymn && homonymn.trim()
-          && !isNaN(parseInt(homonymn.trim())) && parseInt(homonymn.trim()) > 0) {
-          homonymn = parseInt(homonymn.trim());
-        } else {
-          homonymn = false;
-        }
-      }
-
-      let existingWordId = false;
-      const homonymnIndexes = getHomonymnIndexes({ name: wordToFind, wordId: -1 });
-
-      if (homonymn !== false && homonymn > 0) {
-        if (typeof homonymnIndexes[homonymn - 1] !== 'undefined') {
-          existingWordId = window.currentDictionary.words[homonymnIndexes[homonymn - 1]].wordId;
-        }
-      } else if (homonymn !== false) {
-        existingWordId = wordExists(wordToFind, true);
-      }
-
-      if (existingWordId !== false) {
-        if (homonymn < 1 && homonymnIndexes.length > 0) {
-          homonymn = 1;
-        }
-        const homonymnSubHTML = homonymn > 0 ? '<sub>' + homonymn.toString() + '</sub>' : '';
-        const wordMarkdownLink = `[${wordToFind}${homonymnSubHTML}](#${existingWordId})`;
-        detailsMarkdown = detailsMarkdown.replace(new RegExp(reference, 'g'), wordMarkdownLink);
-      }
-    });
-  }
-  return detailsMarkdown;
-}
--- a/src/js/wordManagement.js
+++ b/src/js/wordManagement.js
@ -1,8 +1,10 @@
-import { renderWords } from "./render/words";
+import { renderWords, renderWord } from "./render/words";
 import { wordExists, addMessage, getNextId, hasToken, getHomonymnIndexes } from "./utilities";
 import removeDiacritics from "./StackOverflow/removeDiacritics";
 import { removeTags, getTimestampInSeconds } from "../helpers";
 import { saveDictionary } from "./dictionaryManagement";
+import { setupWordOptionButtons, setupWordOptionSelections } from "./setupListeners/words";
+import { wordMatchesSearch } from "./search";

 export function validateWord(word, wordId = false) {
  const errorElementId = wordId === false ? 'wordErrorMessage' : 'wordErrorMessage_' + wordId,
@ -116,38 +118,8 @@ export function parseReferences(detailsMarkdown) {
  const references = detailsMarkdown.match(/\{\{.+?\}\}/g);
  if (references && Array.isArray(references)) {
    new Set(references).forEach(reference => {
-      let wordToFind = reference.replace(/\{\{|\}\}/g, '');
-      let homonymn = 0;
-      
-      if (wordToFind.includes(':')) {
-        const separator = wordToFind.indexOf(':');
-        homonymn = wordToFind.substr(separator + 1);
-        wordToFind = wordToFind.substring(0, separator);
-        if (homonymn && homonymn.trim()
-          && !isNaN(parseInt(homonymn.trim())) && parseInt(homonymn.trim()) > 0) {
-          homonymn = parseInt(homonymn.trim());
-        } else {
-          homonymn = false;
-        }
-      }
-
-      let existingWordId = false;
-      const homonymnIndexes = getHomonymnIndexes({ name: wordToFind, wordId: -1 });
-
-      if (homonymn !== false && homonymn > 0) {
-        if (typeof homonymnIndexes[homonymn - 1] !== 'undefined') {
-          existingWordId = window.currentDictionary.words[homonymnIndexes[homonymn - 1]].wordId;
-        }
-      } else if (homonymn !== false) {
-        existingWordId = wordExists(wordToFind, true);
-      }
-
-      if (existingWordId !== false) {
-        if (homonymn < 1 && homonymnIndexes.length > 0) {
-          homonymn = 1;
-        }
-        const homonymnSubHTML = homonymnIndexes.length > 1 && homonymn - 1 >= 0 ? '<sub>' + homonymn.toString() + '</sub>' : '';
-        const wordMarkdownLink = `<span class="word-reference">[<span class="orthographic-translation">${translateOrthography(wordToFind)}</span>${homonymnSubHTML}](#${existingWordId})</span>`;
+      const wordMarkdownLink = getWordReferenceMarkdown(reference);
+      if (wordMarkdownLink !== reference) {
        detailsMarkdown = detailsMarkdown.replace(new RegExp(reference, 'g'), wordMarkdownLink);
      }
    });
@ -155,12 +127,66 @@ export function parseReferences(detailsMarkdown) {
  return detailsMarkdown;
 }

+export function getWordReferenceMarkdown(reference) {
+  let wordToFind = reference.replace(/\{\{|\}\}/g, '');
+  let homonymn = 0;
+
+  if (wordToFind.includes(':')) {
+    const separator = wordToFind.indexOf(':');
+    homonymn = wordToFind.substr(separator + 1);
+    wordToFind = wordToFind.substring(0, separator);
+    if (homonymn && homonymn.trim()
+      && !isNaN(parseInt(homonymn.trim())) && parseInt(homonymn.trim()) > 0) {
+      homonymn = parseInt(homonymn.trim());
+    } else {
+      homonymn = false;
+    }
+  }
+
+  let existingWordId = false;
+  const homonymnIndexes = getHomonymnIndexes({ name: wordToFind, wordId: -1 });
+
+  if (homonymn !== false && homonymn > 0) {
+    if (typeof homonymnIndexes[homonymn - 1] !== 'undefined') {
+      existingWordId = window.currentDictionary.words[homonymnIndexes[homonymn - 1]].wordId;
+    }
+  } else if (homonymn !== false) {
+    existingWordId = wordExists(wordToFind, true);
+  }
+
+  if (existingWordId !== false) {
+    if (homonymn < 1 && homonymnIndexes.length > 0) {
+      homonymn = 1;
+    }
+    const homonymnSubHTML = homonymnIndexes.length > 1 && homonymn - 1 >= 0 ? '<sub>' + homonymn.toString() + '</sub>' : '';
+    return `<span class="word-reference">[<span class="orthographic-translation">${translateOrthography(wordToFind)}</span>${homonymnSubHTML}](#${existingWordId})</span>`;
+  }
+
+  return reference;
+}
+
+export function expandAdvancedForm(id = false) {
+  const wordId = typeof id.target !== 'undefined' ? this.id.replace('expandAdvancedForm', '') : id;
+  const button = typeof id.target !== 'undefined' ? this : document.getElementById('expandAdvancedForm' + (!wordId ? '' : wordId)),
+    form = document.getElementById('advancedForm' + (!wordId ? '' : wordId));
+  if (form.style.display !== 'block') {
+    button.innerText = 'Hide Advanced Fields';
+    form.style.display = 'block';
+  } else {
+    button.innerText = 'Show Advanced Fields';
+    form.style.display = 'none';
+  }
+}
+
 export function submitWordForm() {
  const name = document.getElementById('wordName').value,
    pronunciation = document.getElementById('wordPronunciation').value,
    partOfSpeech = document.getElementById('wordPartOfSpeech').value,
    definition = document.getElementById('wordDefinition').value,
-    details = document.getElementById('wordDetails').value;
+    details = document.getElementById('wordDetails').value,
+    etymology = document.getElementById('wordEtymology').value,
+    related = document.getElementById('wordRelated').value,
+    principalParts = document.getElementById('wordPrincipalParts').value;

  const word = {
    name: removeTags(name).trim(),
@ -171,8 +197,28 @@ export function submitWordForm() {
    wordId: getNextId(),
  };

+  if (removeTags(etymology).trim() !== '') {
+    word.etymology = removeTags(etymology).split(',').map(w => w.trim()).filter(w => w.length > 0);
+  }
+
+  if (removeTags(related).trim() !== '') {
+    word.related = removeTags(related).split(',').map(w => w.trim()).filter(w => w.length > 0);
+  }
+
+  if (removeTags(principalParts).trim() !== '') {
+    word.principalParts = removeTags(principalParts).split(',').map(w => w.trim()).filter(w => w.length > 0);
+  }
+
  if (validateWord(word)) {
    addWord(word);
+    sortWords(true);
+
+    if (hasToken()) {
+      import('./account/index.js').then(account => {
+        account.uploadWord(word);
+      });
+    }
+
    clearWordForm();
  }
 }
@ -184,10 +230,15 @@ export function clearWordForm() {
  document.getElementById('wordDefinition').value = '';
  document.getElementById('wordDetails').value = '';

+  document.getElementById('templateSelect').value = '';
+  document.getElementById('wordEtymology').value = '';
+  document.getElementById('wordRelated').value = '';
+  document.getElementById('wordPrincipalParts').value = '';
+
  document.getElementById('wordName').focus();
 }

-export function addWord(word, render = true, message = true, upload = true) {
+export function addWord(word, message = true) {
  const timestamp = getTimestampInSeconds();
  word.lastUpdated = timestamp;
  word.createdOn = timestamp;
@ -195,13 +246,6 @@ export function addWord(word, render = true, message = true, upload = true) {
  if (message) {
    addMessage(`<a href="#${word.wordId}">${word.name}</a> Created Successfully`, 30000);
  }
-  sortWords(render);
-
-  if (upload && hasToken()) {
-    import('./account/index.js').then(account => {
-      account.uploadWord(word);
-    });
-  }

  return word;
 }
@ -231,11 +275,30 @@ export function updateWord(word, wordId) {
    console.error('Could not find word to update');
    addMessage('Could not find word to update. Please refresh your browser and try again.', 10000, 'error');
  } else {
+    const isPublic = hasToken() && window.currentDictionary.settings.isPublic;
+    const { sortByDefinition } = window.currentDictionary.settings;
+    const existingWord = window.currentDictionary.words[wordIndex];
+    const needsReRender = (sortByDefinition && word.definition !== existingWord.definition)
+      || (!sortByDefinition && word.name !== existingWord.name);
    word.lastUpdated = getTimestampInSeconds();
-    word.createdOn = window.currentDictionary.words[wordIndex].createdOn;
+    word.createdOn = existingWord.createdOn;
    window.currentDictionary.words[wordIndex] = word;
    addMessage('Word Updated Successfully');
-    sortWords(true);
+
+    if (needsReRender) {
+      sortWords(true);
+    } else {
+      saveDictionary(false);
+      const entry = document.getElementById(wordId.toString());
+      if (!wordMatchesSearch(word)) {
+        entry.parentElement.removeChild(entry);
+      } else {
+        console.log('matches search, updating in place');
+        document.getElementById(wordId.toString()).outerHTML = renderWord(window.currentDictionary.words[wordIndex], isPublic);
+        setupWordOptionButtons();
+        setupWordOptionSelections();
+      }
+    }

    if (hasToken()) {
      import('./account/index.js').then(account => {
@ -251,7 +314,10 @@ export function confirmEditWord(id) {
    pronunciation = document.getElementById('wordPronunciation_' + wordId).value,
    partOfSpeech = document.getElementById('wordPartOfSpeech_' + wordId).value,
    definition = document.getElementById('wordDefinition_' + wordId).value,
-    details = document.getElementById('wordDetails_' + wordId).value;
+    details = document.getElementById('wordDetails_' + wordId).value,
+    etymology = document.getElementById('wordEtymology_' + wordId).value,
+    related = document.getElementById('wordRelated_' + wordId).value,
+    principalParts = document.getElementById('wordPrincipalParts_' + wordId).value;

  const word = {
    name: removeTags(name).trim(),
@ -262,6 +328,18 @@ export function confirmEditWord(id) {
    wordId,
  };

+  if (removeTags(etymology).trim() !== '') {
+    word.etymology = removeTags(etymology).split(',').map(w => w.trim()).filter(w => w.length > 0);
+  }
+
+  if (removeTags(related).trim() !== '') {
+    word.related = removeTags(related).split(',').map(w => w.trim()).filter(w => w.length > 0);
+  }
+
+  if (removeTags(principalParts).trim() !== '') {
+    word.principalParts = removeTags(principalParts).split(',').map(w => w.trim()).filter(w => w.length > 0);
+  }
+
  if (validateWord(word, wordId)) {
    if (confirm(`Are you sure you want to save changes to "${word.name}"?`)) {
      document.getElementById('editForm_' + wordId).classList.add('done');
--- a/src/markdown/help.md
+++ b/src/markdown/help.md
@ -9,6 +9,7 @@
  * [Referencing Other Words](#referencing-other-words)
  * [Maximizing Large Text Boxes](#maximizing-large-text-boxes)
  * [IPA Auto-Fill Fields](#ipa-auto-fill-fields)
+  * [Advanced Fields](#advanced-fields)
  * [Entry Management](#entry-management)
  * [Search/Filter](#searchfilter)
  * [The Settings Window](#the-settings-window)
@ -62,13 +63,29 @@ If you have more than one word with the same spelling, the duplicate words will
 If you need more space to see what you are entering into a word's Details field or any other long text field with a "Maximize" button, clicking "Maximize" will give you a larger view of the text box to enter text in. When you're done writing, click either the "Done" or &times; button or any of the darker space outside of the larger view, and your text will be in the original text area. It will even preserve your cursor position or highlighted text so you don't lose your place moving from the larger view back to the small (and vice-versa)!

 ### IPA Auto-Fill Fields
-
 You may notice some buttons around the Pronunciation field in the main word form and some other fields in the Details tab of your Dictionary Settings menu. This indicates that the field is using a special feature that generates [International Phonetic Alphabet](https://en.wikipedia.org/wiki/International_Phonetic_Alphabet) (IPA) characters when typing certain combinations of characters. Click the "Field Help" button below the field for instructions on how to use those fields.

 You can also click the "IPA Table" button to display a maximized table that shows all of the characters in the IPA. Clicking them will add it to the pronunciation field wherever you position the cursor in the field. If you hover over the button for an IPA character that is not on a standard keyboard, you can what character combinations will produce that character when you type it in the field.

 If you do not want to use the IPA field feaure, you can turn it off in the Settings. Click the "Settings" button in the top right side of the website, uncheck "Use IPA Auto-Fill", and click "Save" or "Save & Close". The "IPA Table" and "Field Help" buttons will be removed from all fields they were around, and you can use those fields as normal.

+### Advanced Fields
+Clicking the button labeled "Show Advanced Fields" underneath the **Details** field on any word form will expand the "Advanced Fields" section for that word list. Clicking the button again when it says "Hide Advanced Fields" will hide the section again to make it so you don't have to scroll down to reach the "Add Word" button. The fields in the Advanced Fields section are detailed below:
+
+- **Details Field Templates:** A dropdown box with any templates you have previously created (see [Templates for Details Fields](#templates-for-details-fields) in the Settings section below to learn how to create a template). Selecting one of the templates will put that template into the Details field for you, _overwriting **anything** that might have already been written there_.
+  - If there are no templates created, this field will not be displayed.
+  - Each time you select a different template (other than the "None Selected" option), it will overwrite anything in the Details field with the template without warning, so please be careful.
+  - Selecting the "None Selected" option at the top of the list will _not_ change the Details field.
+- **Etymology / Root Words:** Any words that the current word might have stemmed from originally.
+  - Words written here are treated as word references (see [Referencing Other Words](#referencing-other-words) for how to reference a word or a duplicate word) without requiring the \{\{double-curly-braces\}\} as in the Details field. The words referenced here will appear below the word's details in the list.
+  - Separate each individual root word with a comma.
+- **Related Words:** Any words that might be related to the current word.
+  - Words written here are treated as word references (see [Referencing Other Words](#referencing-other-words) for how to reference a word or a duplicate word) without requiring the \{\{double-curly-braces\}\} as in the Details field. The words referenced here will appear below the word's details in the list.
+  - Separate each individual related word with a comma.
+- **Principal Parts:** Any words that someone must know in order to conjugate the current word (see the [Wikipedia entry](https://en.wikipedia.org/wiki/Principal_parts) for more details).
+  - Words written here are treated as word references (see [Referencing Other Words](#referencing-other-words) for how to reference a word or a duplicate word) without requiring the \{\{double-curly-braces\}\} as in the Details field. The words referenced here will appear below the word's details in the list.
+  - Separate each individual principal part with a comma.
+
 ### Entry Management
 After adding some words to your dictionary, you'll see an "Options" button on each entry. Clicking the button reveals Edit and Delete buttons.

@ -102,16 +119,25 @@ When you have a search term or filter applied, you can see the number of results
 To display _all_ of your words again, clear your search bar and ensure all the "Include Only" checkboxes are checked.

 ### The Settings Window
-
 Clicking the "Settings" button in the top-right side of Lexiconga will show the Settings window with some options.

 - **Use IPA Auto-Fill:** Check this to use character combinations to input International Phonetic Alphabet characters into Pronunciation fields. Use the "Field Help" button for instructions on how to use it and the "IPA Table" to display available characters. Uncheck it to disable the feature and hide the buttons.
 - **Use Hotkeys:** Check this to enable keyboard combinations to perform different helpful actions (see [Keyboard Shortcuts](#keyboard-shortcuts) below). Unchecking this disables the feature.
  - Note: If your browser does not support required features, this will be disabled automatically.
+- **Show Advanced Fields By Default:** Check this to make the advanced fields show on word forms without needing to click the "Show Advanced Fields" button (see [Advanced Fields](#advanced-fields) above). Unchecking this makes it so you need to click the "Show Advanced Fields" button to show the fields each time you edit a word.
 - **Default Theme:** Choose what color theme new dictionaries will use when they are created.

 After making changes, click the "Save" or "Save & Close" button to save your changes.

+#### Templates for Details Fields
+Below the "Default Theme" selector is the template editor. Either click "Create New Template" or choose one from the "Saved Templates" dropdown to begin editing the template. Once a new template is created or a saved template is selected, new fields will appear labeled "Template Name" and "Template," plus a "Save Template" and "Delete Template" button.
+
+You can modify the template's name by editing the "Template Name" field, and whatever you set in the "Template" text area will be used as the template in the Details field of a word form if it is selected (see [Advanced Fields](#advanced-fields) above for more about how this is used).
+
+After making any changes to a template, click the "Save Template" button below the "Template" field to save it to your browser. Templates are only stored in the browser they were created on and _do not_ get uploaded to your account (if you have one). If you create a template, it will _not be available on any other web browser_ unless you re-create it!
+
+Clicking the "Delete Template" button will prompt you to confirm that you want to delete it, and if you confirm, it will permanently delete the currently selected template from your browser. There is no way to recover deleted templates!
+
 ### The Dictionary Settings Window

 Clicking the "Edit" button under your dictionary's name will display a window with tabs that each contain different fields and options.
--- a/src/markdown/privacy.md
+++ b/src/markdown/privacy.md
@ -37,7 +37,7 @@ If User decides to opt-in to our mailing list, they will receive emails that may
 Users may find advertising or other content on our Site that link to the sites and services of our partners, suppliers, advertisers, sponsors, licencors and other third parties. While we manually curate what links we allow in our advertisements, we do not control the content that appears on these sites and are not responsible for the practices employed by websites linked to or from our Site. In addition, these sites or services, including their content and links, may be constantly changing. These sites and services may have their own privacy policies and customer service policies. Browsing and interaction on any other website, including websites which have a link to our Site, is subject to that website's own terms and policies.

 ### Advertising
-Ads appearing on our site are manually chosen to by the Lexiconga's administrator, only appear as text, and never set cookies. You can see all active advertisements at any time in the [source code on Github](https://github.com/Alamantus/Lexiconga/blob/master/ads.json).
+No advertisements exist in the Lexiconga source code. Any advertisements you might see when viewing a Lexiconga dictionary will only have been added by a user for their own reasons.

 ### Changes to this privacy policy
 Lexiconga has the discretion to update this privacy policy at any time. When we do, we will post a notification on the main page of our Site. We encourage Users to frequently check this page for any changes to stay informed about how we are helping to protect the personal information we collect. You acknowledge and agree that it is your responsibility to review this privacy policy periodically and become aware of modifications.
--- a/src/php/.htaccess
+++ b/src/php/.htaccess
@ -1,3 +1,6 @@
+# To resolve the issue with "Your connection to this site is not secure" message
+Header set Content-Security-Policy: upgrade-insecure-requests env=HTTPS 
+
 RewriteEngine On    # Turn on the rewriting engine

 RewriteRule    ^view/([0-9]+)/([0-9]+)/?$    router.php?view=word&dict=$1&word=$2    [NC,L]    # Handle word ids.
--- a/src/php/announcements.json
+++ b/src/php/announcements.json
@ -1,14 +1,14 @@
 [
  {
-    "header": "New Features have Arrived!",
-    "body": "<p><em>July 15, 2019</em> &ndash; Custom Alphabetical Order, Orthographic Translations, and Custom Styling are now here!</p><p>Check the <a href=\"https://github.com/Alamantus/Lexiconga/releases\" target=\"_blank\" rel=\"noopener\">Updates page</a> for all the new features and bug fixes!</p>",
-    "expire": "January 1, 2020",
-    "dismissId": "wave1"
+    "header": "Lexiconga is now fully ad-free",
+    "body": "<p><em>August 26, 2022</em> &ndash; Out of the goodness of my heart, I've decided to completely remove advertisements from Lexiconga. They were kind of pointless anyway. If you want to support Lexiconga's developer (who keeps Lexiconga online with his own money), we thank you for using the \"Support Lexiconga\" button in the website footer!</p>",
+    "expire": "December 31, 2022",
+    "dismissId": "adFreeAnnouncement"
  },
  {
-    "header": "Welcome to Lexiconga 2.0!",
-    "body": "<p><em>July 1, 2019</em> &ndash; Lexiconga has been rewritten from the ground up!</p><p>Check the <a href=\"https://github.com/Alamantus/Lexiconga/releases\" target=\"_blank\" rel=\"noopener\">Updates page</a> for all the new features, or click Help to get a refresher on how to use Lexiconga!</p>",
-    "expire": "January 1, 2020",
-    "dismissId": "welcome"
+    "header": "Warning to Safari Users",
+    "body": "<p><em>December 16, 2021</em> &ndash; It has come to our attention that Apple is working on updates to their Safari browser (the default browser engine for iPhones, iPads, and MacBooks) that automatically deletes local content from browsers after 7 days. <a href=\"https://blog.lexicon.ga/post/670777320117764096/important-warning-for-safari-users\" target=\"_blank\">Read our blog post</a> to learn what that means for you.",
+    "expire": "December 31, 2022",
+    "dismissId": "iOSWarning"
  }
 ]
--- a/src/php/api/Dictionary.php
+++ b/src/php/api/Dictionary.php
@ -95,7 +95,7 @@ VALUES ($new_id, ?, ?, ?, ?, ?, ?)";
    $result = $this->db->query($query)->fetch();
    if ($result) {
      // Default json values in case they are somehow not created by front end first
-      $partsOfSpeech = $result['parts_of_speech'] !== '' ? $result['parts_of_speech'] : $this->defaults['partsOfSpeech'];
+      $partsOfSpeech = isset($result['parts_of_speech']) && $result['parts_of_speech'] !== '' ? $result['parts_of_speech'] : $this->defaults['partsOfSpeech'];

      return array(
        'externalID' => $result['id'],
@ -215,11 +215,14 @@ WHERE dictionary=$dictionary";
  }

  public function getWords ($user, $dictionary) {
-    $query = "SELECT words.* FROM words JOIN dictionaries ON id = dictionary WHERE dictionary=$dictionary AND user=$user";
+    $query = "SELECT words.*, wa.etymology, wa.related, wa.principal_parts FROM words
+LEFT JOIN words_advanced wa ON wa.dictionary = words.dictionary AND wa.word_id = words.word_id
+JOIN dictionaries ON dictionaries.id = words.dictionary
+WHERE words.dictionary=$dictionary AND dictionaries.user=$user";
    $results = $this->db->query($query)->fetchAll();
    if ($results) {
      return array_map(function ($row) {
-        return array(
+        $word = array(
          'name' => $row['name'],
          'pronunciation' => $row['pronunciation'],
          'partOfSpeech' => $row['part_of_speech'],
@ -229,6 +232,20 @@ WHERE dictionary=$dictionary";
          'createdOn' => intval($row['created_on']),
          'wordId' => intval($row['word_id']),
        );
+
+        if (!is_null($row['etymology']) && $row['etymology'] !== '') {
+          $word['etymology'] = explode(',', $row['etymology']);
+        }
+
+        if (!is_null($row['related']) && $row['related'] !== '') {
+          $word['related'] = explode(',', $row['related']);
+        }
+
+        if (!is_null($row['principal_parts']) && $row['principal_parts'] !== '') {
+          $word['principalParts'] = explode(',', $row['principal_parts']);
+        }
+
+        return $word;
      }, $results);
    }
    return array();
@ -253,28 +270,37 @@ WHERE dictionary=$dictionary";
      return true;
    }

-    $query = 'INSERT INTO words (dictionary, word_id, name, pronunciation, part_of_speech, definition, details, last_updated, created_on) VALUES ';
-    $params = array();
+    $query1 = 'INSERT INTO words (dictionary, word_id, name, pronunciation, part_of_speech, definition, details, last_updated, created_on) VALUES ';
+    $query2 = 'INSERT INTO words_advanced (dictionary, word_id, etymology, related, principal_parts) VALUES ';
+    $params1 = array();
+    $params2 = array();
    $word_ids = array();
    $most_recent_word_update = 0;
    foreach($words as $word) {
-      $last_updated = isset($word['lastUpdated']) ? $word['createdOn'] : $word['lastUpdated'];
+      $last_updated = isset($word['lastUpdated']) ? $word['lastUpdated'] : $word['createdOn'];
      if ($most_recent_word_update < $last_updated) {
        $most_recent_word_update = $last_updated;
      }
      $word_ids[] = $word['wordId'];
-      $query .= "(?, ?, ?, ?, ?, ?, ?, ?, ?), ";
-      $params[] = $dictionary;
-      $params[] = $word['wordId'];
-      $params[] = $word['name'];
-      $params[] = $word['pronunciation'];
-      $params[] = $word['partOfSpeech'];
-      $params[] = $word['definition'];
-      $params[] = $word['details'];
-      $params[] = $last_updated;
-      $params[] = $word['createdOn'];
+      $query1 .= "(?, ?, ?, ?, ?, ?, ?, ?, ?), ";
+      $params1[] = $dictionary;
+      $params1[] = $word['wordId'];
+      $params1[] = $word['name'];
+      $params1[] = $word['pronunciation'];
+      $params1[] = $word['partOfSpeech'];
+      $params1[] = $word['definition'];
+      $params1[] = $word['details'];
+      $params1[] = $last_updated;
+      $params1[] = $word['createdOn'];
+
+      $query2 .= "(?, ?, ?, ?, ?), ";
+      $params2[] = $dictionary;
+      $params2[] = $word['wordId'];
+      $params2[] = isset($word['etymology']) ? implode(',', $word['etymology']) : '';
+      $params2[] = isset($word['related']) ? implode(',', $word['related']) : '';
+      $params2[] = isset($word['principalParts']) ? implode(',', $word['principalParts']) : '';
    }
-    $query = trim($query, ', ') . ' ON DUPLICATE KEY UPDATE
+    $query1 = trim($query1, ', ') . ' ON DUPLICATE KEY UPDATE
 name=VALUES(name),
 pronunciation=VALUES(pronunciation),
 part_of_speech=VALUES(part_of_speech),
@ -282,10 +308,14 @@ definition=VALUES(definition),
 details=VALUES(details),
 last_updated=VALUES(last_updated),
 created_on=VALUES(created_on)';
+    $query2 = trim($query2, ', ') . ' ON DUPLICATE KEY UPDATE
+etymology=VALUES(etymology),
+related=VALUES(related),
+principal_parts=VALUES(principal_parts)';
    
-    $results = $this->db->execute($query, $params);
+    $results1 = $this->db->execute($query1, $params1);

-    // if ($results) {
+    // if ($results1) {
    //   $database_words = $this->getWords($user, $dictionary);
    //   $database_ids = array_map(function($database_word) { return $database_word['id']; }, $database_words);
    //   $words_to_delete = array_filter($database_ids, function($database_id) use($word_ids) { return !in_array($database_id, $word_ids); });
@ -295,8 +325,11 @@ created_on=VALUES(created_on)';
    //   }
    // }

-    if ($results) {
-      return $results;
+    if ($results1 === true) {
+      $results2 = $this->db->execute($query2, $params2);
+      if ($results2 === true) {
+        return $results1 && $results2;
+      }
    }
    return array(
      'error' => $this->db->last_error_info,
--- a/src/php/api/PublicDictionary.php
+++ b/src/php/api/PublicDictionary.php
@ -10,7 +10,7 @@ class PublicDictionary {
  public $details;
  public $words;

-  function __construct ($dictionary_id) {
+  function __construct ($dictionary_id, $details_only = false) {
    $this->db = new Db();
    $this->token = new Token();

@ -19,8 +19,10 @@ class PublicDictionary {
    );

    $this->details = $this->getPublicDictionaryDetails($dictionary_id);
-    $this->words = $this->getPublicDictionaryWords($dictionary_id);
-    $this->details['wordStats'] = $this->getWordStats();
+    $this->words = $details_only ? [] : $this->getPublicDictionaryWords($dictionary_id);
+    if ($this->details !== false) {
+      $this->details['wordStats'] = $this->getWordStats();
+    }
  }

  public function getPublicDictionaryDetails ($dictionary) {
@ -29,7 +31,7 @@ class PublicDictionary {
      $result = $this->db->query($query, array($dictionary))->fetch();
      if ($result) {
        // Default json values in case they are somehow not created by front end first
-        $partsOfSpeech = $result['parts_of_speech'] !== '' ? $result['parts_of_speech'] : $this->defaults['partsOfSpeech'];
+        $partsOfSpeech = isset($result['parts_of_speech']) && $result['parts_of_speech'] !== '' ? $result['parts_of_speech'] : $this->defaults['partsOfSpeech'];

        return array(
          'externalID' => $result['id'],
@ -44,20 +46,20 @@ class PublicDictionary {
              'consonants' => $result['consonants'] !== '' ? explode(' ', $result['consonants']) : array(),
              'vowels' => $result['vowels'] !== '' ? explode(' ', $result['vowels']) : array(),
              'blends' => $result['blends'] !== '' ? explode(' ', $result['blends']) : array(),
-              'notes' => $result['phonology_notes'],
+              'notes' => $this->parseReferences(strip_tags($result['phonology_notes']), $result['id']),
            ),
            'phonotactics' => array(
              'onset' => $result['onset'] !== '' ? explode(',', $result['onset']) : array(),
              'nucleus' => $result['nucleus'] !== '' ? explode(',', $result['nucleus']) : array(),
              'coda' => $result['coda'] !== '' ? explode(',', $result['coda']) : array(),
-              'notes' => $result['phonotactics_notes'],
+              'notes' => $this->parseReferences(strip_tags($result['phonotactics_notes']), $result['id']),
            ),
            'orthography' => array(
              'translations' => $result['translations'] !== '' ? explode(PHP_EOL, $result['translations']) : array(),
-              'notes' => $result['orthography_notes'],
+              'notes' => $this->parseReferences(strip_tags($result['orthography_notes']), $result['id']),
            ),
            'grammar' => array(
-              'notes' => $result['grammar_notes'],
+              'notes' => $this->parseReferences(strip_tags($result['grammar_notes']), $result['id']),
            ),
          ),
          'settings' => array(
@ -81,28 +83,52 @@ class PublicDictionary {
      $words = $this->getWordsAsEntered();
      if ($words) {
        return array_map(function ($row) use ($dictionary) {
-          return array(
+          $word = array(
            'name' => $this->translateOrthography($row['name'], $dictionary),
            'pronunciation' => $row['pronunciation'],
            'partOfSpeech' => $row['part_of_speech'],
            'definition' => $row['definition'],
-            'details' => $this->parseReferences(strip_tags($row['details']), $dictionary),
+            'details' => $this->parseReferences(strip_tags($row['details']), $dictionary, false),
            'lastUpdated' => is_null($row['last_updated']) ? intval($row['created_on']) : intval($row['last_updated']),
            'createdOn' => intval($row['created_on']),
            'wordId' => intval($row['word_id']),
          );
+
+          if (!is_null($row['etymology'])) {
+            if (strlen($row['etymology']) > 0) {
+              $word['etymology'] = array_map(function ($root) use($dictionary) {
+                return $this->getWordReferenceHTML(strip_tags($root), $dictionary, false);
+              }, explode(',', $row['etymology']));
+            }
+          }
+
+          if (!is_null($row['related'])) {
+            if (strlen($row['related']) > 0) {
+              $word['related'] = array_map(function ($root) use($dictionary) {
+                return $this->getWordReferenceHTML(strip_tags($root), $dictionary, false);
+              }, explode(',', $row['related']));
+            }
+          }
+
+          if (!is_null($row['principal_parts'])) {
+            if (strlen($row['principal_parts']) > 0) {
+              $word['principalParts'] = explode(',', $row['principal_parts']);
+            }
+          }
+          
+          return $word;
        }, $this->sortWords($words));
      }
    }
    return array();
  }

-  public function getSpecificPublicDictionaryWord ($dictionary, $word) {
-    if (is_numeric($dictionary) && is_numeric($word)) {
-      $query = "SELECT words.* FROM words JOIN dictionaries ON id = dictionary WHERE dictionary=? AND word_id=? AND is_public=1";
-      $result = $this->db->query($query, array($dictionary, $word))->fetch();
+  public function getSpecificPublicDictionaryWord ($dictionary, $word_id) {
+    if (is_numeric($dictionary) && is_numeric($word_id)) {
+      $results = array_filter($this->getWordsAsEntered(), fn ($row) => $row['word_id'] == $word_id);
+      $result = array_values($results)[0] ?? null;
      if ($result) {
-        return array(
+        $word = array(
          'name' => $this->translateOrthography($result['name'], $dictionary),
          'pronunciation' => $result['pronunciation'],
          'partOfSpeech' => $result['part_of_speech'],
@ -112,6 +138,30 @@ class PublicDictionary {
          'createdOn' => intval($result['created_on']),
          'wordId' => intval($result['word_id']),
        );
+
+        if (!is_null($result['etymology'])) {
+          if (strlen($result['etymology']) > 0) {
+            $word['etymology'] = array_map(function ($root) use($dictionary) {
+              return $this->getWordReferenceHTML(strip_tags($root), $dictionary);
+            }, explode(',', $result['etymology']));
+          }
+        }
+
+        if (!is_null($result['related'])) {
+          if (strlen($result['related']) > 0) {
+            $word['related'] = array_map(function ($root) use($dictionary) {
+              return $this->getWordReferenceHTML(strip_tags($root), $dictionary);
+            }, explode(',', $result['related']));
+          }
+        }
+
+        if (!is_null($result['principal_parts'])) {
+          if (strlen($result['principal_parts']) > 0) {
+            $word['principalParts'] = explode(',', $result['principal_parts']);
+          }
+        }
+
+        return $word;
      }
    }
    return false;
@ -119,7 +169,10 @@ class PublicDictionary {

  private function getWordsAsEntered() {
    if (!isset($this->original_words)) {
-      $query = "SELECT words.* FROM words JOIN dictionaries ON id = dictionary WHERE dictionary=? AND is_public=1";
+      $query = "SELECT words.*, wa.etymology, wa.related, wa.principal_parts FROM words
+LEFT JOIN words_advanced wa ON wa.dictionary = words.dictionary AND wa.word_id = words.word_id
+JOIN dictionaries ON dictionaries.id = words.dictionary
+WHERE words.dictionary=? AND is_public=1";
      $this->original_words = $this->db->query($query, array($this->details['externalID']))->fetchAll();
    }
    return $this->original_words;
@ -183,43 +236,9 @@ class PublicDictionary {
    if (preg_match_all('/\{\{.+?\}\}/', $details, $references) !== false) {
      $references = array_unique($references[0]);
      foreach($references as $reference) {
-        $word_to_find = preg_replace('/\{\{|\}\}/', '', $reference);
-        $homonymn = 0;
-      
-        if (strpos($word_to_find, ':') !== false) {
-          $separator = strpos($word_to_find, ':');
-          $homonymn = substr($word_to_find, $separator + 1);
-          $word_to_find = substr($word_to_find, 0, $separator);
-          if ($homonymn && trim($homonymn) && intval(trim($homonymn)) > 0) {
-            $homonymn = intval(trim($homonymn));
-          } else {
-            $homonymn = false;
-          }
-        }
-
-        $target_id = false;
-        $reference_ids = $this->getWordIdsWithName($dictionary_id, $word_to_find);
-
-        if (count($reference_ids) > 0) {
-          if ($homonymn !== false && $homonymn > 0) {
-            if (isset($reference_ids[$homonymn - 1])) {
-              $target_id = $reference_ids[$homonymn - 1];
-            }
-          } else if ($homonymn !== false) {
-            $target_id = $reference_ids[0];
-          }
-
-          if ($target_id !== false) {
-            if ($homonymn < 1) {
-              $homonymn = 1;
-            }
-            $homonymn_sub_html = count($reference_ids) > 1 && $homonymn - 1 >= 0 ? '<sub>' . $homonymn . '</sub>' : '';
-            $site_root = substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], $dictionary_id));
-            $markdown_link = '<span class="word-reference"><a href="' . $site_root . $dictionary_id . '/' . $target_id .'" target="_blank" title="Link to Reference">'
-              . '<span class="orthographic-translation">' . $this->translateOrthography($word_to_find, $dictionary_id) . '</span>' . $homonymn_sub_html
-            . '</a></span>';
-            $details = str_replace($reference, $markdown_link, $details);
-          }
+        $reference_link = $this->getWordReferenceHTML($reference, $dictionary_id);
+        if ($reference_link !== $reference) {
+          $details = str_replace($reference, $reference_link, $details);
        }
      }
    }
@ -227,16 +246,58 @@ class PublicDictionary {
    return $details;
  }

-  private function getWordIdsWithName($dictionary, $word_name) {
-    if (is_numeric($dictionary)) {
-      $query = "SELECT word_id FROM words WHERE dictionary=? AND name=?";
-      $results = $this->db->query($query, array($dictionary, $word_name))->fetchAll();
-      if ($results) {
-        return array_map(function ($row) {
-          return intval($row['word_id']);
-        }, $results);
+  private function getWordReferenceHTML($reference, $dictionary_id, $direct_link = true) {
+    $word_to_find = preg_replace('/\{\{|\}\}/', '', $reference);
+    $homonymn = 0;
+  
+    if (strpos($word_to_find, ':') !== false) {
+      $separator = strpos($word_to_find, ':');
+      $homonymn = substr($word_to_find, $separator + 1);
+      $word_to_find = substr($word_to_find, 0, $separator);
+      if ($homonymn && trim($homonymn) && intval(trim($homonymn)) > 0) {
+        $homonymn = intval(trim($homonymn));
+      } else {
+        $homonymn = false;
      }
    }
+
+    $target_id = false;
+    $reference_ids = $this->getWordIdsFromName($word_to_find);
+
+    if (count($reference_ids) > 0) {
+      if ($homonymn !== false && $homonymn > 0) {
+        if (isset($reference_ids[$homonymn - 1])) {
+          $target_id = $reference_ids[$homonymn - 1];
+        }
+      } else if ($homonymn !== false) {
+        $target_id = $reference_ids[0];
+      }
+
+      if ($target_id !== false) {
+        if ($homonymn < 1) {
+          $homonymn = 1;
+        }
+        $homonymn_sub_html = count($reference_ids) > 1 && $homonymn - 1 >= 0 ? '<sub>' . $homonymn . '</sub>' : '';
+        $site_root = substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], $dictionary_id));
+        return '<span class="word-reference"><a href="'
+          . ($direct_link ? $site_root . $dictionary_id . '/' : '#') . $target_id .'" '
+          . ($direct_link ? 'target="_blank" ' : '') . 'title="Link to Reference">'
+          . '<span class="orthographic-translation">' . $this->translateOrthography($word_to_find, $dictionary_id) . '</span>' . $homonymn_sub_html
+        . '</a></span>';
+      }
+    }
+
+    return $reference;
+  }
+
+  private function getWordIdsFromName($word_name) {
+    $results = array_filter($this->getWordsAsEntered(), fn ($row) => $row['name'] == $word_name);
+    $results = array_values($results);
+    if ($results) {
+      return array_map(function ($row) {
+        return intval($row['word_id']);
+      }, $results);
+    }
    return array();
  }

--- a/src/php/router.php
+++ b/src/php/router.php
@ -31,8 +31,10 @@ switch ($view) {
      if ($dictionary_data !== false) {
        $dictionary_data['words'] = $dictionary->words;
        $html = str_replace('{{dict}}', $dict, $html);
-        $html = str_replace('{{dict_name}}', $dictionary_data['name'] . ' ' . $dictionary_data['specification'], $html);
-        $html = str_replace('{{public_name}}', $dictionary_data['createdBy'], $html);
+        $dictionary_name = (isset($dictionary_data['name']) ? $dictionary_data['name'] : 'Unnamed')
+          . ' ' . (isset($dictionary_data['specification']) ? $dictionary_data['specification'] : 'Dictionary');
+        $html = str_replace('{{dict_name}}', $dictionary_name, $html);
+        $html = str_replace('{{public_name}}', isset($dictionary_data['createdBy']) ? $dictionary_data['createdBy'] : 'Someone', $html);
        $dictionary_json = json_encode(utf8ize($dictionary_data));
        $html = str_replace('{{dict_json}}', addslashes($dictionary_json), $html);
      } else {
@ -54,7 +56,8 @@ switch ($view) {
      $dictionary = new PublicDictionary($dict, true);
      $dictionary_data = $dictionary->details;
      if ($dictionary_data !== false) {
-        $dictionary_name = $dictionary_data['name'] . ' ' . $dictionary_data['specification'];
+        $dictionary_name = (isset($dictionary_data['name']) ? $dictionary_data['name'] : 'Unnamed')
+          . ' ' . (isset($dictionary_data['specification']) ? $dictionary_data['specification'] : 'Dictionary');
        $word_data = $dictionary->getSpecificPublicDictionaryWord($dict, $word);
        if ($word_data === false) {
          $word_data = array(
@ -103,6 +106,7 @@ switch ($view) {
    $html = str_replace('{{announcements}}', $announcements_html, $html);

    $upup_files = array(
+      'goodie-bag.js',
      'src.js',
      'main.css',
      'help.html',
@ -130,7 +134,7 @@ switch ($view) {
      oldLoad && oldLoad();
      if (UpUp) {
        UpUp.start({
-          'cache-version': '2.1.1',
+          'cache-version': '2.2.1',
          'content-url': 'offline.html',
          'assets': [
            \"" . implode('","', $files) . "\"
--- a/src/scss/Account/_structure.scss
+++ b/src/scss/Account/_structure.scss
@ -15,6 +15,15 @@
  }
 }

+details summary {
+  cursor: pointer;
+
+  h4 {
+    display: inline-block;
+    margin: 5px 0;
+  }
+}
+
 .share-link {
  margin-left: $general-padding !important;
  line-height: 16px !important;
--- a/src/scss/_containers.scss
+++ b/src/scss/_containers.scss
@ -12,7 +12,7 @@ html, body {

 header {
  display: block;
-  padding: 5px $general-padding;
+  padding: 5px calc($general-padding / 2);
  margin: 0 0 5px;

  &#top {
--- a/src/scss/_elements.scss
+++ b/src/scss/_elements.scss
@ -16,6 +16,7 @@ input:not([type="checkbox"]),
 select,
 textarea {
  font-size: 12pt;
+  padding: 2px 3px;
 }

 label {
@ -30,8 +31,7 @@ label {
  }

  input:not([type="checkbox"]):not([type="radio"]) {
-    padding-bottom: 2px;
-    line-height: 1.3;
+    line-height: 1.6;
  }

  input:not([type="checkbox"]):not([type="radio"]),
@ -153,6 +153,7 @@ span .tag {
  left: 0;
  bottom: 0;
  right: 0;
+  z-index: 10;
  
  .modal-background {
    position: absolute;
--- a/src/scss/_structure.scss
+++ b/src/scss/_structure.scss
@ -28,7 +28,7 @@
      max-height: unset;
      margin: 0 auto;
      width: 90%;
-      padding: $general-padding $general-padding ($general-padding / 2);
+      padding: $general-padding $general-padding calc($general-padding / 2);

      label {
        display: inline;
@ -45,7 +45,7 @@
        left: unset;
        bottom: unset;
        right: unset;
-        padding: ($general-padding / 2) $general-padding ($general-padding * 0.25);
+        padding: calc($general-padding / 2) $general-padding ($general-padding * 0.25);
        font-size: 90%;

        .split {
@ -109,6 +109,7 @@
  border-radius: 5px;
  max-height: 80%;
  overflow-y: auto;
+  z-index: 8;
 }

 .edit-form {
@ -196,6 +197,7 @@

  header {
    position: relative;
+    padding-right: 70px;
    
    .word-option-button {
      position: absolute;
@ -347,7 +349,7 @@ $nav-font-height: 16px;
  bottom: $general-padding;
  right: $general-padding;
  max-width: 300px;
-  z-index: 10;
+  z-index: 15;

  .message {
    position: relative;
@ -400,7 +402,7 @@ $nav-font-height: 16px;
  right: 0;
  z-index: 5;
  text-align: center;
-  padding: $general-padding / 2;
+  padding: calc($general-padding / 2);

  a {
    text-decoration: none;
--- a/src/scss/mobile/_containers.scss
+++ b/src/scss/mobile/_containers.scss
@ -28,7 +28,7 @@ main {

  article {
    dl {
-      padding: 0 ($general-padding / 2);
+      padding: 0 calc($general-padding / 2);

      dd {
        margin: 0 ($general-padding * 0.75);
--- a/src/scss/mobile/_elements.scss
+++ b/src/scss/mobile/_elements.scss
@ -23,13 +23,9 @@
  }
 }

-.modal {
-  z-index: 10;
-
-  .modal-content .close-button {
-    top: 5px;
-    right: 5px;
-  }
+.modal .modal-content .close-button {
+  top: 5px;
+  right: 5px;
 }

 .split {
--- a/src/scss/mobile/_structure.scss
+++ b/src/scss/mobile/_structure.scss
@ -14,14 +14,14 @@
  #searchModal {
    .modal-content {
      width: 100%;
-      padding: $general-padding ($general-padding / 2) ($general-padding / 4);
+      padding: $general-padding calc($general-padding / 2) calc($general-padding / 4);

      #searchBox {
        margin-bottom: 5px;
      }

      section+footer {
-        padding: ($general-padding / 2) 0;
+        padding: calc($general-padding / 2) 0;
      }
    }
  }
@ -30,7 +30,7 @@
 $mobile-word-form-size: 32px;
 #mobileWordFormShow {
  position: fixed;
-  top: $header-height - ($mobile-word-form-size / 2);
+  top: $header-height - calc($mobile-word-form-size / 2);
  left: 0;
  width: $mobile-word-form-size;
  height: $mobile-word-form-size;
@ -50,10 +50,9 @@ $mobile-word-form-size: 32px;
  width: 95%;
  max-width: unset;
  max-height: 85%;
-  top: $header-height + ($mobile-word-form-size / 2);
+  top: $header-height + calc($mobile-word-form-size / 2);
  left: 0;
  right: 3%;
-  z-index: 1;

  label:not(:last-child) {
    margin-bottom: 10px;
@ -75,7 +74,7 @@ $mobile-word-form-size: 32px;

 .entry {
  .pronunciation {
-    margin: 0 ($general-padding / 2);
+    margin: 0 calc($general-padding / 2);
  }
 }

--- a/src/scss/themes/_dark.scss
+++ b/src/scss/themes/_dark.scss
@ -129,7 +129,7 @@
  #top {
    background-color: $header-color;
    border-bottom: 1px solid darken($header-color, 2);
-    box-shadow: 0px 4px 5px 0px $dark;
+    box-shadow: none;

    #title {
      #lexi {
@ -156,13 +156,13 @@
  #wordForm {
    background-color: $word-form-color;
    border: 1px solid darken($word-form-color, 2);
-    box-shadow: 4px 4px 5px 0px $dark;
+    box-shadow: none;
  }

  #mainColumn {
    background-color: $dictionary-color;
    border: 1px solid darken($dictionary-color, 2);
-    box-shadow: 4px 4px 5px 0px $dark;
+    box-shadow: none;
  }

  #detailsSection {
@ -184,7 +184,7 @@

  .announcement {
    background-color: saturate(lighten($footer-color, 20%), 20%);
-    box-shadow: 4px 4px 5px 0px $dark;
+    box-shadow: none;
  }

  .entry {
@ -238,7 +238,7 @@
  #bottom {
    background-color: $footer-color;
    border-top: 1px solid darken($footer-color, 2);
-    box-shadow: 0px -4px 5px 0px $dark;
+    box-shadow: none;

    a {
      color: $light;
--- a/src/structure.sql
+++ b/src/structure.sql
@ -90,3 +90,16 @@ CREATE TABLE IF NOT EXISTS `words` (
  `created_on` int(11) NOT NULL,
  UNIQUE KEY `unique_index` (`dictionary`,`word_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+DELIMITER $$
+CREATE TRIGGER IF NOT EXISTS `delete_word_advanced` AFTER DELETE ON `words` FOR EACH ROW DELETE FROM words_advanced WHERE words_advanced.dictionary=old.dictionary AND words_advanced.word_id=old.word_id
+$$
+DELIMITER ;
+
+CREATE TABLE IF NOT EXISTS `words_advanced` (
+  `dictionary` int(11) NOT NULL,
+  `word_id` int(11) NOT NULL,
+  `etymology` text NOT NULL COMMENT 'Comma-separated',
+  `related` text NOT NULL COMMENT 'Comma-separated',
+  `principal_parts` text NOT NULL COMMENT 'Comma-separated',
+  UNIQUE KEY `dictionary_word_id` (`dictionary`,`word_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- a/template-index.html
+++ b/template-index.html
@ -12,7 +12,7 @@
  <meta property="og:type" content="website">
  <meta property="og:title" content="Lexiconga">
  <meta property="og:description" content="The quick and easy dictionary builder for constructed languages.">
-  <meta property="og:image" content="processedImages/logo.png">
+  <meta property="og:image" content="processedImages/social.jpg">

  <meta name="twitter:card" content="summary">
  <meta name="twitter:image:alt" content="Lexiconga logo">
@ -139,6 +139,25 @@
        <label>Details<span class="red">*</span><a class="label-button maximize-button">Maximize</a><br>
          <textarea id="wordDetails" placeholder="Markdown formatting allowed"></textarea>
        </label>
+        <label>
+          <a id="expandAdvancedForm" class="small button expand-advanced-form">Show Advanced Fields</a>
+        </label>
+        <div id="advancedForm" class="advanced-word-form" style="display:none;">
+          <label>Details Field Templates
+            <select id="templateSelect" class="template-select">
+            </select>
+            <small>Choose one to fill the details field. (Note: Will erase anything currently there.)</small>
+          </label>
+          <label>Etymology / Root Words<br>
+            <input id="wordEtymology" maxlength="2500" placeholder="comma,separated,root,words">
+          </label>
+          <label>Related Words<br>
+            <input id="wordRelated" maxlength="2500" placeholder="comma,separated,related,words">
+          </label>
+          <label>Principal Parts<a href="https://en.wikipedia.org/wiki/Principal_parts" target="_blank" class="label-button">What's This?</a><br>
+            <input id="wordPrincipalParts" maxlength="2500" placeholder="comma,separated,principal,parts">
+          </label>
+        </div>
        <div id="wordErrorMessage"></div>
        <a class="button" id="addWordButton">Add Word</a>
      </form>
@ -178,7 +197,6 @@
  <footer id="bottom">
    <a href="https://liberapay.com/robbieantenesse" target="_blank" rel="noopener" class="small button">Support Lexiconga</a>
    <a href="https://blog.lexicon.ga" target="_blank" rel="noopener" class="small button">Blog</a>
-    <a href="./advertising.html" target="_blank" class="small button">Advertise</a>
    <a href="https://github.com/Alamantus/Lexiconga/issues" target="_blank" rel="noopener" class="small button">Issues</a>
    <a href="https://github.com/Alamantus/Lexiconga/releases" target="_blank" rel="noopener" class="small button">Updates</a>
    <span class="separator">|</span>
@ -205,6 +223,11 @@
              <input id="settingsUseHotkeys" type="checkbox" checked><br />
              <small>Check this to enable keyboard combinations to perform different helpful actions.</small>
            </label>
+
+            <label>Show Advanced Fields By Default
+              <input id="settingsShowAdvanced" type="checkbox"><br />
+              <small>Check this to make the advanced fields show on word forms without needing to click the "Show Advanced Fields" button.</small>
+            </label>
    
            <label>Default Theme <small>(the theme new dictionaries will use)</small>
              <select id="settingsDefaultTheme">
@ -220,9 +243,33 @@
                <option value="grape">Grape</option>
              </select>
            </label>
+
+            <h4>Templates for Details Fields</h4>
+            <p>Templates created here are saved only to your local browser.</p>
+            <label>Saved Templates <a id="createTemplateButton" class="label-button">Create New Template</a>
+              <select id="savedDetailsTemplates" class="template-select">
+              </select>
+            </label>
+            <div id="templateFields" style="display:none;">
+              <label>Template Name
+                <input id="templateNameField"><br />
+                <small>If you have chosen a template above, this will overwrite the chosen template.</small>
+              </label>
+              <label>Template<a class="label-button maximize-button">Maximize</a><br>
+                <textarea id="templateTextarea" placeholder="**Era:** 
+
+**Dialect:** 
+
+etc."></textarea>
+              </label>
+              <a id="saveTemplateButton" class="button">Save Template</a>
+              <a id="deleteTemplateButton" class="red button">Delete Template</a>
+            </div>
+          </div>
+          <div>
+            <div id="accountActions"></div>
            <div id="accountSettings"></div>
          </div>
-          <div id="accountActions"></div>
        </form>
      </section>
      <footer>
@ -383,7 +430,7 @@ ou=ow"></textarea>
              <label class="button">Import Words <input type="file" id="importWordsCSV" accept="text/csv, .csv"><br>
                <small>Import a CSV file of words.</small>
              </label>
-              <a class="small button" download="Lexiconga_import-template.csv" href="data:text/csv;charset=utf-8,%22word%22,%22pronunciation%22,%22part of speech%22,%22definition%22,%22explanation%22%0A">Download an example file with the correct formatting</a>
+              <a class="small button" download="Lexiconga_import-template.csv" href="data:text/csv;charset=utf-8,%22word%22,%22pronunciation%22,%22part of speech%22,%22definition%22,%22explanation%22,%22etymology %28comma-separated%29%22,%22related words %28comma-separated%29%22,%22principal parts %28comma-separated%29%22%0A">Download an example file with the correct formatting</a>
            </p>
          </div>
          <div>
--- a/template-view.html
+++ b/template-view.html
@ -9,11 +9,11 @@
  <meta name="keywords" content="conlanging, dictionary, dictionaries, lexicon, conlangs, constructed languages, glossopoeia, builder, app, tool">
  
  <meta property="og:site_name" content="Lexiconga">
-  <meta property="og:url" content="http://lexicon.ga/{{dict}}">
+  <meta property="og:url" content="https://lexicon.ga/{{dict}}">
  <meta property="og:type" content="website">
  <meta property="og:title" content="{{dict_name}}">
  <meta property="og:description" content="A Lexiconga dictionary by {{public_name}}">
-  <meta property="og:image" content="processedImages/logo.png">
+  <meta property="og:image" content="processedImages/social.jpg">
  
  <meta name="twitter:card" content="summary">
  <meta name="twitter:image:alt" content="Lexiconga logo">
@ -81,7 +81,7 @@
              <label>Exact Words
                <input type="checkbox" id="searchExactWords">
              </label>
-              <label style="display:none;">Translations
+              <label>Translations
                <input type="checkbox" id="searchOrthography">
              </label>
            </div>
@ -151,7 +151,6 @@
  <footer id="bottom">
    <a href="https://liberapay.com/robbieantenesse" target="_blank" rel="noopener" class="small button">Support Lexiconga</a>
    <a href="https://blog.lexicon.ga" target="_blank" rel="noopener" class="small button">Blog</a>
-    <a href="./advertising.html" target="_blank" class="small button">Advertise</a>
    <a href="https://github.com/Alamantus/Lexiconga/issues" target="_blank" rel="noopener" class="small button">Issues</a>
    <a href="https://github.com/Alamantus/Lexiconga/releases" target="_blank" rel="noopener" class="small button">Updates</a>
    <span class="separator">|</span>
@ -162,4 +161,4 @@

  <div id="messagingSection"></div>
 </body>
-</html>
+</html>
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Robbie Antenesse	be67f965eb	Restore PublicDictionary's details_only option	2023-10-31 16:25:42 -06:00
Robbie Antenesse	ed7f06d061	omg don't query for every reference!	2023-10-31 16:23:58 -06:00
Robbie Antenesse	bfb74a0000	Fix scss disliking `/` as division sign for no reason	2022-08-26 12:56:34 -06:00
Robbie Antenesse	4c8f896462	Remove ads	2022-08-26 12:56:01 -06:00
Robbie Antenesse	be44c4c7a5	Upgrade dependencies as far as they'll go without screwing things up	2021-12-03 22:10:11 -07:00
Robbie Antenesse	4de0a7bf8b	Add missing Translations search filter to View template	2021-07-26 11:11:02 -06:00
Robbie Antenesse	459edda009	Upgrade dependencies	2021-02-09 14:41:51 -07:00
Robbie Antenesse	9fcbb08468	Fix og:url on view template to HTTPS	2020-11-03 11:58:25 -07:00
Robbie Antenesse	2f0aa6e14c	Update announcement to paid features poll	2020-11-03 11:11:37 -07:00
Robbie Antenesse	76e3f77b0b	Merge pull request #52 from Alamantus/dependabot/npm_and_yarn/bl-4.0.3 Bump bl from 4.0.2 to 4.0.3	2020-10-18 14:50:11 -06:00
dependabot[bot]	f1b99960f3	Bump bl from 4.0.2 to 4.0.3 Bumps [bl](https://github.com/rvagg/bl) from 4.0.2 to 4.0.3. - [Release notes](https://github.com/rvagg/bl/releases) - [Commits](https://github.com/rvagg/bl/compare/v4.0.2...v4.0.3) Signed-off-by: dependabot[bot] <support@github.com>	2020-10-18 20:48:20 +00:00
Robbie Antenesse	d64890ec12	Upgrade devDependencies	2020-10-18 14:47:22 -06:00
Robbie Antenesse	acdc5cbdaa	Correctly escape quotes in rendered input tags Bump patch version to ensure fixes are loaded	2020-10-18 14:43:17 -06:00
Robbie Antenesse	efa623af85	Update dependencies	2020-10-08 15:23:29 -06:00
Robbie Antenesse	e1222a43f6	Fix incorrect variable name; Correctly display public dict	2020-10-08 14:56:59 -06:00
Robbie Antenesse	3dd370a375	Update create account text	2020-08-03 23:15:31 -06:00
Robbie Antenesse	34459b40a4	Comment out unused pagination code - The unused code kept getting bundled, so this should prevent that.	2020-08-03 22:58:29 -06:00
Robbie Antenesse	4318f90263	Upgrade parcel-bundler version, I guess	2020-08-03 22:57:39 -06:00
Robbie Antenesse	d98cf9a584	Remove expired ads	2020-08-03 22:48:44 -06:00
Robbie Antenesse	f388620d3e	Update dependencies	2020-08-03 16:52:43 -06:00
Robbie Antenesse	e3c4ce7666	Merge branch 'new-features-wave-2'	2020-08-03 16:43:19 -06:00
Robbie Antenesse	4228ac8063	Add announcement for Wave 2	2020-08-03 16:40:56 -06:00
Robbie Antenesse	b61f128745	Make modals scroll to top when opened	2020-08-03 16:33:56 -06:00
Robbie Antenesse	5a728dbd7c	Ensure template editor scrolls to display buttons	2020-08-03 16:17:18 -06:00
Robbie Antenesse	b87f4e7cad	Hide template field when none exist	2020-08-03 16:07:27 -06:00
Robbie Antenesse	5e803d988e	Remove edited words if not matching search	2020-08-03 15:50:20 -06:00
Robbie Antenesse	15ad17e1d7	Bump minor version to 2.2.0	2020-07-31 16:41:02 -06:00
Robbie Antenesse	a73b74ff71	Save dictionary after editing word	2020-07-31 16:25:51 -06:00
Robbie Antenesse	ec37fc53a5	Add new fields to import/export words	2020-07-31 16:25:26 -06:00
Robbie Antenesse	b3507128a6	Update help file with new fields	2020-07-31 15:56:35 -06:00
Robbie Antenesse	54cc74b468	Make sure Word Form always displays above footer	2020-07-31 15:20:11 -06:00
Robbie Antenesse	f6446eedc9	Add Details field templates	2020-07-31 15:14:41 -06:00
Robbie Antenesse	ce06308c1d	Make editing words render in place instead of whole list	2020-07-31 12:20:06 -06:00
Robbie Antenesse	abacf7a56a	Prevent entry headers from going beneath options button	2020-07-31 12:15:39 -06:00
Robbie Antenesse	fb42b0ef2b	Improve word forms - Fix not clearing all fields - Show advanced field if edited word has advanced data	2020-07-31 11:39:54 -06:00
Robbie Antenesse	6d7cdf68a9	Fix word reference finding	2020-07-31 11:29:33 -06:00
Robbie Antenesse	c2d02ceccb	Merge branch 'master' of https://github.com/Alamantus/Lexiconga	2020-07-17 16:57:40 -06:00
Robbie Antenesse	bd8a3f475a	Merge pull request #49 from Alamantus/dependabot/npm_and_yarn/lodash-4.17.19 Bump lodash from 4.17.15 to 4.17.19	2020-07-17 11:02:38 -06:00
dependabot[bot]	b6811a07e4	Bump lodash from 4.17.15 to 4.17.19 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19) Signed-off-by: dependabot[bot] <support@github.com>	2020-07-17 03:25:46 +00:00
Robbie Antenesse	90e0553f4e	Update dependencies in yarn.lock	2020-07-06 14:58:38 -06:00
Robbie Antenesse	adb95fbae3	Include principal parts in searches by name	2020-05-08 00:47:18 -06:00
Robbie Antenesse	8cc3b469f9	Display principal parts on public dictionary	2020-05-08 00:02:51 -06:00
Robbie Antenesse	e103420245	Add Prinipal Parts for words	2020-05-07 23:57:27 -06:00
Robbie Antenesse	d5e2ddec93	Add related to db structure	2020-05-07 23:23:42 -06:00
Robbie Antenesse	8f6dad8a84	Make word references link to hash unless individual	2020-05-07 23:20:47 -06:00
Robbie Antenesse	a30bdf5d63	Provide etymology & related in public word view	2020-05-07 23:12:49 -06:00
Robbie Antenesse	4d63aa9034	Display related words in public dictionary render	2020-05-07 23:09:19 -06:00
Robbie Antenesse	d1bcfc5b97	Update offline to show etymology & related fields	2020-05-04 00:28:01 -06:00
Robbie Antenesse	e2d3164136	Add Related Words field & display	2020-05-04 00:27:50 -06:00
Robbie Antenesse	69c0539370	Remove possible error code on view search Strip out "Search Translations" filter options	2020-05-03 23:25:49 -06:00
Robbie Antenesse	4d3132e151	Render etymology in public view	2020-05-03 23:25:40 -06:00
Robbie Antenesse	40feae7194	Display word etymology if is present	2020-05-03 22:28:31 -06:00
Robbie Antenesse	65cf421cbe	Add setting to set default advanced form display	2020-04-30 01:20:10 -06:00
Robbie Antenesse	98cdd763f8	Improve styling of advanced form toggle	2020-04-30 00:38:45 -06:00
Robbie Antenesse	006f020424	Put etymology in new words_advanced table	2020-04-30 00:28:30 -06:00
Robbie Antenesse	5f15ec6353	Trim and filter etymology entries into array	2020-04-30 00:14:00 -06:00
Robbie Antenesse	4fee98c8fe	Update example word data structure in default	2020-04-29 23:51:53 -06:00
Robbie Antenesse	4c4ec4536f	Update yarn lock	2020-04-29 23:51:16 -06:00
Robbie Antenesse	d4e7df495d	Merge branch 'master' into new-features-wave-2	2020-04-29 23:07:45 -06:00
Robbie Antenesse	7bc01c79b7	Upgrade dependencies to latest versions	2020-04-29 22:22:28 -06:00
Robbie Antenesse	3a36817686	Run Yarn Upgrade	2020-04-19 12:54:26 -06:00
Robbie Antenesse	36898ff670	Merge pull request #46 from Alamantus/dependabot/npm_and_yarn/acorn-5.7.4 Bump acorn from 5.7.3 to 5.7.4	2020-03-16 16:57:23 -06:00
dependabot[bot]	46b1b5a01f	Bump acorn from 5.7.3 to 5.7.4 Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4) Signed-off-by: dependabot[bot] <support@github.com>	2020-03-14 23:52:28 +00:00
Robbie Antenesse	143bde30f0	Add announcement about fixes since last release	2020-03-04 10:09:54 -07:00
Robbie Antenesse	1d143e1d98	Update marked & papaparse dependencies	2020-03-04 09:54:37 -07:00
Robbie Antenesse	18f460f2e4	Update devDependencies	2020-03-04 09:26:00 -07:00
Robbie Antenesse	689a5d3a59	Merge branch 'master' of https://github.com/Alamantus/Lexiconga	2020-03-04 09:22:43 -07:00
Robbie Antenesse	8d07a26d10	Update .htaccess to fix Chrome security warning	2020-03-04 09:22:39 -07:00
Robbie Antenesse	1ab93d69ae	Bump patch version for lastUpdated fix	2020-03-03 21:05:46 -07:00
Robbie Antenesse	ed9eba7137	Fix mistake that prevented last_updated from being set	2020-03-03 20:59:20 -07:00
Robbie Antenesse	5fa06b31c2	Upgrade Sharp devDependency to make it install correctly	2020-03-03 15:00:32 -07:00
Robbie Antenesse	e118cb8d14	Update README with note about windows-build-tools	2020-03-03 10:03:05 -07:00
Robbie Antenesse	a9ae7f938c	Update ads and bump patch version	2020-01-24 15:57:31 -07:00
Robbie Antenesse	6fad67da93	Merge branch 'master' of https://github.com/Alamantus/Lexiconga	2019-12-15 13:25:39 -07:00
Robbie Antenesse	7a80be9730	Improve padding in fields	2019-12-15 13:24:25 -07:00
Robbie Antenesse	9965dba80e	Add hover text to all ipa-table fields	2019-12-15 13:08:03 -07:00
Robbie Antenesse	c25114b9fd	Parse word references in all Details notes fields	2019-12-13 10:39:44 -07:00
Robbie Antenesse	1b9a6fcda6	Add tone characters to IPA table chart	2019-12-12 20:59:38 -07:00
Robbie Antenesse	abf0bc08a0	Merge pull request #41 from Alamantus/dependabot/npm_and_yarn/serialize-to-js-3.0.1	2019-12-06 17:45:32 -07:00
dependabot[bot]	d3559d5465	Bump serialize-to-js from 3.0.0 to 3.0.1 Bumps [serialize-to-js](https://github.com/commenthol/serialize-to-js) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/commenthol/serialize-to-js/releases) - [Commits](https://github.com/commenthol/serialize-to-js/compare/v3.0.0...v3.0.1) Signed-off-by: dependabot[bot] <support@github.com>	2019-12-06 23:57:48 +00:00
Robbie Antenesse	484426d98b	Run `yarn upgrade` to update all dependencies	2019-12-02 10:13:21 -07:00
Robbie Antenesse	331d285899	Update ads for GUTS+ PDF	2019-12-02 10:08:42 -07:00
Robbie Antenesse	03974b9d45	Remove box shadow from dark theme	2019-12-01 22:00:13 -07:00
Robbie Antenesse	b20c6703ef	Make modals stay above footer; Bump version	2019-12-01 21:25:56 -07:00
Robbie Antenesse	981490473f	Process etymology field in the backend	2019-10-01 14:53:15 -06:00
Robbie Antenesse	d03abfa566	Add etymology field to advanced word form area	2019-10-01 14:46:49 -06:00
Robbie Antenesse	1bb8ace20a	Merge branch 'master' of https://github.com/Alamantus/Lexiconga	2019-10-01 11:32:44 -06:00
Robbie Antenesse	39ccddab18	Merge branch 'master' of https://github.com/Alamantus/Lexiconga	2019-08-27 21:49:14 -06:00
Robbie Antenesse	9d08bbb337	Fix some things that have caused errors to get logged	2019-08-26 15:39:21 -06:00
Robbie Antenesse	122282d1a7	Update version number and package data	2019-08-22 14:29:56 -06:00
Robbie Antenesse	f39dd886b1	Remove call to nonexistent var on word submit for upload	2019-08-22 14:23:59 -06:00
Robbie Antenesse	725f47782a	Fix missing reference to getTimestampInSeconds	2019-08-05 17:28:33 -06:00
Robbie Antenesse	abb8511999	Add parcel-plugin-goodie-bag for promise & fetch	2019-08-05 14:12:46 -06:00
Robbie Antenesse	5fbd06a035	Bump UpUp version for import fix	2019-07-19 11:21:56 -06:00
Robbie Antenesse	466e5e84c6	Merge branch 'master' of https://github.com/Alamantus/Lexiconga	2019-07-19 10:04:56 -06:00
Robbie Antenesse	b2db35982f	Update addWords() to not save; Update importWords to save after complete	2019-07-19 09:48:36 -06:00
Robbie Antenesse	5ba84abd0e	Add social image that's better than just the logo	2019-07-17 16:25:22 -06:00