vault backup: 2025-01-31 13:05:28

.obsidian/appearance.json

@@ -1,7 +1,12 @@
 {
-  "accentColor": "#4f78d8",
-  "theme": "obsidian",
-  "cssTheme": "Things",
+  "accentColor": "",
+  "theme": "system",
+  "cssTheme": "Tokyo Night",
   "nativeMenus": true,
-  "baseFontSize": 16
+  "baseFontSize": 14,
+  "interfaceFontFamily": "AppleGothic,Inter",
+  "textFontFamily": "AppleGothic,Inter",
+  "monospaceFontFamily": "PT Mono,Andale Mono",
+  "baseFontSizeAction": false,
+  "translucency": true
 }

.obsidian/core-plugins.json

@@ -26,5 +26,6 @@
   "workspaces": false,
   "file-recovery": true,
   "publish": false,
-  "sync": false
+  "sync": false,
+  "webviewer": false
 }

.obsidian/themes/AnuPpuccin/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "AnuPpuccin",
-  "version": "1.4.5",
-  "minAppVersion": "0.16.0",
+  "version": "1.5.0",
+  "minAppVersion": "1.6.0",
   "author": "Anubis",
   "authorUrl": "https://github.com/AnubisNekhet"
 }

.obsidian/themes/Catppuccin/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "Catppuccin",
-  "version": "0.4.17",
+  "version": "0.4.41",
   "minAppVersion": "1.0.0",
   "author": "Marshall Beckrich",
   "authorUrl": "https://github.com/catppuccin/obsidian"

.obsidian/themes/Catppuccin/theme.css

@@ -72,7 +72,7 @@ body {
   --canvas-dot-pattern: var(--color-base-30);
   /* Checkboxes */
   --checkbox-radius: var(--radius-s);
-  --checkbox-size: 15px;
+  --checkbox-size: var(--font-text-size);
   --checkbox-marker-color: var(--background-primary);
   --checkbox-color: var(--interactive-accent);
   --checkbox-color-hover: var(--interactive-accent-hover);
@@ -129,7 +129,7 @@ body {
     var(--background-modifier-border),
     inset 0 0 0 1px var(--background-modifier-border);
   /* File layout */
-  --file-line-width: 65ch;
+  --file-line-width: 700px;
   --file-folding-offset: 24px;
   --file-margins: var(--size-4-8);
   --file-header-font-size: var(--font-ui-small);
@@ -487,8 +487,8 @@ body {
   --table-row-last-border-width: var(--table-border-width);
   /* Tags */
   --tag-size: max(var(--font-ui-medium), var(--font-small));
-  --tag-color: rgb(var(--ctp-accent));
-  --tag-color-hover: rgb(var(--ctp-accent));
+  --tag-color: rgb(var(--ctp-tag-pill-color, var(--ctp-accent)));
+  --tag-color-hover: rgb(var(--ctp-tag-pill-color, var(--ctp-accent)));
   --tag-decoration: none;
   --tag-decoration-hover: underline;
   --tag-background: transparent;
@@ -505,10 +505,7 @@ body {
   --tag-radius: 0.8em;
   /* Window frame */
   --titlebar-background: var(--background-secondary);
-  --titlebar-background-focused:
-    var(
-      --background-secondary-alt
-    );
+  --titlebar-background-focused: var(--background-secondary-alt);
   --titlebar-border-width: 0;
   --titlebar-border-color: var(--background-modifier-border);
   --titlebar-text-color: var(--text-muted);
@@ -573,7 +570,7 @@ body {
 }
 
 /* @settings
-name: Catppuccin Accents
+name: "Catppuccin: Catppuccin Accents"
 id: catppuccin-theme-settings
 settings:
   -
@@ -648,7 +645,7 @@ settings:
         value: ctp-accent-lavender
 */
 /* @settings
-name: Icon Styles
+name: "Catppuccin: Icon Styles"
 id: catppuccin-icon-styles
 settings:
   -
@@ -658,7 +655,7 @@ settings:
     type: class-toggle
 */
 /* @settings
-name: Interface Styles
+name: "Catppuccin: Interface Styles"
 id: catppuccin-interface-styles
 settings:
   -
@@ -668,7 +665,7 @@ settings:
     type: class-toggle
 */
 /* @settings
-name: Font Styles
+name: "Catppuccin: Font Styles"
 id: catppuccin-font-styles
 settings:
   -
@@ -907,7 +904,7 @@ settings:
   -
   */
 /* @settings
-name: File Name and Headings
+name: "Catppuccin: File Name and Headings"
 id: catppuccin-heading-settings
 settings:
   -
@@ -1325,8 +1322,97 @@ settings:
         value: var(--ctp-subtext0)
 */
 /* @settings
+name: "Catppuccin: PDF Settings"
+id: catppuccin-pdf
+settings:
+  -
+    id: ctp-seamless-pdf
+    title: Remove borders around PDF pages
+    description: View PDFs without borders, akin to the Minimal theme's "seamless" setting
+    type: class-toggle
+  -
+    id: ctp-pdf-darken
+    title: Darken PDF background
+    description: When using a dark flavor, inverts a PDF's background color. This might be helpful when using a PDF with a light background in dark mode Obsidian, depending on your preferences and the colors present in the PDF
+    type: class-toggle
+  -
+    id: ctp-pdf-blend
+    title: Blend PDF background
+    description: When using light mode, attempts to blend the theme's background color into the PDF
+    type: class-toggle
+*/
+/* @settings
+name: "Catppuccin: Tag Styles"
+id: catppuccin-tag-styles
+settings:
+  -
+    id: ctp-tag-pill
+    title: Pill-shaped tags
+    description: Make tags stand out with a pill-shaped appearance, reverts to Obsidian's default style
+    type: class-toggle
+  -
+    id: ctp-tag-pill-color
+    title: Tag text color
+    description: Select your tag text color
+    type: variable-select
+    allowEmpty: false
+    default: var(--ctp-accent)
+    options:
+      -
+        label: Accent
+        value: var(--ctp-accent)
+      -
+        label: Rosewater
+        value: var(--ctp-rosewater)
+      -
+        label: Flamingo
+        value: var(--ctp-flamingo)
+      -
+        label: Pink
+        value: var(--ctp-pink)
+      -
+        label: Mauve
+        value: var(--ctp-mauve)
+      -
+        label: Red
+        value: var(--ctp-red)
+      -
+        label: Maroon
+        value: var(--ctp-maroon)
+      -
+        label: Peach
+        value: var(--ctp-peach)
+      -
+        label: Yellow
+        value: var(--ctp-yellow)
+      -
+        label: Green
+        value: var(--ctp-green)
+      -
+        label: Teal
+        value: var(--ctp-teal)
+      -
+        label: Sky
+        value: var(--ctp-sky)
+      -
+        label: Sapphire
+        value: var(--ctp-sapphire)
+      -
+        label: Blue
+        value: var(--ctp-blue)
+      -
+        label: Lavender
+        value: var(--ctp-lavender)
+      -
+        label: White
+        value: var(--ctp-text)
+      -
+        label: Gray
+        value: var(--ctp-subtext0)
+*/
+/* @settings
 
-name: Credits and Source Code
+name: "Catppuccin: Credits and Source Code"
 id: source-code
 settings:
   -
@@ -1611,8 +1697,9 @@ settings:
   --text-error-hover: rgb(var(--ctp-red), 80%);
   --text-highlight-bg: rgb(var(--ctp-rosewater), 100%);
   --text-highlight-bg-active: rgb(var(--ctp-rosewater), 100%);
-  --text-selection: rgb(var(--ctp-rosewater), 100%);
-  --text-on-accent: rgb(var(--ctp-base));
+  --text-selection: rgb(var(--ctp-overlay2), 30%);
+  --text-on-accent: rgb(var(--ctp-mantle));
+  --text-on-accent-inverted: rgb(var(--ctp-mantle));
   --interactive-normal: rgb(var(--ctp-surface0));
   --interactive-hover: rgb(var(--ctp-surface1));
   --interactive-accent: rgb(var(--ctp-accent));
@@ -1684,8 +1771,11 @@ body {
 }
 
 strong,
-.cm-strong {
+.cm-strong,
+.cm-s-obsidian span.cm-formatting-strong,
+.cm-s-obsidian span.cm-strong {
   --bold-color: rgb(var(--ctp-bold, var(--ctp-sapphire)));
+  color: rgb(var(--ctp-bold, var(--ctp-sapphire)));
 }
 
 em,
@@ -1698,6 +1788,10 @@ del,
   color: rgb(var(--ctp-strikethrough, var(--ctp-maroon)));
 }
 
+.cm-s-obsidian .cm-link.cm-strikethrough {
+  text-decoration: line-through;
+}
+
 .markdown-rendered blockquote,
 .cm-s-obsidian span.cm-quote {
   --blockquote-border-color: rgb(var(--ctp-blockquote, var(--ctp-accent)));
@@ -1817,10 +1911,6 @@ h6,
   color: var(--text-on-accent);
 }
 
-::selection {
-  color: var(--text-on-accent);
-}
-
 .cm-s-obsidian span.cm-error {
   color: rgb(var(--ctp-red));
 }
@@ -1838,8 +1928,13 @@ h6,
   border: 1px solid rgb(var(--ctp-rosewater), 60%);
 }
 
+/**
+* 1. Not sure when or why I added this, but it became an issue in
+https://github.com/catppuccin/obsidian/issues/60. I have set it to the value it
+should have. Hopefully it doesn't break anything!
+*/
 .tree-item-self.is-clickable.nav-file-title.has-focus[style] {
-  --background-modifier-border-focus: var(--background-modifier-border-focus);
+  --background-modifier-border-focus: var(--color-base-40);
 }
 
 /*
@@ -2139,6 +2234,10 @@ body {
   color: var(--text-on-accent);
 }
 
+.tree-item-self.is-being-renamed:focus-within {
+  color: currentcolor;
+}
+
 /*
 * Open folder
 */
@@ -2162,6 +2261,14 @@ body {
   display: none;
 }
 
+/*
+* Bring block edit button in line with rest of button hovers
+*/
+.markdown-source-view.mod-cm6 .pdf-embed .edit-block-button:hover {
+  background-color: rgb(var(--ctp-pink));
+  color: var(--text-on-accent);
+}
+
 select:focus,
 .dropdown:focus {
   box-shadow: 0 0 0 2px rgb(var(--ctp-accent), 70%);
@@ -2208,6 +2315,31 @@ input[type=number]:focus-visible {
   background-color: rgb(var(--ctp-crust));
 }
 
+input[type=date]::-webkit-datetime-edit-month-field:active,
+input[type=datetime-local]::-webkit-datetime-edit-month-field:active,
+input[type=date]::-webkit-datetime-edit-month-field:focus,
+input[type=datetime-local]::-webkit-datetime-edit-month-field:focus,
+input[type=date]::-webkit-datetime-edit-day-field:active,
+input[type=datetime-local]::-webkit-datetime-edit-day-field:active,
+input[type=date]::-webkit-datetime-edit-day-field:focus,
+input[type=datetime-local]::-webkit-datetime-edit-day-field:focus,
+input[type=date]::-webkit-datetime-edit-year-field:active,
+input[type=datetime-local]::-webkit-datetime-edit-year-field:active,
+input[type=date]::-webkit-datetime-edit-year-field:focus,
+input[type=datetime-local]::-webkit-datetime-edit-year-field:focus {
+  color: var(--text-on-accent);
+}
+
+input[type=datetime-local]::-webkit-datetime-edit-minute-field:active,
+input[type=datetime-local]::-webkit-datetime-edit-minute-field:focus,
+input[type=datetime-local]::-webkit-datetime-edit-hour-field:active,
+input[type=datetime-local]::-webkit-datetime-edit-hour-field:focus,
+input[type=datetime-local]::-webkit-datetime-edit-second-field:active,
+input[type=datetime-local]::-webkit-datetime-edit-second-field:focus {
+  background-color: var(--text-selection);
+  color: var(--text-on-accent);
+}
+
 .cm-s-obsidian .cm-formatting-link.cm-url,
 .cm-s-obsidian .cm-url,
 .cm-s-obsidian .cm-link,
@@ -2236,22 +2368,41 @@ input[type=number]:focus-visible {
   color: var(--link-color);
 }
 
-.cm-hashtag.cm-hashtag-end {
+body:not(.ctp-tag-pill) .cm-hashtag.cm-hashtag-end {
   text-decoration-color: transparent;
   text-decoration-line: underline;
   text-decoration-style: solid;
   transition: var(--transition-text-decoration-color);
 }
-
-.cm-hashtag.cm-hashtag-end:hover {
-  text-decoration: underline 1px rgb(var(--ctp-accent));
+body:not(.ctp-tag-pill) .cm-hashtag.cm-hashtag-end:hover {
+  text-decoration: underline 1px rgb(var(--ctp-tag-pill-color, var(--ctp-accent)));
   text-underline-offset: 1px;
 }
-
-.cm-hashtag::selection {
-  text-shadow: 0.4px 0 0 rgb(var(--ctp-crust));
+body:not(.ctp-tag-pill) .cm-hashtag::selection {
+  text-shadow: 0.4px 0 0 rgb(var(--ctp-tag-pill-color, var(--ctp-accent)));
 }
 
+/**
+* 1. Restores default Obsidian settings to tags. See: #56
+*/
+.ctp-tag-pill {
+  --tag-size: var(--font-smaller);
+  --tag-decoration: none;
+  --tag-decoration-hover: none;
+  --tag-background: hsla(var(--interactive-accent-hsl), 0.1);
+  --tag-background-hover: hsla(var(--interactive-accent-hsl), 0.2);
+  --tag-border-color: hsla(var(--interactive-accent-hsl), 0.15);
+  --tag-border-color-hover: hsla(var(--interactive-accent-hsl), 0.15);
+  --tag-border-width: 0px;
+  --tag-padding-x: 0.65em;
+  --tag-padding-y: 0.25em;
+  --tag-radius: 2em;
+  --tag-weight: inherit;
+}
+
+/**
+* 1. Allow users to pick tag text color with Style Settings
+*/
 .markdown-source-view.mod-cm6 .is-unresolved .cm-underline {
   text-decoration-line: none;
 }
@@ -2269,8 +2420,8 @@ input[type=number]:focus-visible {
 }
 
 .empty-state-action {
-  transition: var(--transition-hover-bg), var(--transition-hover-color);
   border-radius: var(--radius-s);
+  transition: var(--transition-hover-bg), var(--transition-hover-color);
 }
 
 @media (hover: hover) {
@@ -2279,6 +2430,119 @@ input[type=number]:focus-visible {
     color: var(--text-on-accent);
   }
 }
+/**
+* 1. Fix #97 highlighted link contrast issues
+*/
+.cm-s-obsidian .cm-highlight.cm-link .cm-underline {
+  color: var(--text-on-accent);
+  text-decoration: var(--text-on-accent) solid underline;
+}
+.cm-s-obsidian .cm-highlight.cm-link .cm-underline:hover {
+  color: var(--text-on-accent);
+  text-decoration-color: var(--text-on-accent);
+}
+
+.cm-s-obsidian .cm-highlight.cm-link:hover,
+.cm-s-obsidian .cm-highlight.cm-url:hover {
+  color: var(--text-on-accent);
+}
+
+/**
+* 1. Compatibility for mermaid mindmaps #73
+* 2. CSS modified from obsidian forums post, !important seems to be req
+*/
+.theme-dark .mermaid .mindmap-node text {
+  fill: var(--text-on-accent) !important;
+}
+
+.theme-light .mermaid .mindmap-node text {
+  fill: var(--text-on-accent) !important;
+}
+
+/**
+* 1. Colors for the first eight nodes in a mindmap
+*/
+.mermaid .section-0 path,
+.mermaid .section-0 line,
+.mermaid .section-edge-0 {
+  fill: var(--color-orange) !important;
+  stroke: var(--color-orange) !important;
+}
+
+.mermaid .section-1 path,
+.mermaid .section-1 line,
+.mermaid .section-edge-1 {
+  fill: var(--color-yellow) !important;
+  stroke: var(--color-yellow) !important;
+}
+
+.mermaid .section-2 path,
+.mermaid .section-2 line,
+.mermaid .section-edge-3 {
+  fill: var(--color-green) !important;
+  stroke: var(--color-green) !important;
+}
+
+.mermaid .section-3 path,
+.mermaid .section-3 line,
+.mermaid .section-edge-3 {
+  fill: var(--color-red) !important;
+  stroke: var(--color-red) !important;
+}
+
+.mermaid .section-4 path,
+.mermaid .section-4 line,
+.mermaid .section-edge-4 {
+  fill: var(--color-blue) !important;
+  stroke: var(--color-blue) !important;
+}
+
+.mermaid .section-5 path,
+.mermaid .section-5 line,
+.mermaid .section-edge-5 {
+  fill: var(--color-purple) !important;
+  stroke: var(--color-purple) !important;
+}
+
+.mermaid .section-6 path,
+.mermaid .section-6 line,
+.mermaid .section-edge-6 {
+  fill: var(--color-pink) !important;
+  stroke: var(--color-pink) !important;
+}
+
+.mermaid .section-7 path,
+.mermaid .section-7 line,
+.mermaid .section-edge-7 {
+  fill: var(--color-cyan) !important;
+  stroke: var(--color-cyan) !important;
+}
+
+/**
+* 1. User requested integration with Style Settings plugin to replicate Minimal
+* and its treatment of PDFs. Credit/source of modified scss:
+* https://github.com/kepano/obsidian-minimal/blob/0b98cc8ec4576e148057ce6c0ff751ab4df1ece4/src/scss/content/pdf.scss
+*/
+.theme-light.ctp-seamless-pdf,
+.theme-dark.ctp-seamless-pdf {
+  --pdf-shadow: none;
+}
+.theme-light.ctp-seamless-pdf .pdf-viewer .page,
+.theme-dark.ctp-seamless-pdf .pdf-viewer .page {
+  border: 0;
+}
+
+.theme-dark.ctp-pdf-darken .pdf-viewer .canvasWrapper,
+.theme-dark.ctp-pdf-darken .pdf-thumbnail-view .thumbnailImage {
+  filter: invert(1) hue-rotate(180deg);
+  mix-blend-mode: screen;
+}
+
+.theme-light.ctp-pdf-blend .pdf-viewer .canvasWrapper,
+.theme-light.ctp-pdf-blend .pdf-thumbnail-view .thumbnailImage {
+  mix-blend-mode: multiply;
+}
+
 /* TODO Add to Style Settings instead */
 .cm-s-obsidian span.obsidian-search-match-highlight {
   background-color: rgb(var(--ctp-rosewater));
@@ -2457,12 +2721,16 @@ input[type=number]:focus-visible {
   color: var(--text-muted);
 }
 
-.tree-item-self:hover .tree-item-flair,
-.backlink-pane > .tree-item-self.is-collapsed:hover,
-.outgoing-link-pane > .tree-item-self.is-collapsed:hover {
+.tree-item-self:hover .tree-item-flair {
   color: var(--text-on-accent);
 }
 
+@media (hover: hover) {
+  .backlink-pane > .tree-item-self.is-clickable.is-collapsed:hover,
+  .outgoing-link-pane > .tree-item-self.is-clickable.is-collapsed:hover {
+    color: var(--text-on-accent);
+  }
+}
 .nav-file-tag {
   background-color: rgb(var(--ctp-surface0));
   color: var(--text-normal);
@@ -2681,8 +2949,8 @@ button.mod-cta:hover {
   text-transform: lowercase;
 }
 
-/*
-* TODO: Some tweaks for the light/Catppuccin Latte theme.
+/**
+* Some tweaks for the light/Catppuccin Latte theme.
 */
 .theme-dark:not(.css-settings-manager),
 .theme-light:not(.css-settings-manager),
@@ -2718,7 +2986,7 @@ button.mod-cta:hover {
   * Checkboxes
   */
   /*
-  ? I think !important is necessary to overwrite app.css's
+  ? I think !important is necessary to overwrite app.css
   */
   /*
   *  settings slider
@@ -2999,25 +3267,109 @@ button.mod-cta:hover {
 .ctp-full-palette input[type=checkbox]:not(:checked) {
   border-color: rgb(var(--ctp-maroon));
   background-color: rgb(var(--ctp-red));
-  box-shadow: inset 4px 4px 12px rgb(var(--ctp-mantle)), inset -4px -4px 12px rgb(var(--ctp-mantle));
+  box-shadow: inset 2px 2px 24px rgb(var(--ctp-mantle)), inset -2px -2px 24px rgb(var(--ctp-mantle));
 }
 .theme-dark:not(.css-settings-manager) input[type=checkbox]:not(:checked):hover,
 .theme-light:not(.css-settings-manager) input[type=checkbox]:not(:checked):hover,
 .ctp-full-palette input[type=checkbox]:not(:checked):hover {
   border-width: 2px;
 }
-.theme-dark:not(.css-settings-manager) input[type=checkbox]:checked,
-.theme-light:not(.css-settings-manager) input[type=checkbox]:checked,
-.ctp-full-palette input[type=checkbox]:checked {
+.theme-dark:not(.css-settings-manager) input[type=checkbox]:not([data-task=">"],
+[data-task="!"],
+[data-task="-"],
+[data-task="<"],
+[data-task=l],
+[data-task="*"],
+[data-task=I],
+[data-task=p],
+[data-task=f],
+[data-task=k],
+[data-task=u],
+[data-task=w],
+[data-task=c],
+[data-task=d],
+[data-task=b]):checked,
+.theme-light:not(.css-settings-manager) input[type=checkbox]:not([data-task=">"],
+[data-task="!"],
+[data-task="-"],
+[data-task="<"],
+[data-task=l],
+[data-task="*"],
+[data-task=I],
+[data-task=p],
+[data-task=f],
+[data-task=k],
+[data-task=u],
+[data-task=w],
+[data-task=c],
+[data-task=d],
+[data-task=b]):checked,
+.ctp-full-palette input[type=checkbox]:not([data-task=">"],
+[data-task="!"],
+[data-task="-"],
+[data-task="<"],
+[data-task=l],
+[data-task="*"],
+[data-task=I],
+[data-task=p],
+[data-task=f],
+[data-task=k],
+[data-task=u],
+[data-task=w],
+[data-task=c],
+[data-task=d],
+[data-task=b]):checked {
   border-color: transparent;
   background-color: rgb(var(--ctp-green));
   box-shadow: 0 0 0 1px rgb(var(--ctp-green), 40%);
 }
-.theme-dark:not(.css-settings-manager) input[type=checkbox]:checked:hover,
-.theme-light:not(.css-settings-manager) input[type=checkbox]:checked:hover,
-.ctp-full-palette input[type=checkbox]:checked:hover {
-  background-color: rgb(var(--ctp-maroon));
-  box-shadow: 0 0 0 1px rgb(var(--ctp-maroon), 40%);
+.theme-dark:not(.css-settings-manager) input[type=checkbox]:not([data-task=">"],
+[data-task="!"],
+[data-task="-"],
+[data-task="<"],
+[data-task=l],
+[data-task="*"],
+[data-task=I],
+[data-task=p],
+[data-task=f],
+[data-task=k],
+[data-task=u],
+[data-task=w],
+[data-task=c],
+[data-task=d],
+[data-task=b]):checked:hover,
+.theme-light:not(.css-settings-manager) input[type=checkbox]:not([data-task=">"],
+[data-task="!"],
+[data-task="-"],
+[data-task="<"],
+[data-task=l],
+[data-task="*"],
+[data-task=I],
+[data-task=p],
+[data-task=f],
+[data-task=k],
+[data-task=u],
+[data-task=w],
+[data-task=c],
+[data-task=d],
+[data-task=b]):checked:hover,
+.ctp-full-palette input[type=checkbox]:not([data-task=">"],
+[data-task="!"],
+[data-task="-"],
+[data-task="<"],
+[data-task=l],
+[data-task="*"],
+[data-task=I],
+[data-task=p],
+[data-task=f],
+[data-task=k],
+[data-task=u],
+[data-task=w],
+[data-task=c],
+[data-task=d],
+[data-task=b]):checked:hover {
+  background-color: rgb(var(--ctp-accent));
+  box-shadow: 0 0 0 1px rgb(var(--ctp-accent), 40%);
 }
 .theme-dark:not(.css-settings-manager) .horizontal-tab-nav-item:hover,
 .theme-dark:not(.css-settings-manager) .vertical-tab-nav-item:hover,
@@ -3160,6 +3512,16 @@ button.mod-cta:hover {
   background-color: rgb(var(--ctp-rosewater), 60%);
 }
 
+.omnisearch-result:not(.is-selected) .omnisearch-highlight.omnisearch-default-highlight {
+  background-color: rgb(var(--ctp-rosewater), 100%);
+}
+
+.omnisearch-result.is-selected .omnisearch-result__folder-path > span,
+.omnisearch-result.is-selected .omnisearch-result__extension,
+.omnisearch-result.is-selected .omnisearch-result__counter {
+  color: var(--text-faint);
+}
+
 /*
 * MAKE.md
 */
@@ -3294,6 +3656,333 @@ body:not(.is-grabbing .ctp-full-palette) .mk-sidebar {
   --nav-item-color-selected: var(--text-on-accent);
 }
 
+/**
+* 1.  Folder Notes, issue #67
+*/
+body:not(.disable-folder-highlight) .tree-item-self.fn-is-active,
+body.ctp-full-palette:not(.disable-folder-highlight) .tree-item-self.fn-is-active {
+  --nav-item-background-active: rgb(var(--ctp-mauve));
+  --nav-item-background-selected: rgb(var(--ctp-mauve));
+  --nav-item-color-active: var(--text-on-accent);
+  --nav-item-color-selected: var(--text-on-accent);
+}
+
+body:not(.disable-folder-highlight) .tree-item-self.fn-is-active {
+  --nav-item-background-active: rgb(var(--ctp-accent));
+  --nav-item-background-selected: rgb(var(--ctp-accent));
+  --nav-item-color-active: var(--text-on-accent);
+  --nav-item-color-selected: var(--text-on-accent);
+}
+
+body:not(.is-grabbing) .tree-item-self.fn-is-active:hover {
+  --nav-item-background-active: rgb(var(--ctp-accent), 90%);
+  --nav-item-background-selected: rgb(var(--ctp-accent), 90%);
+  --nav-item-color-active: var(--text-on-accent);
+  --nav-item-color-selected: var(--text-on-accent);
+}
+
+/**
+* 1. Highlight active date in Calendar Plugin
+*/
+.active.svelte-q3wqg9, .day.svelte-q3wqg9:active,
+.active.today.svelte-q3wqg9 {
+  background-color: rgb(var(--ctp-green)) !important;
+  color: var(--text-on-accent) !important;
+}
+
+.today.svelte-q3wqg9 {
+  background-color: rgb(var(--ctp-accent)) !important;
+  color: var(--text-on-accent) !important;
+}
+
+/**
+* 1. Checklist icons implemented for #91. This scss is from Kepano's Minimal Theme under its MIT License. Thanks Kepano!
+*/
+.cm-formatting.cm-formatting-task.cm-property {
+  font-family: var(--font-monospace);
+}
+
+input[data-task=">"]:checked,
+input[data-task="!"]:checked,
+input[data-task="-"]:checked,
+input[data-task="<"]:checked,
+input[data-task=l]:checked,
+input[data-task="*"]:checked,
+input[data-task=I]:checked,
+input[data-task=p]:checked,
+input[data-task=f]:checked,
+input[data-task=k]:checked,
+input[data-task=u]:checked,
+input[data-task=w]:checked,
+input[data-task=c]:checked,
+input[data-task=d]:checked,
+input[data-task=b]:checked,
+li[data-task=">"] > input:checked,
+li[data-task="!"] > input:checked,
+li[data-task="-"] > input:checked,
+li[data-task="<"] > input:checked,
+li[data-task=l] > input:checked,
+li[data-task="*"] > input:checked,
+li[data-task=I] > input:checked,
+li[data-task=p] > input:checked,
+li[data-task=f] > input:checked,
+li[data-task=k] > input:checked,
+li[data-task=u] > input:checked,
+li[data-task=d] > input:checked,
+li[data-task=w] > input:checked,
+li[data-task=c] > input:checked,
+li[data-task=b] > input:checked,
+li[data-task=">"] > p > input:checked,
+li[data-task="!"] > p > input:checked,
+li[data-task="-"] > p > input:checked,
+li[data-task="<"] > p > input:checked,
+li[data-task=l] > p > input:checked,
+li[data-task="*"] > p > input:checked,
+li[data-task=I] > p > input:checked,
+li[data-task=p] > p > input:checked,
+li[data-task=f] > p > input:checked,
+li[data-task=k] > p > input:checked,
+li[data-task=u] > p > input:checked,
+li[data-task=d] > p > input:checked,
+li[data-task=w] > p > input:checked,
+li[data-task=c] > p > input:checked,
+li[data-task=b] > p > input:checked {
+  --checkbox-marker-color: transparent;
+  border: none;
+  border-radius: 0;
+  background-image: none;
+  background-color: currentColor;
+  -webkit-mask-size: var(--checkbox-icon);
+  -webkit-mask-position: 50% 50%;
+}
+
+/* [>] Forwarded */
+input[data-task=">"]:checked,
+li[data-task=">"] > input:checked,
+li[data-task=">"] > p > input:checked {
+  color: var(--text-faint);
+  transform: rotate(90deg);
+  -webkit-mask-position: 50% 100%;
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath d='M10.894 2.553a1 1 0 00-1.788 0l-7 14a1 1 0 001.169 1.409l5-1.429A1 1 0 009 15.571V11a1 1 0 112 0v4.571a1 1 0 00.725.962l5 1.428a1 1 0 001.17-1.408l-7-14z' /%3E%3C/svg%3E");
+}
+
+/* [<] Schedule */
+input[data-task="<"]:checked,
+li[data-task="<"] > input:checked,
+li[data-task="<"] > p > input:checked {
+  color: var(--text-faint);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath fill-rule='evenodd' d='M10 18a8 8 0 100-16 8 8 0 000 16zm1-12a1 1 0 10-2 0v4a1 1 0 00.293.707l2.828 2.829a1 1 0 101.415-1.415L11 9.586V6z' clip-rule='evenodd' /%3E%3C/svg%3E");
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath fill-rule='evenodd' d='M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z' clip-rule='evenodd' /%3E%3C/svg%3E");
+}
+
+/* [?] Question */
+input[data-task="?"]:checked,
+li[data-task="?"] > input:checked,
+li[data-task="?"] > p > input:checked {
+  --checkbox-marker-color: transparent;
+  background-color: var(--color-yellow);
+  border-color: var(--color-yellow);
+  background-position: 50% 50%;
+  background-size: 200% 90%;
+  background-image: url('data:image/svg+xml,%3Csvg xmlns="http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg" width="20" height="20" preserveAspectRatio="xMidYMid meet" viewBox="0 0 16 16"%3E%3Cpath fill="white" fill-rule="evenodd" d="M4.475 5.458c-.284 0-.514-.237-.47-.517C4.28 3.24 5.576 2 7.825 2c2.25 0 3.767 1.36 3.767 3.215c0 1.344-.665 2.288-1.79 2.973c-1.1.659-1.414 1.118-1.414 2.01v.03a.5.5 0 0 1-.5.5h-.77a.5.5 0 0 1-.5-.495l-.003-.2c-.043-1.221.477-2.001 1.645-2.712c1.03-.632 1.397-1.135 1.397-2.028c0-.979-.758-1.698-1.926-1.698c-1.009 0-1.71.529-1.938 1.402c-.066.254-.278.461-.54.461h-.777ZM7.496 14c.622 0 1.095-.474 1.095-1.09c0-.618-.473-1.092-1.095-1.092c-.606 0-1.087.474-1.087 1.091S6.89 14 7.496 14Z"%2F%3E%3C%2Fsvg%3E');
+}
+.theme-dark input[data-task="?"]:checked,
+.theme-dark li[data-task="?"] > input:checked,
+.theme-dark li[data-task="?"] > p > input:checked {
+  background-image: url('data:image/svg+xml,%3Csvg xmlns="http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg" width="20" height="20" preserveAspectRatio="xMidYMid meet" viewBox="0 0 16 16"%3E%3Cpath fill="black" fill-opacity="0.8" fill-rule="evenodd" d="M4.475 5.458c-.284 0-.514-.237-.47-.517C4.28 3.24 5.576 2 7.825 2c2.25 0 3.767 1.36 3.767 3.215c0 1.344-.665 2.288-1.79 2.973c-1.1.659-1.414 1.118-1.414 2.01v.03a.5.5 0 0 1-.5.5h-.77a.5.5 0 0 1-.5-.495l-.003-.2c-.043-1.221.477-2.001 1.645-2.712c1.03-.632 1.397-1.135 1.397-2.028c0-.979-.758-1.698-1.926-1.698c-1.009 0-1.71.529-1.938 1.402c-.066.254-.278.461-.54.461h-.777ZM7.496 14c.622 0 1.095-.474 1.095-1.09c0-.618-.473-1.092-1.095-1.092c-.606 0-1.087.474-1.087 1.091S6.89 14 7.496 14Z"%2F%3E%3C%2Fsvg%3E');
+}
+
+/* [/] Incomplete */
+input[data-task="/"]:checked,
+li[data-task="/"] > input:checked,
+li[data-task="/"] > p > input:checked {
+  background-image: none;
+  background-color: transparent;
+  position: relative;
+  overflow: hidden;
+}
+input[data-task="/"]:checked:after,
+li[data-task="/"] > input:checked:after,
+li[data-task="/"] > p > input:checked:after {
+  top: 0;
+  left: 0;
+  content: " ";
+  display: block;
+  position: absolute;
+  background-color: var(--background-modifier-accent);
+  width: calc(50% - 0.5px);
+  height: 100%;
+  -webkit-mask-image: none;
+}
+
+/* [!] Important */
+input[data-task="!"]:checked,
+li[data-task="!"] > input:checked,
+li[data-task="!"] > p > input:checked {
+  color: var(--color-orange);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath fill-rule='evenodd' d='M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z' clip-rule='evenodd' /%3E%3C/svg%3E");
+}
+
+/* ["] Quote */
+input[data-task=“]:checked,
+li[data-task=“] > input:checked,
+li[data-task=“] > p > input:checked,
+input[data-task='"']:checked,
+li[data-task='"'] > input:checked,
+li[data-task='"'] > p > input:checked {
+  --checkbox-marker-color: transparent;
+  background-position: 50% 50%;
+  background-color: var(--color-cyan);
+  border-color: var(--color-cyan);
+  background-size: 75%;
+  background-repeat: no-repeat;
+  background-image: url('data:image/svg+xml,%3Csvg xmlns="http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg" width="20" height="20" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"%3E%3Cpath fill="white" d="M6.5 10c-.223 0-.437.034-.65.065c.069-.232.14-.468.254-.68c.114-.308.292-.575.469-.844c.148-.291.409-.488.601-.737c.201-.242.475-.403.692-.604c.213-.21.492-.315.714-.463c.232-.133.434-.28.65-.35l.539-.222l.474-.197l-.485-1.938l-.597.144c-.191.048-.424.104-.689.171c-.271.05-.56.187-.882.312c-.318.142-.686.238-1.028.466c-.344.218-.741.4-1.091.692c-.339.301-.748.562-1.05.945c-.33.358-.656.734-.909 1.162c-.293.408-.492.856-.702 1.299c-.19.443-.343.896-.468 1.336c-.237.882-.343 1.72-.384 2.437c-.034.718-.014 1.315.028 1.747c.015.204.043.402.063.539l.025.168l.026-.006A4.5 4.5 0 1 0 6.5 10zm11 0c-.223 0-.437.034-.65.065c.069-.232.14-.468.254-.68c.114-.308.292-.575.469-.844c.148-.291.409-.488.601-.737c.201-.242.475-.403.692-.604c.213-.21.492-.315.714-.463c.232-.133.434-.28.65-.35l.539-.222l.474-.197l-.485-1.938l-.597.144c-.191.048-.424.104-.689.171c-.271.05-.56.187-.882.312c-.317.143-.686.238-1.028.467c-.344.218-.741.4-1.091.692c-.339.301-.748.562-1.05.944c-.33.358-.656.734-.909 1.162c-.293.408-.492.856-.702 1.299c-.19.443-.343.896-.468 1.336c-.237.882-.343 1.72-.384 2.437c-.034.718-.014 1.315.028 1.747c.015.204.043.402.063.539l.025.168l.026-.006A4.5 4.5 0 1 0 17.5 10z"%2F%3E%3C%2Fsvg%3E');
+}
+.theme-dark input[data-task=“]:checked,
+.theme-dark li[data-task=“] > input:checked,
+.theme-dark li[data-task=“] > p > input:checked,
+.theme-dark input[data-task='"']:checked,
+.theme-dark li[data-task='"'] > input:checked,
+.theme-dark li[data-task='"'] > p > input:checked {
+  background-image: url('data:image/svg+xml,%3Csvg xmlns="http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg" width="20" height="20" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"%3E%3Cpath fill="black" fill-opacity="0.7" d="M6.5 10c-.223 0-.437.034-.65.065c.069-.232.14-.468.254-.68c.114-.308.292-.575.469-.844c.148-.291.409-.488.601-.737c.201-.242.475-.403.692-.604c.213-.21.492-.315.714-.463c.232-.133.434-.28.65-.35l.539-.222l.474-.197l-.485-1.938l-.597.144c-.191.048-.424.104-.689.171c-.271.05-.56.187-.882.312c-.318.142-.686.238-1.028.466c-.344.218-.741.4-1.091.692c-.339.301-.748.562-1.05.945c-.33.358-.656.734-.909 1.162c-.293.408-.492.856-.702 1.299c-.19.443-.343.896-.468 1.336c-.237.882-.343 1.72-.384 2.437c-.034.718-.014 1.315.028 1.747c.015.204.043.402.063.539l.025.168l.026-.006A4.5 4.5 0 1 0 6.5 10zm11 0c-.223 0-.437.034-.65.065c.069-.232.14-.468.254-.68c.114-.308.292-.575.469-.844c.148-.291.409-.488.601-.737c.201-.242.475-.403.692-.604c.213-.21.492-.315.714-.463c.232-.133.434-.28.65-.35l.539-.222l.474-.197l-.485-1.938l-.597.144c-.191.048-.424.104-.689.171c-.271.05-.56.187-.882.312c-.317.143-.686.238-1.028.467c-.344.218-.741.4-1.091.692c-.339.301-.748.562-1.05.944c-.33.358-.656.734-.909 1.162c-.293.408-.492.856-.702 1.299c-.19.443-.343.896-.468 1.336c-.237.882-.343 1.72-.384 2.437c-.034.718-.014 1.315.028 1.747c.015.204.043.402.063.539l.025.168l.026-.006A4.5 4.5 0 1 0 17.5 10z"%2F%3E%3C%2Fsvg%3E');
+}
+
+/* [-] Canceled */
+input[data-task="-"]:checked,
+li[data-task="-"] > input:checked,
+li[data-task="-"] > p > input:checked {
+  color: var(--text-faint);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath fill-rule='evenodd' d='M3 10a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1z' clip-rule='evenodd' /%3E%3C/svg%3E");
+}
+
+body:not(.tasks) .markdown-source-view.mod-cm6 .HyperMD-task-line[data-task]:is([data-task="-"]),
+body:not(.tasks) .markdown-preview-view ul li[data-task="-"].task-list-item.is-checked,
+body:not(.tasks) li[data-task="-"].task-list-item.is-checked {
+  color: var(--text-faint);
+  text-decoration: line-through solid var(--text-faint) 1px;
+}
+
+/* [*] Star */
+input[data-task="*"]:checked,
+li[data-task="*"] > input:checked,
+li[data-task="*"] > p > input:checked {
+  color: var(--color-yellow);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath d='M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z' /%3E%3C/svg%3E");
+}
+
+/* [l] Location */
+input[data-task=l]:checked,
+li[data-task=l] > input:checked,
+li[data-task=l] > p > input:checked {
+  color: var(--color-red);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath fill-rule='evenodd' d='M5.05 4.05a7 7 0 119.9 9.9L10 18.9l-4.95-4.95a7 7 0 010-9.9zM10 11a2 2 0 100-4 2 2 0 000 4z' clip-rule='evenodd' /%3E%3C/svg%3E");
+}
+
+/* [i] Info */
+input[data-task=i]:checked,
+li[data-task=i] > input:checked,
+li[data-task=i] > p > input:checked {
+  --checkbox-marker-color: transparent;
+  background-color: var(--color-blue);
+  border-color: var(--color-blue);
+  background-position: 50%;
+  background-size: 100%;
+  background-image: url('data:image/svg+xml,%3Csvg xmlns="http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg" width="20" height="20" preserveAspectRatio="xMidYMid meet" viewBox="0 0 512 512"%3E%3Cpath fill="none" stroke="white" stroke-linecap="round" stroke-linejoin="round" stroke-width="40" d="M196 220h64v172"%2F%3E%3Cpath fill="none" stroke="white" stroke-linecap="round" stroke-miterlimit="10" stroke-width="40" d="M187 396h138"%2F%3E%3Cpath fill="white" d="M256 160a32 32 0 1 1 32-32a32 32 0 0 1-32 32Z"%2F%3E%3C%2Fsvg%3E');
+}
+.theme-dark input[data-task=i]:checked,
+.theme-dark li[data-task=i] > input:checked,
+.theme-dark li[data-task=i] > p > input:checked {
+  background-image: url('data:image/svg+xml,%3Csvg xmlns="http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg" width="20" height="20" preserveAspectRatio="xMidYMid meet" viewBox="0 0 512 512"%3E%3Cpath fill="none" stroke="black" stroke-opacity="0.8" stroke-linecap="round" stroke-linejoin="round" stroke-width="40" d="M196 220h64v172"%2F%3E%3Cpath fill="none" stroke="black" stroke-opacity="0.8" stroke-linecap="round" stroke-miterlimit="10" stroke-width="40" d="M187 396h138"%2F%3E%3Cpath fill="black" fill-opacity="0.8" d="M256 160a32 32 0 1 1 32-32a32 32 0 0 1-32 32Z"%2F%3E%3C%2Fsvg%3E');
+}
+
+/* [S] Amount/savings/money */
+input[data-task=S]:checked,
+li[data-task=S] > input:checked,
+li[data-task=S] > p > input:checked {
+  --checkbox-marker-color: transparent;
+  border-color: var(--color-green);
+  background-color: var(--color-green);
+  background-size: 100%;
+  background-image: url('data:image/svg+xml,%3Csvg xmlns="http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg" width="20" height="20" preserveAspectRatio="xMidYMid meet" viewBox="0 0 48 48"%3E%3Cpath fill="white" fill-rule="evenodd" d="M26 8a2 2 0 1 0-4 0v2a8 8 0 1 0 0 16v8a4.002 4.002 0 0 1-3.773-2.666a2 2 0 0 0-3.771 1.332A8.003 8.003 0 0 0 22 38v2a2 2 0 1 0 4 0v-2a8 8 0 1 0 0-16v-8a4.002 4.002 0 0 1 3.773 2.666a2 2 0 0 0 3.771-1.332A8.003 8.003 0 0 0 26 10V8Zm-4 6a4 4 0 0 0 0 8v-8Zm4 12v8a4 4 0 0 0 0-8Z" clip-rule="evenodd"%2F%3E%3C%2Fsvg%3E');
+}
+.theme-dark input[data-task=S]:checked,
+.theme-dark li[data-task=S] > input:checked,
+.theme-dark li[data-task=S] > p > input:checked {
+  background-image: url('data:image/svg+xml,%3Csvg xmlns="http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg" width="20" height="20" preserveAspectRatio="xMidYMid meet" viewBox="0 0 48 48"%3E%3Cpath fill-opacity="0.8" fill="black" fill-rule="evenodd" d="M26 8a2 2 0 1 0-4 0v2a8 8 0 1 0 0 16v8a4.002 4.002 0 0 1-3.773-2.666a2 2 0 0 0-3.771 1.332A8.003 8.003 0 0 0 22 38v2a2 2 0 1 0 4 0v-2a8 8 0 1 0 0-16v-8a4.002 4.002 0 0 1 3.773 2.666a2 2 0 0 0 3.771-1.332A8.003 8.003 0 0 0 26 10V8Zm-4 6a4 4 0 0 0 0 8v-8Zm4 12v8a4 4 0 0 0 0-8Z" clip-rule="evenodd"%2F%3E%3C%2Fsvg%3E');
+}
+
+/* [I] Idea/lightbulb */
+input[data-task=I]:checked,
+li[data-task=I] > input:checked,
+li[data-task=I] > p > input:checked {
+  color: var(--color-yellow);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath d='M11 3a1 1 0 10-2 0v1a1 1 0 102 0V3zM15.657 5.757a1 1 0 00-1.414-1.414l-.707.707a1 1 0 001.414 1.414l.707-.707zM18 10a1 1 0 01-1 1h-1a1 1 0 110-2h1a1 1 0 011 1zM5.05 6.464A1 1 0 106.464 5.05l-.707-.707a1 1 0 00-1.414 1.414l.707.707zM5 10a1 1 0 01-1 1H3a1 1 0 110-2h1a1 1 0 011 1zM8 16v-1h4v1a2 2 0 11-4 0zM12 14c.015-.34.208-.646.477-.859a4 4 0 10-4.954 0c.27.213.462.519.476.859h4.002z' /%3E%3C/svg%3E");
+}
+
+/* [f] Fire */
+input[data-task=f]:checked,
+li[data-task=f] > input:checked,
+li[data-task=f] > p > input:checked {
+  color: var(--color-red);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath fill-rule='evenodd' d='M12.395 2.553a1 1 0 00-1.45-.385c-.345.23-.614.558-.822.88-.214.33-.403.713-.57 1.116-.334.804-.614 1.768-.84 2.734a31.365 31.365 0 00-.613 3.58 2.64 2.64 0 01-.945-1.067c-.328-.68-.398-1.534-.398-2.654A1 1 0 005.05 6.05 6.981 6.981 0 003 11a7 7 0 1011.95-4.95c-.592-.591-.98-.985-1.348-1.467-.363-.476-.724-1.063-1.207-2.03zM12.12 15.12A3 3 0 017 13s.879.5 2.5.5c0-1 .5-4 1.25-4.5.5 1 .786 1.293 1.371 1.879A2.99 2.99 0 0113 13a2.99 2.99 0 01-.879 2.121z' clip-rule='evenodd' /%3E%3C/svg%3E");
+}
+
+/* [k] Key */
+input[data-task=k]:checked,
+li[data-task=k] > input:checked,
+li[data-task=k] > p > input:checked {
+  color: var(--color-yellow);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath fill-rule='evenodd' d='M18 8a6 6 0 01-7.743 5.743L10 14l-1 1-1 1H6v2H2v-4l4.257-4.257A6 6 0 1118 8zm-6-4a1 1 0 100 2 2 2 0 012 2 1 1 0 102 0 4 4 0 00-4-4z' clip-rule='evenodd' /%3E%3C/svg%3E");
+}
+
+/* [u] Up */
+input[data-task=u]:checked,
+li[data-task=u] > input:checked,
+li[data-task=u] > p > input:checked {
+  color: var(--color-green);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath fill-rule='evenodd' d='M12 7a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0V8.414l-4.293 4.293a1 1 0 01-1.414 0L8 10.414l-4.293 4.293a1 1 0 01-1.414-1.414l5-5a1 1 0 011.414 0L11 10.586 14.586 7H12z' clip-rule='evenodd' /%3E%3C/svg%3E");
+}
+
+/* [d] Down */
+input[data-task=d]:checked,
+li[data-task=d] > input:checked,
+li[data-task=d] > p > input:checked {
+  color: var(--color-red);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath fill-rule='evenodd' d='M12 13a1 1 0 100 2h5a1 1 0 001-1V9a1 1 0 10-2 0v2.586l-4.293-4.293a1 1 0 00-1.414 0L8 9.586 3.707 5.293a1 1 0 00-1.414 1.414l5 5a1 1 0 001.414 0L11 9.414 14.586 13H12z' clip-rule='evenodd' /%3E%3C/svg%3E");
+}
+
+/* [w] Win */
+input[data-task=w]:checked,
+li[data-task=w] > input:checked,
+li[data-task=w] > p > input:checked {
+  color: var(--color-purple);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath fill-rule='evenodd' d='M6 3a1 1 0 011-1h.01a1 1 0 010 2H7a1 1 0 01-1-1zm2 3a1 1 0 00-2 0v1a2 2 0 00-2 2v1a2 2 0 00-2 2v.683a3.7 3.7 0 011.055.485 1.704 1.704 0 001.89 0 3.704 3.704 0 014.11 0 1.704 1.704 0 001.89 0 3.704 3.704 0 014.11 0 1.704 1.704 0 001.89 0A3.7 3.7 0 0118 12.683V12a2 2 0 00-2-2V9a2 2 0 00-2-2V6a1 1 0 10-2 0v1h-1V6a1 1 0 10-2 0v1H8V6zm10 8.868a3.704 3.704 0 01-4.055-.036 1.704 1.704 0 00-1.89 0 3.704 3.704 0 01-4.11 0 1.704 1.704 0 00-1.89 0A3.704 3.704 0 012 14.868V17a1 1 0 001 1h14a1 1 0 001-1v-2.132zM9 3a1 1 0 011-1h.01a1 1 0 110 2H10a1 1 0 01-1-1zm3 0a1 1 0 011-1h.01a1 1 0 110 2H13a1 1 0 01-1-1z' clip-rule='evenodd' /%3E%3C/svg%3E");
+}
+
+/* [p] Pros */
+input[data-task=p]:checked,
+li[data-task=p] > input:checked,
+li[data-task=p] > p > input:checked {
+  color: var(--color-green);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath d='M2 10.5a1.5 1.5 0 113 0v6a1.5 1.5 0 01-3 0v-6zM6 10.333v5.43a2 2 0 001.106 1.79l.05.025A4 4 0 008.943 18h5.416a2 2 0 001.962-1.608l1.2-6A2 2 0 0015.56 8H12V4a2 2 0 00-2-2 1 1 0 00-1 1v.667a4 4 0 01-.8 2.4L6.8 7.933a4 4 0 00-.8 2.4z' /%3E%3C/svg%3E");
+}
+
+/* [c] Cons */
+input[data-task=c]:checked,
+li[data-task=c] > input:checked,
+li[data-task=c] > p > input:checked {
+  color: var(--color-orange);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath d='M18 9.5a1.5 1.5 0 11-3 0v-6a1.5 1.5 0 013 0v6zM14 9.667v-5.43a2 2 0 00-1.105-1.79l-.05-.025A4 4 0 0011.055 2H5.64a2 2 0 00-1.962 1.608l-1.2 6A2 2 0 004.44 12H8v4a2 2 0 002 2 1 1 0 001-1v-.667a4 4 0 01.8-2.4l1.4-1.866a4 4 0 00.8-2.4z' /%3E%3C/svg%3E");
+}
+
+/* [b] Bookmark */
+input[data-task=b]:checked,
+li[data-task=b] > input:checked,
+li[data-task=b] > p > input:checked {
+  color: var(--color-orange);
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='h-5 w-5' viewBox='0 0 20 20' fill='currentColor'%3E%3Cpath d='M5 4a2 2 0 012-2h6a2 2 0 012 2v14l-5-2.5L5 18V4z' /%3E%3C/svg%3E");
+}
+
 /*
 * Vollkorn is included as a base64 font in this theme.
 * See font website here: http://vollkorn-typeface.com

.obsidian/themes/Dracula Official/manifest.json

@@ -1,6 +1,6 @@
 {
    "name": "Dracula Official",
-   "version": "1.0.9",
+   "version": "1.1.1",
    "minAppVersion": "0.16.0",
    "author": "Dracula",
    "authorUrl": "https://gitlab.com/chrismettal"

.obsidian/themes/Dracula Official/theme.css

@@ -60,7 +60,7 @@
   --text-on-accent: #282a36;
   --text-title-h1: #bd93f9;
   --text-title-h2: #ffb86c;
-  --text-title-h3: #52fa7c;
+  --text-title-h3: #50fa7b;
   --text-title-h4: #ff5555;
   --text-title-h5: #f1fa8c;
   --text-title-h6: #bd93f4;
@@ -83,7 +83,17 @@
   --accent-s: 94%;
   --accent-l: 65%;
 
-
+  /* Dracula Code view*/
+  --code-normal: #F8F8F2;
+  --code-background: #282a36;
+  --dracula-foreground: #F8F8F2;
+  --dracula-Comment: #6272A4;
+  --dracula-keyword: #FF79C6;
+  --dracula-definition: #50FA7B;
+  --dracula-variable: #F8F8F2; /*"variable" tags are used everywhere in code, but Dracula usually only uses orange color only for declaration inputs, thus white is less annoying to look at*/
+  --dracula-number: #BD93F9;
+  --dracula-function: #8BE9FD;
+  --dracula-string: #F1FA8C;
 }
 
 /* LINKS & BRACKETS */
@@ -195,10 +205,10 @@ hr {
 
 pre code {
   padding: 5px !important;
-  color: var(--code-normal) !important;
+  color: var(--dracula-foreground);
   line-height: normal;
   display: block;
-  background-color: var(--background-primary-alt) !important;
+  background-color: var(--background-primary);
 }
 
 .markdown-preview-view pre {
@@ -207,35 +217,89 @@ pre code {
 
 /* in-line code for editor and preview and code block for editor*/
 
-code,
 .cm-inline-code {
   background-color: var(--background-primary-alt) !important;
-  color: var(--markup-code) !important;
+  color: var(--dracula-foreground) !important;
   bottom: 0px !important;
 }
 
 /* Code Appearance */
 
-/* editor */
+/* Editing view */
 
 .CodeMirror-code span.cm-inline-code {
   color: var(--markup-code) !important;
 }
 
+.cm-hmd-codeblock {
+  color: var(--dracula-foreground);
+}
+
+.cm-hmd-codeblock.cm-keyword {
+  color: var(--dracula-keyword);
+}
+
+.cm-def.cm-hmd-codeblock {
+  color: var(--dracula-definition);
+}
+
+.cm-hmd-codeblock.cm-variable {
+  color: var(--dracula-variable);
+}
+
+.cm-hmd-codeblock.cm-operator{
+  color: var(--dracula-keyword);
+}
+
+.cm-hmd-codeblock.cm-number {
+  color: var(--dracula-number);
+}
+
+.cm-builtin.cm-hmd-codeblock {
+  color: var(--dracula-function);
+}
+
+.cm-hmd-codeblock.cm-string {
+  color: var(--dracula-string);
+}
+
+/* Preview */
+
+code {
+  background-color: var(--background-primary);
+  color: var(--dracula-foreground);
+}
+
+.token.function {
+  color: var(--dracula-definition);
+}
+
+.token.operator {
+  color: var(--dracula-keyword);
+}
+
+.token.number {
+  color: var(--dracula-number);
+}
+
+.token.builtin {
+  color: var(--dracula-function);
+}
+
+.token.boolean {
+  color: var(--dracula-number);
+}
+
+.token.string {
+  color: var(--dracula-string);
+}
+
 /* Editor CodeBlock TEXT Appearance - */
 
 .cm-s-obsidian pre.HyperMD-codeblock {
   color: var(--markup-code) !important;
 }
 
-/* preview */
-
-.markdown-preview-view code {
-  color: var(--code-normal);
-  background-color: var(--background-primary-alt) !important;
-  bottom: -0.1px !important;
-}
-
 /* borders */
 
 .cm-s-obsidian span.cm-inline-code {

.obsidian/themes/Encore/manifest.json

@@ -1,6 +1,6 @@
 {
 	"name": "Encore",
-	"version": "2.8.0",
+	"version": "2.11.0",
 	"minAppVersion": "1.1.9",
 	"author": "Carbonateb",
 	"authorUrl": "https://lucaschampagne.dev/"

.obsidian/themes/Encore/theme.css

@@ -44,6 +44,12 @@ settings:
       - 
         label: Material Ocean
         value: encore-theme-dark-materialocean
+      - 
+        label: Flexoki
+        value: encore-theme-dark-flexoki
+      - 
+        label: Glass Royale
+        value: encore-theme-dark-glass-royale
   -
     id: theme-light
     title: 🌞 Theme • Light Mode
@@ -78,6 +84,81 @@ settings:
       - 
         label: Custom
         value: encore-colors-custom
+  -
+    id: encore-translucency
+    title: 👑 Encore Translucency
+    description: Get that translucent aesthetic back in your vault.
+    type: class-toggle
+  - 
+    id: encore-translucency-category
+    title: 🖼️ Translucency Background
+    type: heading
+    level: 1
+    collapsed: true
+  -
+    id: encore-translucency-description
+    title: About
+    type: info-text
+    description: "Make sure you've enabled **👑 Encore Translucency** above. Check out the **Glass Royale** theme (dark mode only) for some translucent workspaces!"
+    markdown: true
+  -
+    id: encore-translucency-strength
+    title: Translucency Strength
+    description: Adjusts how visible the background is
+    type: variable-number-slider
+    default: 0.25
+    min: 0
+    max: 1
+    step: 0.05
+  -
+    id: encore-translucency-background
+    title: Translucency Background
+    description: Pick a background to use in translucent mode.
+    type: class-select
+    allowEmpty: false
+    default: encore-bg-image
+    options:
+      - 
+        label: Custom Image
+        value: encore-bg-image
+      - 
+        label: Emerald
+        value: encore-bg-emerald
+      - 
+        label: Sapphire
+        value: encore-bg-sapphire
+      - 
+        label: 🎦 Frosty
+        value: encore-bg-frosty
+      - 
+        label: 🎦 Lava
+        value: encore-bg-lava
+      - 
+        label: 🎦 Dawn
+        value: encore-bg-dawn
+      - 
+        label: 🎦 Chromatic
+        value: encore-bg-chromatic
+      - 
+        label: 🎦 Prismatic
+        value: encore-bg-prismatic
+  -
+    id: encore-translucency-image
+    title: Background Image
+    description: Used when "Translucency Background" is set to "Custom Image". Must be formatted as url("YOUR URL HERE")
+    type: variable-text
+    quotes: false
+    default: url("https://images.unsplash.com/photo-1707494966495-a2cc8c1dac1f?q=80&w=1935&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D")
+  -
+    id: encore-translucency-blur-amount
+    title: Image Blur Amount
+    description: Adjust how strong the blur is on images
+    type: variable-number-slider
+    default: 10
+    min: 0
+    max: 20
+    step: 1
+
   
   #########################################################
   # Custom Colours
@@ -184,7 +265,11 @@ settings:
     title: Coloured Tooltip
     description: Make tooltips stand out much more by applying your theme colour to the border
     type: class-toggle
-  - 
+  -
+    id: encore-highlight-border
+    title: Highlighted Text Border
+    description: Make highlighted text stand out even more with a glowing border
+    type: class-toggle
   -
     id: encore-bright-accent
     title: Use Bright Accent Colour
@@ -230,6 +315,11 @@ settings:
     title: Disable Clickability Fix
     description: Encore makes it easier to click the edge of a document by adding some invisible padding. May cause issues if you have content that exceeds the width of your page. No effect on mobile version.
     type: class-toggle
+  -
+    id: encore-disable-logo-on-hr
+    title: Disable Logo on Horizontal Rule
+    description: Encore adds the Obsidian logo to horizontal ruled lines "---". Turn this on to revert to a simple line
+    type: class-toggle
   -
     id: encore-no-calendar
     title: Disable Calendar Integration
@@ -247,7 +337,6 @@ settings:
     type: class-toggle
 */
 
-@charset "UTF-8";
 .view-content,
 .view-header,
 .workspace,
@@ -390,6 +479,7 @@ body {
 
 body {
   background-color: rgba(var(--grey-900-rgb), var(--en-opacity));
+  --tab-container-background: transparent;
 }
 body.is-translucent:not(.is-fullscreen) {
   --en-opacity: 0.5;
@@ -409,6 +499,9 @@ body.theme-light.is-translucent:not(.is-fullscreen) {
   background-color: rgba(var(--grey-800-rgb), var(--en-opacity));
   border-radius: var(--tab-radius);
 }
+.mod-root .workspace-tab-container .workspace-leaf-content .canvas-wrapper {
+  background-color: transparent;
+}
 .mod-root .workspace-tab-container .workspace-leaf-content .canvas-wrapper .canvas-background {
   background-color: rgba(var(--grey-800-rgb), var(--en-opacity));
   --canvas-dot-pattern: var(--color-base-35);
@@ -419,6 +512,9 @@ body.theme-light .mod-root .workspace-tab-container .workspace-leaf-content {
   background-color: rgba(var(--grey-900-rgb), var(--en-opacity));
   border-radius: var(--tab-radius);
 }
+body.theme-light .mod-root .workspace-tab-container .workspace-leaf-content .canvas-wrapper {
+  background-color: transparent;
+}
 body.theme-light .mod-root .workspace-tab-container .workspace-leaf-content .canvas-wrapper .canvas-background {
   background-color: rgba(var(--grey-900-rgb), var(--en-opacity));
 }
@@ -438,7 +534,7 @@ body.encore-fancy-headers .workspace-tab-container .workspace-leaf-content > .vi
   background-color: rgba(var(--grey-800-rgb), var(--en-opacity));
   backdrop-filter: var(--en-acrylic);
 }
-body.encore-fancy-headers .workspace-tab-container .workspace-leaf-content > .view-content .cm-scroller {
+body.encore-fancy-headers .workspace-tab-container .workspace-leaf-content > .view-content > div > div > .cm-scroller {
   padding-top: calc(var(--header-height) + 32px);
 }
 body.encore-fancy-headers .workspace-tab-container .workspace-leaf-content > .view-content > iframe {
@@ -480,6 +576,11 @@ body.encore-fancy-headers .workspace-tab-container .workspace-leaf-content[data-
   gap: 4px;
 }
 
+.workspace-tab-header-container {
+  padding-left: 0;
+  padding-right: 0;
+}
+
 .mod-root .workspace-tabs .workspace-tab-header-container-inner {
   gap: 4px;
   padding: 4px 0;
@@ -567,6 +668,11 @@ body.theme-light .mod-root .workspace-tab-header.is-active .workspace-tab-header
   overflow: auto;
 }
 
+body:not(.is-mobile) .workspace-split.mod-left-split .workspace-sidedock-vault-profile {
+  background-color: transparent;
+  border: none;
+}
+
 body {
   --line-height-normal: 1.65;
   --link-decoration: none;
@@ -655,18 +761,17 @@ body {
   border-bottom-right-radius: 8px;
 }
 
-.markdown-rendered hr,
-.cm-line.hr hr {
+body:not(.encore-disable-logo-on-hr) .markdown-rendered hr,
+body:not(.encore-disable-logo-on-hr) .cm-line.hr hr {
   height: 1px;
   background-image: linear-gradient(to right, transparent, var(--hr-color) 46.2%, transparent 46.2%, transparent 54%, var(--hr-color) 54%, transparent);
   border: none;
   position: relative;
   overflow: visible;
 }
-
-.markdown-source-view:not(.is-live-preview) .HyperMD-hr::after,
-.markdown-rendered hr::after,
-.cm-line.hr hr::after {
+body:not(.encore-disable-logo-on-hr) .markdown-source-view:not(.is-live-preview) .HyperMD-hr::after,
+body:not(.encore-disable-logo-on-hr) .markdown-rendered hr::after,
+body:not(.encore-disable-logo-on-hr) .cm-line.hr hr::after {
   content: "";
   position: absolute;
   top: -12px;
@@ -678,12 +783,10 @@ body {
   background-repeat: no-repeat;
   background-image: var(--obsidian-logo-small);
 }
-
-.markdown-source-view:not(.is-live-preview) .HyperMD-hr {
+body:not(.encore-disable-logo-on-hr) .markdown-source-view:not(.is-live-preview) .HyperMD-hr {
   position: relative;
 }
-
-.markdown-source-view:not(.is-live-preview) .HyperMD-hr::before {
+body:not(.encore-disable-logo-on-hr) .markdown-source-view:not(.is-live-preview) .HyperMD-hr::before {
   content: "";
   position: absolute;
   left: 0;
@@ -692,15 +795,117 @@ body {
   height: 1px;
   background-image: linear-gradient(to right, transparent 10%, var(--hr-color) 46.2%, transparent 46.2%, transparent 54%, var(--hr-color) 54%, transparent);
 }
-
-.markdown-source-view:not(.is-live-preview) .HyperMD-hr::after {
+body:not(.encore-disable-logo-on-hr) .markdown-source-view:not(.is-live-preview) .HyperMD-hr::after {
   top: 2px;
 }
 
+body.encore-disable-logo-on-hr .markdown-rendered hr,
+body.encore-disable-logo-on-hr .cm-line.hr hr {
+  height: 1px;
+  background-image: linear-gradient(to right, transparent, var(--hr-color) 30%, var(--hr-color) 70%, transparent);
+  border: none;
+}
+
 .internal-embed.image-embed img {
   border-radius: 4px;
 }
 
+body.encore-translucency.encore-bg-image .app-container {
+  background-image: var(--encore-translucency-image);
+  background-size: cover;
+}
+body.encore-translucency.encore-bg-image .app-container::before {
+  position: fixed;
+  inset: 0;
+  content: "";
+  background: transparent;
+  backdrop-filter: blur(calc(1px * pow(var(--encore-translucency-blur-amount, 10), 2)));
+}
+body.encore-translucency.encore-bg-frosty {
+  background-image: linear-gradient(rgb(12, 136, 126), rgb(78, 4, 250));
+}
+body.encore-translucency.encore-bg-frosty .app-container {
+  background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 1920 3240' xmlns='http://www.w3.org/2000/svg'%3E%3Cdefs%3E%3C/defs%3E%3Cellipse style='filter: blur(200px); fill: rgb(38, 214, 255);' cx='465.54' cy='549.634' rx='559.232' ry='230.137'%3E%3C/ellipse%3E%3Cellipse style='filter: blur(200px); fill: rgb(59, 55, 212);' cx='1461.894' cy='749.77' rx='559.232' ry='338.301'%3E%3C/ellipse%3E%3Cellipse style='filter: blur(200px); fill: rgb(123, 130, 208);' cx='398.22' cy='1237.125' rx='559.232' ry='338.301'%3E%3C/ellipse%3E%3Cellipse style='filter: blur(200px); fill: rgb(17, 197, 255);' cx='1546.62' cy='1737.081' rx='603.713' ry='357.778'%3E%3C/ellipse%3E%3Cellipse style='filter: blur(200px); fill: rgb(185, 185, 185);' cx='981.906' cy='1520.478' rx='371.639' ry='230.137'%3E%3C/ellipse%3E%3Cellipse style='filter: blur(200px); fill: rgb(35, 30, 204);' cx='549.068' cy='2325.941' rx='721.684' ry='405.989'%3E%3C/ellipse%3E%3Cellipse style='filter: blur(200px); fill: rgb(148, 19, 172);' cx='1338.121' cy='2790.09' rx='721.684' ry='405.989'%3E%3C/ellipse%3E%3Cellipse style='filter: blur(200px); fill: rgb(148, 19, 172);' cx='1297.975' cy='-434.34' rx='721.684' ry='405.989'%3E%3C/ellipse%3E%3C/svg%3E");
+  background-size: cover;
+  background-repeat: mirror;
+  animation: scroll-up infinite 120s linear;
+}
+body.encore-translucency.encore-bg-chromatic {
+  background-image: repeating-linear-gradient(45deg, rgb(15, 245, 254), rgb(111, 0, 255), rgb(255, 0, 0), rgb(255, 222, 0), rgb(167, 255, 0), rgb(0, 255, 136), rgb(15, 245, 254), rgb(111, 0, 255), rgb(253, 0, 0), rgb(255, 222, 0), rgb(167, 255, 0), rgb(0, 255, 136), rgb(15, 245, 254), rgb(111, 0, 255));
+  background-size: 100% 800vh;
+  animation: scroll-up-down infinite 180s ease-in-out alternate-reverse;
+}
+body.encore-translucency.encore-bg-chromatic::before {
+  position: fixed;
+  inset: 0;
+  content: "";
+  background-image: radial-gradient(transparent, rgba(0, 0, 0, 0.9411764706));
+}
+body.encore-translucency.encore-bg-prismatic {
+  background-image: repeating-linear-gradient(45deg, rgb(0, 4, 255), rgb(107, 15, 254), rgb(153, 0, 255), rgb(255, 0, 242), rgb(255, 0, 170), rgb(255, 0, 242), rgb(153, 0, 255), rgb(107, 15, 254), rgb(0, 4, 255), rgb(107, 15, 254), rgb(153, 0, 255), rgb(255, 0, 242));
+  background-size: 100% 400vh;
+  animation: scroll-up infinite 30s linear;
+}
+body.encore-translucency.encore-bg-prismatic::before {
+  position: fixed;
+  inset: 0;
+  content: "";
+  background-image: radial-gradient(transparent, rgba(0, 0, 0, 0.9411764706));
+}
+body.encore-translucency.encore-bg-dawn {
+  background-image: radial-gradient(transparent, rgba(1, 2, 36, 0.4784313725)), linear-gradient(to bottom, rgba(222, 244, 255, 0.11), transparent), linear-gradient(to bottom left, #0036e6, #400dcc);
+}
+body.encore-translucency.encore-bg-dawn::before {
+  position: fixed;
+  inset: 0;
+  content: "";
+  animation: fade-in 60s linear infinite alternate;
+  background-image: radial-gradient(transparent, rgba(1, 2, 36, 0.5764705882)), linear-gradient(to bottom, rgba(222, 244, 255, 0.1568627451), transparent), linear-gradient(to bottom left, #ee8d4d, rgba(0, 18, 182, 0.7058823529));
+}
+body.encore-translucency.encore-bg-lava {
+  background-image: radial-gradient(transparent, #360700), linear-gradient(to top, #d86800, transparent), linear-gradient(to bottom left, #b43900, #1a0101);
+}
+body.encore-translucency.encore-bg-lava::before {
+  position: fixed;
+  inset: 0;
+  content: "";
+  animation: fade-in 60s linear infinite alternate;
+  background-image: radial-gradient(transparent, #360700), linear-gradient(to top, #f5e498, transparent), linear-gradient(to bottom left, #ff0000, #ff0000);
+}
+body.encore-translucency.encore-bg-emerald {
+  background-image: radial-gradient(transparent, #071400), linear-gradient(to top, #54f1d7, transparent), linear-gradient(to bottom left, #55df00, #1b4900);
+}
+body.encore-translucency.encore-bg-sapphire {
+  background-image: radial-gradient(transparent, #000018), linear-gradient(to top, #5871ff, transparent), linear-gradient(to bottom left, #0400ff, #0084ff);
+}
+body.encore-translucency .horizontal-main-container {
+  background-color: rgba(var(--grey-900-rgb), calc(1 - var(--encore-translucency-strength)));
+}
+
+@keyframes scroll-up {
+  0% {
+    background-position: 0 0;
+  }
+  100% {
+    background-position: 0 calc(100% - 100vh);
+  }
+}
+@keyframes scroll-up-down {
+  0% {
+    background-position: 0 0;
+  }
+  100% {
+    background-position: 0 100%;
+  }
+}
+@keyframes fade-in {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
 body.is-mobile .workspace-drawer {
   background: none;
 }
@@ -757,15 +962,15 @@ body.is-mobile .workspace-drawer-header {
   backdrop-filter: var(--en-acrylic);
 }
 
-body:not(.encore-disable-grain)::before {
+body:not(.encore-disable-grain) .workspace::before {
   content: "";
   position: fixed;
   inset: 0;
   background-image: var(--grain);
-  -webkit-mask-image: linear-gradient(rgba(0, 0, 0, 0.12), rgba(0, 0, 0, 0.06));
+  -webkit-mask-image: linear-gradient(rgba(0, 0, 0, 0.12), rgba(0, 0, 0, 0.05));
 }
 
-body.theme-light:not(.encore-disable-grain)::before {
+body.theme-light:not(.encore-disable-grain) .workspace::before {
   -webkit-mask-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.3));
 }
 
@@ -1216,7 +1421,9 @@ body.theme-dark {
   --color-base-30: rgb(var(--grey-600-rgb));
   --color-base-35: rgb(var(--grey-500-rgb));
   --color-base-40: rgb(var(--grey-400-rgb));
-  --color-base-50: rgb(var(--grey-350-rgb));
+  --color-base-50: rgb(
+    var(--grey-350-rgb)
+  );
   --color-base-60: rgb(var(--grey-300-rgb));
   --color-base-70: rgb(var(--grey-200-rgb));
   --color-base-100: rgb(var(--grey-100-rgb));
@@ -1257,7 +1464,9 @@ body.theme-light {
   --color-base-30: rgb(var(--grey-600-rgb));
   --color-base-35: rgb(var(--grey-500-rgb));
   --color-base-40: rgb(var(--grey-400-rgb));
-  --color-base-50: rgb(var(--grey-350-rgb));
+  --color-base-50: rgb(
+    var(--grey-350-rgb)
+  );
   --color-base-60: rgb(var(--grey-300-rgb));
   --color-base-70: rgb(var(--grey-200-rgb));
   --color-base-100: rgb(var(--grey-100-rgb));
@@ -1278,7 +1487,6 @@ body.theme-light .mk-note-header:after {
 
 body {
   --italic-color: var(--text-color);
-  --italic-weight: 600;
   --bold-color: var(--text-color);
   --bold-weight: 800;
   --inline-title-color: var(--color-accent-2);
@@ -1725,6 +1933,111 @@ body.encore-theme-dark-materialocean.theme-dark.encore-colors-colorful {
   --h6-color: var(--color-orange);
 }
 
+body.encore-theme-dark-flexoki.theme-dark {
+  --grey-50-rgb: 242, 240, 229;
+  --grey-100-rgb: 206, 205, 195;
+  --grey-200-rgb: 168, 166, 159;
+  --grey-300-rgb: 135, 133, 128;
+  --grey-350-rgb: 114, 111, 106;
+  --grey-400-rgb: 85, 82, 78;
+  --grey-500-rgb: 64, 62, 60;
+  --grey-600-rgb: 52, 51, 49;
+  --grey-700-rgb: 40, 39, 38;
+  --grey-800-rgb: 28, 27, 26;
+  --grey-850-rgb: 23, 22, 22;
+  --grey-875-rgb: 20, 19, 19;
+  --grey-900-rgb: 16, 15, 15;
+  --accent-h: 175;
+  --accent-s: 49%;
+  --accent-l: 45%;
+  --workspace-background-translucent: rgba(var(--grey-700-rgb), 0.33);
+  background-color: rgb(var(--grey-875-rgb));
+}
+body.encore-theme-dark-flexoki.theme-dark.encore-colors-colorful {
+  --highlight-hue: 50;
+  --italic-color: #d2e6d2;
+  --bold-color: #e0eec5;
+  --h1-color: #b3bcf0;
+  --h2-color: #989ed6;
+  --h3-color: #8987c9;
+  --h4-color: #9482c5;
+  --h5-color: #9482c5;
+  --h6-color: #9482c5;
+}
+body.encore-theme-dark-flexoki.theme-dark .mod-root .workspace-tab-container .workspace-leaf-content {
+  --en-opacity: 1;
+  background-color: rgb(var(--grey-900-rgb));
+}
+body.encore-theme-dark-flexoki.theme-dark .mod-root .workspace-tab-container .workspace-leaf-content .canvas-wrapper .canvas-background {
+  background-color: rgb(var(--grey-900-rgb));
+}
+body.encore-theme-dark-flexoki.theme-dark .mk-note-header:after {
+  --gradient-color: var(--color-base-10);
+}
+body.encore-theme-dark-flexoki.theme-dark.encore-fancy-headers .workspace-tab-container .workspace-leaf-content > .view-header {
+  --en-opacity: 0.66;
+  background-color: rgb(var(--grey-900-rgb));
+  backdrop-filter: var(--en-acrylic);
+}
+
+body.encore-theme-dark-glass-royale.theme-dark {
+  --grey-50-rgb: 225, 227, 233;
+  --grey-100-rgb: 222, 227, 241;
+  --grey-200-rgb: 173, 181, 200;
+  --grey-300-rgb: 162, 165, 186;
+  --grey-350-rgb: 126, 128, 148;
+  --grey-400-rgb: 97, 97, 115;
+  --grey-500-rgb: 40, 40, 48;
+  --grey-600-rgb: 26, 26, 32;
+  --grey-700-rgb: 20, 20, 25;
+  --grey-800-rgb: 11, 11, 12;
+  --grey-850-rgb: 8, 8, 8;
+  --grey-875-rgb: 6, 6, 6;
+  --grey-900-rgb: 0, 0, 0;
+  --accent-h: 203;
+  --accent-s: 66%;
+  --accent-l: 54%;
+  --workspace-background-translucent: rgba(var(--grey-900-rgb), 0.4);
+}
+body.encore-theme-dark-glass-royale.theme-dark.encore-colors-colorful {
+  --highlight-hue: 30;
+  --bold-color: var(--color-green);
+  --italic-color: var(--color-red);
+  --h1-color: #5af273;
+  --h2-color: #65e4de;
+  --h3-color: #e755db;
+  --h4-color: #e9ca63;
+  --h5-color: #9dee51;
+  --h6-color: #8badec;
+}
+body.encore-theme-dark-glass-royale.theme-dark .mod-left-split .workspace-tabs:not(.mod-top) .workspace-tab-header-container,
+body.encore-theme-dark-glass-royale.theme-dark .mod-right-split .workspace-tabs:not(.mod-top) .workspace-tab-header-container {
+  background-color: rgba(255, 255, 255, 0.062745098);
+  backdrop-filter: blur(20px) saturate(1.8);
+}
+body.encore-theme-dark-glass-royale.theme-dark .mod-left-split .workspace-tabs:not(.mod-top) .workspace-tab-header-container .workspace-tab-header-container-inner .workspace-tab-header.is-active,
+body.encore-theme-dark-glass-royale.theme-dark .mod-right-split .workspace-tabs:not(.mod-top) .workspace-tab-header-container .workspace-tab-header-container-inner .workspace-tab-header.is-active {
+  background-color: rgba(255, 255, 255, 0.1882352941);
+}
+body.encore-theme-dark-glass-royale.theme-dark .mod-root .workspace-tab-header.is-active .workspace-tab-header-inner {
+  background-color: rgba(255, 255, 255, 0.1882352941);
+  backdrop-filter: blur(50px) saturate(1.5);
+}
+body.encore-theme-dark-glass-royale.theme-dark .mod-root .workspace-tab-container .workspace-leaf-content {
+  --en-opacity: 0.75;
+  background-image: radial-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2509803922)), linear-gradient(rgba(255, 255, 255, 0.031372549), rgba(255, 255, 255, 0.0078431373));
+  backdrop-filter: blur(32px) saturate(2);
+}
+body.encore-theme-dark-glass-royale.theme-dark .mod-root .workspace-tab-container .workspace-leaf-content .canvas-wrapper .canvas-background {
+  background-color: transparent;
+  --canvas-dot-pattern: #ffffff15;
+}
+
+body.encore-theme-dark-glass-royale.theme-dark.encore-fancy-headers .workspace-tab-container .workspace-leaf-content > .view-header {
+  background-color: rgba(0, 0, 0, 0);
+  backdrop-filter: var(--en-acrylic);
+}
+
 body.encore-theme-light-sterling.theme-light {
   --grey-50-rgb: 17, 24, 39;
   --grey-100-rgb: 31, 41, 55;
@@ -1782,6 +2095,11 @@ body.theme-light {
   --hr-color: #00000090;
 }
 
+:root {
+  --encore-translucency-strength: 0.25;
+  --encore-translucency-image: url("https://images.unsplash.com/photo-1707494966495-a2cc8c1dac1f?q=80&w=1935&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D");
+}
+
 body.encore-bright-accent {
   --text-on-accent: var(--color-base-00);
 }
@@ -1799,14 +2117,14 @@ body.encore-blur-off {
   --en-modal-backdrop: brightness(0.5);
 }
 
-body:not(.is-mobile):not(.encore-disable-clickability-fix) .markdown-source-view.mod-cm6.is-readable-line-width .cm-content {
+body:not(.is-mobile):not(.encore-disable-clickability-fix) .markdown-source-view.mod-cm6.is-readable-line-width > .cm-editor > .cm-scroller > .cm-sizer > .cm-contentContainer > .cm-content {
   max-width: unset;
   margin-left: -4rem;
   padding-left: 4rem;
   margin-right: -4rem;
   padding-right: 4rem;
 }
-body:not(.is-mobile):not(.encore-disable-clickability-fix) .ͼ1 .cm-scroller {
+body:not(.is-mobile):not(.encore-disable-clickability-fix) .cm-scroller {
   overflow-x: hidden;
 }
 
@@ -1894,11 +2212,21 @@ body.encore-coloured-tooltip > .tooltip {
 .cm-s-obsidian span.cm-formatting-highlight,
 .cm-s-obsidian span.cm-highlight,
 .search-result-file-matched-text {
-  background-color: hsla(var(--highlight-hue), 100%, 50%, 0.2);
+  background-color: hsla(var(--highlight-hue), 100%, 30%, 0.5);
+  border-top: 1px solid hsla(var(--highlight-hue), 100%, 60%, 0.15);
+  border-bottom: 1px solid hsla(var(--highlight-hue), 100%, 20%, 1);
+  color: hsla(var(--highlight-hue), 100%, 92%, 1);
+}
+
+body.encore-highlight-border .markdown-rendered mark,
+body.encore-highlight-border .cm-s-obsidian span.cm-formatting-highlight,
+body.encore-highlight-border .cm-s-obsidian span.cm-highlight,
+body.encore-highlight-border .search-result-file-matched-text {
   outline: 1px solid hsla(var(--highlight-hue), 90%, 50%, 0.85);
-  padding: 0 0.15em;
-  border-radius: 3px;
   box-shadow: 0 0 10px hsla(var(--highlight-hue), 90%, 50%, 0.75);
+  padding: 0 0.15em;
+  border-radius: 0.2em;
+  border: none;
 }
 
 body:not(.is-mobile) .prompt {
@@ -1961,11 +2289,11 @@ body:not(.is-mobile) .prompt > .prompt-instructions {
 
 .modal {
   border: none;
-  background-color: rgba(var(--grey-800-rgb), var(--en-opacity));
+  background-color: rgb(var(--grey-850-rgb));
   --en-opacity: 1;
 }
 .modal .vertical-tab-header {
-  background-color: rgba(var(--grey-700-rgb), var(--en-opacity));
+  background-color: rgb(var(--grey-700-rgb));
   border-right: none !important;
 }
 .modal .vertical-tab-header .vertical-tab-header-group-title {

.obsidian/themes/Material Flat/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "Material Flat",
-  "version": "1.4.0",
-  "minAppVersion": "0.16.0",
+  "version": "1.4.3",
+  "minAppVersion": "1.1.0",
   "author": "Threethan, Joschua",
   "authorUrl": "https://github.com/Threethan/"
 }

.obsidian/themes/Material Flat/theme.css

@@ -1,11 +1,11 @@
 @charset "UTF-8";
 body {
   /* ## Fonts */
-  --font-text-theme: Roboto, "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI",
+  --font-text-theme: "Inter", Roboto, -apple-system, BlinkMacSystemFont, "Segoe UI",
     Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
     "Segoe UI Symbol", "Microsoft YaHei Light", sans-serif;
   --font-monospace-theme: "Roboto Mono", monospace, Menlo, SFMono-Regular, Consolas;
-  --font-interface-theme: var(--font-text-theme);
+  --font-interface-theme: "Segoe UI", -apple-system, BlinkMacSystemFont, Roboto, "Inter", sans-serif ;
 }
 
 :root {
@@ -38,6 +38,9 @@ body {
   --elevation3: 0.11;
   --elevation4: 0.12;
   --elevation5: 0.14;
+  --titlebar-text-color-focused: var(--text-normal);
+  --link-color-hover: hsl(var(--accent-h), calc(var(--accent-s) * 0.8), 80%) !important;
+  --link-external-color-hover: hsl(var(--accent-h), calc(var(--accent-s) * 0.8), 80%) !important;
 }
 
 .theme-light {
@@ -1013,6 +1016,10 @@ body:not(.is-phone).fab-enabled-desktop.custom-page-header body:not(:not(.advanc
   }
 }
 
+body:not(.is-phone).fab-enabled-desktop.custom-page-header:has(.titlebar) .view-action:first-child {
+  top: calc(100vh - 48px - 44px - 16px - 40px);
+}
+
 /* Pencil SVG */
 svg.pencil > path {
   display: none;
@@ -1696,8 +1703,9 @@ body {
   background: var(--tab-background-active) !important;
 }
 
-.workspace-tab-header-container {
+.workspace-tab-header-container, .mod-sidedock, .workspace-sidedock-vault-profile {
   background: none;
+  background-color: transparent !important;
 }
 
 .workspace-tab-header-container-inner {
@@ -2074,9 +2082,6 @@ body.tab-drag-desktop .mod-root .workspace-tab-header.is-active .workspace-tab-h
   border-color: var(--hr-color);
   margin: 11px 0;
 }
-.markdown-reading-view br {
-  display: none;
-}
 .markdown-reading-view table {
   margin-bottom: 0;
 }
@@ -2216,9 +2221,22 @@ body.button-shapes-mobile.is-phone .nav-action-button {
   padding-bottom: 9px !important;
 }
 
+div.titlebar {
+  background-color: transparent !important;
+}
+div.titlebar .titlebar-text {
+  opacity: 1;
+  font-weight: normal;
+}
+
 body.mod-windows {
   --frame-right-space: 142px !important;
 }
+body.mod-windows .titlebar-text {
+  justify-content: start;
+  padding-left: 50px;
+  padding-top: 4px;
+}
 body.mod-windows .titlebar-button-container .titlebar-button {
   width: 46px;
 }
@@ -2355,19 +2373,22 @@ body.mod-windows.win-menu.enable-mica.theme-dark div.menu {
 }
 
 body:not(.vibrant).theme-dark {
-  --color-accent: hsl(var(--accent-h), calc(var(--accent-s) * 0.4), 70%) !important;
-  --primary: hsl(var(--accent-h), calc(var(--accent-s) * 0.4), 70%) !important;
+  --color-accent: hsl(var(--accent-h), calc(var(--accent-s) * 0.6), 70%) !important;
+  --color-accent-1: hsl(var(--accent-h), calc(var(--accent-s) * 0.7), 80%) !important;
+  --color-accent-2: hsl(var(--accent-h), calc(var(--accent-s) * 0.8), 90%) !important;
+  --primary: hsl(var(--accent-h), calc(var(--accent-s) * 0.75), 80%) !important;
   --secondary: hsl(var(--accent-h), calc(var(--accent-s) * 0.4), 70%) !important;
   --text-accent: hsl(var(--accent-h), calc(var(--accent-s) * 0.4), 90%) !important;
-  --link-color-hover: hsl(var(--accent-h), calc(var(--accent-s) * 0.4), 90%) !important;
+  --text-accent: hsl(var(--accent-h), calc(var(--accent-s) * 0.4), 90%) !important;
 }
 
 body:not(.vibrant).theme-light {
-  --color-accent: hsl(var(--accent-h), calc(var(--accent-s) * 0.6), 70%) !important;
-  --primary: hsl(var(--accent-h), calc(var(--accent-s) * 0.6), 70%) !important;
+  --color-accent: hsl(var(--accent-h), calc(var(--accent-s) * 0.8), 75%) !important;
+  --color-accent-1: hsl(var(--accent-h), calc(var(--accent-s) * 0.7), 80%) !important;
+  --color-accent-2: hsl(var(--accent-h), calc(var(--accent-s) * 0.6), 85%) !important;
+  --primary: hsl(var(--accent-h), calc(var(--accent-s) * 0.86), 73%) !important;
   --secondary: hsl(var(--accent-h), calc(var(--accent-s) * 0.6), 70%) !important;
   --text-accent: hsl(var(--accent-h), calc(var(--accent-s) * 0.6), 50%) !important;
-  --link-color-hover: hsl(var(--accent-h), calc(var(--accent-s) * 0.4), 10%) !important;
 }
 
 body.theme-dark {
@@ -2407,10 +2428,10 @@ body.theme-light {
   --secondary: var(--color-accent-2);
   --background: #fff;
   --on-background: #111;
-  --surface: hsl(var(--accent-h), calc(var(--accent-s) * 0.25), 95%);
-  --surface-variant: hsl(var(--accent-h), 0, 85%);
+  --surface: #FFF;
+  --surface-variant: hsl(var(--accent-h), calc(var(--accent-s) * 0.75), 93%);
   --surface-mid: hsl(var(--accent-h), calc(var(--accent-s) * 0.35), 93%);
-  --on-surface-variant: hsl(var(--accent-h), calc(var(--accent-s) * 0.30), 23%);
+  --on-surface-variant: hsl(var(--accent-h), calc(var(--accent-s) * 0.30), 20%);
   --outline: hsl(var(--accent-h), calc(var(--accent-s) * 0.5), 85%);
   --inverse-on-surface: #EEE;
   --inverse-surface: #111;
@@ -2504,9 +2525,9 @@ settings:
     -
         id: no-top-space
         title: Remove top padding (Desktop)
-        description: Removes the bit of space above the tabs. Useful if using system titlebars.
+        description: Removes the bit of space above the tabs.
         type: class-toggle
-        default: false
+        default: true
     - 
         id: hide-sidebar-header
         title: Hide sidebar header (Mobile)

.obsidian/themes/Tokyo Night/manifest.json

@@ -0,0 +1,6 @@
+{
+  "name": "Tokyo Night",
+  "version": "1.1.0",
+  "minAppVersion": "0.0.1",
+  "author": "tcmmichaelb139"
+}

.obsidian/themes/Wikipedia/manifest.json

@@ -0,0 +1,7 @@
+{
+"name": "Wikipedia",
+"version": "2.0.4",
+"minAppVersion": "1.0.0",
+"author": "Ha'ani Whitlock",
+"authorUrl": "https://github.com/Bluemoondragon07"
+}

.obsidian/workspace.json

@@ -4,21 +4,20 @@
     "type": "split",
     "children": [
       {
-        "id": "18e28060fe2de0a2",
+        "id": "d8bc7e780bc1fcab",
         "type": "tabs",
         "children": [
           {
-            "id": "d83bb0bbeeb86eec",
+            "id": "87fc52db0e53c854",
             "type": "leaf",
             "state": {
-              "type": "markdown",
+              "type": "diff-view",
               "state": {
-                "file": "Software Project with Agile Techinques/Hackcamp/Iteration 1 - Product Demo.md",
-                "mode": "source",
-                "source": false
+                "staged": false,
+                "file": "AI & Data Mining/Week 20/Week 20 - Intro to Propositional Logic.md"
               },
-              "icon": "lucide-file",
-              "title": "Iteration 1 - Product Demo"
+              "icon": "git-pull-request",
+              "title": "Diff View (Week 20 - Intro to Propositional Logic)"
             }
           }
         ]
@@ -67,7 +66,8 @@
             "state": {
               "type": "file-explorer",
               "state": {
-                "sortOrder": "alphabetical"
+                "sortOrder": "alphabetical",
+                "autoReveal": false
               },
               "icon": "lucide-folder-closed",
               "title": "Files"
@@ -176,8 +176,8 @@
             "state": {
               "type": "mermaid-toolbar-view",
               "state": {},
-              "icon": "lucide-file",
-              "title": "Plugin no longer active"
+              "icon": "trident-custom",
+              "title": "Mermaid Toolbar"
             }
           }
         ],
@@ -198,54 +198,54 @@
       "mermaid-tools:Open Mermaid Toolbar": false
     }
   },
-  "active": "ff4e63a36b080692",
+  "active": "87fc52db0e53c854",
   "lastOpenFiles": [
-    "Penetration Testing/Assessment/lu2115971906xx9.tmp",
-    "Software Project with Agile Techinques/Hackcamp/Red Ocelot Notes.md",
-    "Software Project with Agile Techinques/Hackcamp/Iteration 1 - Product Demo.md",
-    "Penetration Testing/Assessment/Penetration Testing Assignment 1 Stage 3 00677611.odt",
-    "Penetration Testing/Assessment/lu199919987v71p.tmp",
-    "Client Server Systems/Ecobuddy/Databases/ecobuddynew.sqlite",
-    "Client Server Systems/Ecobuddy/postTestHandler.php",
-    "Client Server Systems/Ecobuddy/nginx/php/config/www.conf",
-    "Client Server Systems/Ecobuddy/nginx/php/fpm-php.www.log",
-    "Client Server Systems/Ecobuddy/nginx/php/config",
-    "Client Server Systems/Ecobuddy/nginx/php/Dockerfile",
-    "Client Server Systems/Ecobuddy/nginx/logs/error.log",
-    "Client Server Systems/Ecobuddy/nginx/logs/access.log",
-    "Client Server Systems/Ecobuddy/README.md",
-    "Client Server Systems/Ecobuddy/Databases/sqlite-hashes/README.md",
-    "Software Project with Agile Techinques/Hackcamp/Meeting 1 - Task Delegation.md",
-    "Penetration Testing/Week 11/Lecture 11 - Enumeration.md",
-    "Client Server Systems/Ecobuddy/images/ecoBuddy_x128.png",
-    "Client Server Systems/Ecobuddy/images/ecoBuddy_x128.jpg",
-    "Client Server Systems/Ecobuddy/images/ecoBuddy_x64.jpg",
-    "Client Server Systems/Ecobuddy/images/ecoBuddy_x64.png",
-    "Client Server Systems/Ecobuddy/images/ecoBuddy_x32.png",
-    "Client Server Systems/Ecobuddy/images/ecoBuddy_x32.jpg",
-    "Data Structures/GPT Answers to Past Paper/Question 3.md",
+    "AI & Data Mining/Week 20/Week 20 - Intro to Propositional Logic.md",
+    "AI & Data Mining/Week 20/Chapter 20 Tutorial - Introduction to Propositional Logic.md",
+    "AI & Data Mining/Week 20/Propositional Logic Examples.md",
+    "Networking and Security/Week 20/hashcat-exercise/test-dict",
+    "Networking and Security/Week 20/hashcat-exercise/view-sample-password.sh",
+    "Networking and Security/Week 20/hashcat-exercise/crack-these-please-sha512",
+    "Networking and Security/Week 20/hashcat-exercise/crack-these-please-sha256",
+    "Networking and Security/Week 20/hashcat-exercise/crack-these-please-md5",
+    "Networking and Security/Week 20/hashcat-exercise/500_passwords.txt",
+    "Networking and Security/Week 20/hashcat-exercise/50-crack-these-please",
+    "Networking and Security/Week 20/hashcat-exercise",
+    "Networking and Security/Week 20/hashcat-exercise-files.zip",
+    "Networking and Security/Week 20",
+    "AI & Data Mining/Week 19/Timeline of History.md",
+    "Penetration Testing/Week 20/Week 20 - Web Attacks.md",
+    "CWC 3 - Fit for Trade.md",
+    "images/Pasted image 20250129154055.png",
+    "CWC 1 - Consistency.md",
+    "CWC 2 - Warm Welcome.md",
+    "Penetration Testing/Week 19/Steps to Complete Workshop 2.md",
+    "AI & Data Mining/Week 18/Week 18 - Tutorial.md",
     "Data Structures/GPT Answers to Past Paper/Question 4.md",
-    "Data Structures/GPT Answers to Past Paper/Question 5.md",
-    "Data Structures/GPT Answers to Past Paper/Question 6.md",
-    "Data Structures/GPT Answers to Past Paper/Question 7.md",
-    "Data Structures/GPT Answers to Past Paper/Question 8.md",
-    "Data Structures/GPT Answers to Past Paper/Question 9.md",
-    "Data Structures/GPT Answers to Past Paper/Question 10.md",
     "Data Structures/GPT Answers to Past Paper/Question 1.md",
-    "Data Structures/GPT Answers to Past Paper/Question 2.md",
-    "Data Structures/Untitled.md",
-    "Data Structures/Week 7/Week 7.md",
-    "Data Structures/GPT Answers to Past Paper.md",
-    "Data Structures/Week 5/Lecture 9 - Stacks.md",
-    "Data Structures/Week 4/Week 4 - Exceptions.md",
-    "Data Structures/Week 3/Lecture 5 - Linear List.md",
-    "Data Structures/Week 3/Workshop 3 - ADTs.md",
-    "Career Development/Assessment.md",
-    "AI & Data Mining/Week 9/Chapter 15.md",
-    "Client Server Systems/Ecobuddy/images/new_uos_logo.jpg",
-    "Client Server Systems/Ecobuddy/fonts/glyphicons-halflings-regular.svg",
-    "Client Server Systems/Ecobuddy/MVCTemplate/images/new_uos_logo.jpg",
-    "Client Server Systems/Ecobuddy/MVCTemplate/fonts/glyphicons-halflings-regular.svg",
+    "Data Structures/GPT Answers to Past Paper/Question 6.md",
+    "Penetration Testing/Week 19/AI Summary.md",
+    "Penetration Testing/Week 19/Week 19 -  Buffer Overflow.md",
+    "Client Server Systems/PHPStorm Repo/php-s1/MVCtemplate-23-24/images/new_uos_logo.jpg",
+    "Client Server Systems/PHPStorm Repo/php-s1/MVCtemplate-23-24/fonts/glyphicons-halflings-regular.svg",
+    "Client Server Systems/PHPStorm Repo/php-s1/workshop6/images/new_uos_logo.jpg",
+    "Client Server Systems/PHPStorm Repo/php-s1/workshop6/fonts/glyphicons-halflings-regular.svg",
+    "Client Server Systems/PHPStorm Repo/php-s1/workshop5/images/new_uos_logo.jpg",
+    "Client Server Systems/PHPStorm Repo/php-s1/workshop5/fonts/glyphicons-halflings-regular.svg",
+    "Client Server Systems/PHPStorm Repo/php-s1/workshop4/images/new_uos_logo.jpg",
+    "Client Server Systems/PHPStorm Repo/php-s1/workshop4/fonts/glyphicons-halflings-regular.svg",
+    "Client Server Systems/PHPStorm Repo/workshop5/fonts/glyphicons-halflings-regular.svg",
+    "AI & Data Mining/Week 18/Week 18 - What AI?????.md",
+    "Networking and Security/Week 18/Workshop.md",
+    "Data Structures/AI Notes/Stack.md",
+    "Data Structures/AI Notes/Trees.md",
+    "Data Structures/AI Notes/Linear List.md",
+    "Data Structures/AI Notes/Exceptions.md",
+    "Data Structures/AI Notes/Double linked lists.md",
+    "Data Structures/AI Notes/Data Structures and Abstract Data Types.md",
+    "Data Structures/AI Notes/ADT Linear List.md",
+    "Data Structures/Focused Exam Revision.md",
+    "Data Structures/GPT Answers to Past Paper/Question 3.md",
     "Database Systems/Untitled.canvas",
     "Untitled 1.canvas",
     "Untitled.canvas"

AI & Data Mining/Exam Revision/Acronyms.md

@@ -0,0 +1,15 @@
+# 1R: (AV)CTARs
+(foreach) Attribute
+	(foreach) Value
+		Count (class)
+		Top (most frequent class)
+		Assign (rule to class)
+	Error Rate (in rule)
+Smallest (error rate)
+
+# Missing Values: Ma $\Delta$D CPS
+Malfunctioning Equipment
+Change in Design
+Collation of Datasets
+Data not collected for mining (Purpose)
+Missing Value is Significant

AI & Data Mining/Exam Revision/Classification.md

@@ -0,0 +1,23 @@
+# 1R
+### (AV)CTARs
+Simple
+Classification
+One-Level tree
+
+Tie, make arbitrary choice
+## Issue with Numerics
+- Discretise
+	- List values of attribute
+	- Sort asc
+	- Write class under each value
+	- Breakpoints between change in class
+	- Interval assigned to majority class
+	- Enforce bucket size, if adjacent interval has same class, merge.
+## Issue with Missing Values
+- Assign "missing" as a value
+- Treat normally
+## Issue with Overfitting
+- Bucket Enforcement
+- Ensure attribute tested is applicable
+
+# PRISM

AI & Data Mining/Week 18/Week 18 - Tutorial.md

@@ -0,0 +1,11 @@
+1. Cognitive bias such as confirmation bias, and lack of self-awareness of own thoughts could cause introspection to be inaccurate. Hard to be objective.
+2. Since systems should become more knowledgable over time, an AI could learn to correct past mistakes and no longer act like a human making errors. If a goal cannot be achieved, a system may attempt to improve it's intelligence to obtain it's goal; optimise performance measure, in line with evolution.
+3. The latter statement is true in most cases, external factors out of our control must violate the statement, but generally computers must only do what programmers tell them to. However, this does not imply a computer cannot be intelligent; a programmer could tell a computer to learn and evolve.
+4. Considering the previous point, this is a direct comparison, and the philosophy should be maintained. An animal's intelligence may not be constrained by it's genes, but rather experiences and environment.
+5. Unless a law of physics is misunderstood, animals, humans and machines must abide by laws of physics. However this does not define intelligence.
+6. To what extent:
+	1. Bar Code Scanners utilise perception
+	2. Search Engines recognise language
+	3. Telephone menus recognise language and can "hear"
+	4. Dynamic routing algorithms utilise machine learning
+7. Following the principles defined by the turing test, AI should classify as both science and engineering. The concepts and programming are scientific, however robotics and hardware are engineering.

AI & Data Mining/Week 18/Week 18 - What AI?????.md

@@ -0,0 +1,161 @@
+Coursework due provisionally 28th Feb 4pm
+
+# WHAT IS AI ???????????
+
+- Intelligence important (Smarts > Sharts)
+- AI relevant to any intellectual task
+- Aims to understand and built intelligent entities
+
+## Approaches to AI
+
+![](Pasted%20image%2020250116131428.png)
+Thinking like humans, Acting like humans
+Meaning, not perfect.
+Measure success against rationality rather than result.
+
+## Definitions of AI
+
+Thinking like humans:
+	Machines with minds, automation of activities associated with human thinking, decision making, problem solving, etc.
+Thinking Rationally
+	Study of mental faculties through computational models, making it possible to perceive, reason, act.
+Acting like Humans
+	Creating machines that perform functions requiring intelligence when performed by people. Make computers do things which people can be better at.
+Acting Rationally
+	Study of design of intelligent agents. AI concerned with intelligence behaviour in artefacts.
+
+### Acting Like Human: The Turing Test
+
+A test to prove proper operational definition of intelligence; the imitation game.
+![](Pasted%20image%2020250116131816.png)
+A computer passes the test if a human interrogator, posing written questions, cannot tell if written response came from human or computer
+No direct interaction between interrogator and computer. Deliberately avoided due to physical simulation unimportant; a test of intelligence.
+
+#### The Total Turing Test
+
+Includes additional apparatus:
+
+- Video Signal - allows interrogator to test perceptual abilities
+- Hatch - Interrogator can pass physical objects through a hatch
+
+#### Acceptance Criteria
+
+To pass the Turing Test, the computer would need:
+
+- natural language processing to communicate successfully;
+- knowledge representation to store what it knows or hears;
+- automated reasoning to use the stored information to answer questions and draw new conclusions;
+- machine learning to adapt to new circumstances and to detect and extrapolate patterns;
+To pass the total Turing Test, the computer would need:
+- computer vision to perceive objects;
+- robotics to manipulate objects and move about.
+
+These are the 6 principles that encapsulate most of AI
+
+#### Appraisal
+
+- Anticipated all major arguments against AI in following 50 years
+- Suggested major components of AI: knowledge, reasoning, language understanding, learning.
+- Remains relevant 60 years later.
+However,
+- AI researchers given little effort to passing Turing Test,
+- Believe it is more important to study underlying principles of intelligence rather than duplicate an exemplar.
+
+### Thinking Like Human: Cognitive Modelling
+
+Introspection - catching thoughts as they happen
+Psychological Experiments - observing a person in action
+Brain Imaging - observing brain in action
+Sufficiently precise theory of mind can be expressed as a computer program
+If IO behaviour of program and human matching, evidence that some of the programs mechanisms are mirrored in humans
+
+#### Cognitive Modelling
+
+- Level of Abstraction? Knowledge or Circuits?
+- How to Validate?
+	- Cognitive Science - Predicting and testing behaviour of human subjects (top down)
+	- Cognitive Neuroscience - Direct identification from neurological data (bottom up)
+
+Both approaches now distinct from AI
+Both share with AI that the available theories do not explain anything resembling human-level general intelligence.
+
+### Thinking Rationally: Laws of Thought
+
+- Syllogisms - patterns for argument structures that always yield correct conclusions when given correct premises.
+
+ex. Socrates is a man, men are mortal, socrates is mortal.
+
+Laws of thought were supposed to govern the operation of the mind.
+Study gave rise to the field of **logic**, and may have proceeded to the idea of **mechanisation**
+
+#### Laws of Thought
+
+Direct link with mathematics & philosophy, and AI
+Logicians in the 19th century developed precise notation for statements of objects in the world, and their relations.
+By the 60s, programs existed that could solve any solvable problem descirbed in logical notation
+(However, program might loop forever if no solution exists. Tractability of the program depends on the problem)
+
+#### Problems
+
+Not all intelligent behaviour is mediated by logical deliberation
+
+- Not easy to take informal knowledge and state it in logical notation, especially when uncertain.
+Can be large discrepancy between in-principle and in-practice
+- Even a few hundred parameters can exhaust the computational resources of any computer unless some guidance is given first.
+Purpose of Thinking?
+- What thoughts *should* I have out of all the thoughts I *could* have.
+
+### Acting Rationally
+
+Rational Behaviour - doing the correct thing
+The right thing is that which is expected to maximise goal achievement given available information
+Doesnt necessarily involve thinking, but thinking should be in the service of rational action.
+
+Aristotle:
+
+- Every art and every enquiry, and similarly every action and pursuit, is thought to aim at some good
+
+#### Rational Agents
+
+An agent is an entity that can perceive and act.
+
+All computer programs do something, but computer agents are expected to operate autonomously, perceive environment, persist over time, adapt to change, and create / pursue goals.
+
+Percept - agents perceptual inputs at any given instance.
+
+Abstractly, an agent is a function from percept histories to actions
+For any given class of environments and tasks, we seek the agent with the best performance.
+
+#### Perfect <-> Limited Rationality
+
+Perfect rationality always succeeds. This is infeasible in complicated environments, and computational demands are too high.
+
+Limited rationality means acting appropriately when there is not enough time to do all the computations one might wish. Design best program for given machine resources.
+
+Perfect rationality remains a good starting point for theoretical analysis.
+
+#### Value Alignment Problem 
+
+A problem with perfect rationality is that it would assume a fully specified objective given to the machine.
+Artificially defined problems such as chess, come with an objective.
+Real world problems such as self-driving cars, become more difficult to specify the objective completely and correctly.
+
+Objective cannot simply be to reach destination safely, since optimal strategy would be to leave the car at home given risks, failures, etc.
+
+Values or objectives given to the machine must align with those of humans
+Problem of achieving this is called the value alignment problem
+
+### Bad Behaviour
+
+If a machine is intelligent enough to reason and act, such a machine may attemt to increase chances of winning by immoral means:
+- Blackmail
+- Bribery
+- Grabbing additional computing resources for itself
+These behaviours are rational, and are logical for success, however immoral.
+
+### Beneficial Machines
+
+We do not want machines that are intelligent in the sense of pursuing their objectives.
+We want them to pursue our objectives.
+If we cannot transfer our objectives perfectly to the machine, we need the machine to know that is does not know the complete objective and have the incentive to act cautiously, ask for permission, learn about preferences through observation, defer to human control. 
+We want agents that are provably beneficial to humans.

AI & Data Mining/Week 19/Timeline of History.md

@@ -0,0 +1,125 @@
+**1943:**
+- **Warren McCulloch and Walter Pitts**: Publish the first work generally recognized as AI, showing that any computable function could be computed by a network of connected neurons and implementing logical connectives (and, or, not) using simple net structures.
+
+**1944:**
+- **Alan Turing**: Proposes the concept of a "learning machine" (Turing Test) in a letter to The Times.
+
+**1950:**
+- **Alan Turing**: Publishes "Computing Machinery and Intelligence," introducing the Turing Test for intelligent machines.
+
+**1952:**
+- **Wisconsin General Learning Device**: First neural network using perceptrons, developed by Frank Rosenblatt.
+
+**1956:**
+- **John McCarthy**: Coins the term "Artificial Intelligence" at a conference held in Dartmouth.
+
+**1957:**
+- **Perceptrons**: Simple binary classifiers introduced by Frank Rosenblatt.
+
+**1960:**
+- **Adaline**: Improved perceptron with adaptive learning, developed by Bernard Widrow.
+
+**1964:**
+- **ELIZA**: A natural language processing program simulating a psychotherapist, developed by Joseph Weizenbaum.
+- **STUDENT**: Solves algebra word problems using a formal algorithm, developed by John McCarthy.
+
+**1965:**
+- **Herbert Simon**: Makes overoptimistic predictions about AI's pace at a conference.
+- First conference on AI planning systems.
+
+**1968:**
+- Stanford Research Institute introduces the first speech understanding system.
+
+**1969:**
+- AI planning systems used to schedule university classes.
+- **DENDRAL**: An early expert system using a heuristic search algorithm for structural molecular formulas, developed by Edward Feigenbaum et al.
+
+**1972:**
+- **MYCIN**: The first expert system using an inference engine, developed by Edward Shortliffe at Stanford University. It diagnosed infectious diseases based on symptom information.
+
+**1974:**
+- **STELLAR**: An early example of using machine learning to generate rules for a knowledge-based system. Developed by John McCarthy and colleagues, STELLAR learned to play checkers using alpha-beta pruning.
+
+**1975:**
+- **Xerox PARC**: Develops the first personal computer (Alto) with a graphical user interface (GUI), paving the way for modern computing and AI interaction.
+
+**1976:**
+- **Turing Award**: Marvin Minsky receives the first Turing Award for his work on AI, neural networks, and cognitive architecture.
+
+**1979:**
+- **PROLOG**: A logic programming language developed by Alan Colmerauer and others becomes popular for AI applications.
+
+**1980:**
+- **XCON**: Configured computer systems based on customer needs, developed by John McDermott at Digital Equipment Corporation. It saved millions of dollars in hardware costs.
+
+**1982:**
+- **Fifth Generation Computer Systems (FGCS) Project**: Japan starts a government-funded project aiming to develop advanced AI systems focused on parallel processing and logic programming.
+
+**1982:**
+- **Expert System Showdown**: An event organized by the United States Air Force to compare six expert systems. This marked a significant step in making AI practical for real-world applications.
+
+**1985:**
+- **Neural Networks**: John Hopfield introduces Hopfield networks, a type of recurrent artificial neural network capable of performing parallel information processing.
+
+**1986:**
+- **Japanese Fifth Generation Computer Systems (FGCS) Project**: Launched with the goal of developing advanced AI systems focused on parallel processing and logic programming.
+
+**1987:**
+- **Neural Networks**: David Rumelhart, Geoffrey Hinton, and Ronald Williams publish a seminal work on backpropagation, an algorithm used to train artificial neural networks.
+
+**1990:**
+- **Internet**: The World Wide Web is invented by Tim Berners-Lee, making information more accessible and enabling the growth of AI-driven search engines.
+
+**1991:**
+- **High-Performance Computing and Communications (HPCC) Act**: The US government initiative supporting AI research emphasizes advanced networks and high-performance computing.
+
+**1995:**
+- **Deep Blue**: IBM's chess-playing computer, using AI techniques, defeats world champion Garry Kasparov in a match.
+
+**1997:**
+- **Watson**: IBM's question-answering system, using AI techniques, performs at the Jeopardy! game show against human champions.
+
+**2011:**
+- **ImageNet**: A large-scale image recognition competition, won by a deep learning-based approach developed by Geoffrey Hinton and others. This marked a significant breakthrough for AI in computer vision.
+
+**2016:**
+- **AlphaGo**: Developed by DeepMind, AlphaGo uses AI techniques to defeat world champions in the complex board game Go.
+
+**2020:**
+- **AI Ethics**: Increased focus on AI ethics, fairness, accountability, and transparency becomes prominent in AI research and development.
+
+```mermaid
+gantt
+    dateFormat  YYYY
+    title Cutting feature timeline
+
+    section Early AI Pioneers & Microworlds
+        Alan Turing :inactive, 1944
+        John von Neumann :after Alan Turing, 1953
+        Marvin Minsky's Students :after John von Neumann, 1963-1973
+            Saint :after Marvin Minsky's Students, 1963
+            Analogy :after Saint, 1968
+            Student :after Analogy, 1967
+
+    section Expert Systems & Knowledge Intensive Systems
+        DENDRAL :after Student, 1965
+        MYCIN :after DENDRAL, 1972
+
+    section AI Research & Limitations
+        Herbert Simon :inactive, 1965
+        Lighthill Report :after Herbert Simon, 1973
+
+    section Natural Language Understanding
+        Eugene Charniak :inactive, 1976
+        Roger Schank :after Eugene Charniak, 1977
+
+    section AI Milestones & Advancements
+        Expert System Showdown :after MYCIN, 1982
+        Hopfield Networks :after Expert System Showdown, 1986
+        Backpropagation :after Hopfield Networks, 1987
+
+    section AI in Competition & Everyday Life
+        Deep Blue :after Backpropagation, 1997
+        Watson :after Deep Blue, 2011
+        
+```

AI & Data Mining/Week 20/Chapter 20 Tutorial - Introduction to Propositional Logic.md

@@ -0,0 +1,75 @@
+1. Which of the following English sentences express a proposition?
+(a) I think therefore I am.
+Proposition
+
+(b) Do as I say, not as I do!
+Command
+
+(c) Whenever the assignment x = y is executed, the value of y remains unaltered.
+Proposition
+
+(d) Write clearly and legibly.
+Command
+
+(e) How do you know your answers are correct?
+Question
+
+1. List the atomic propositions and connectives which appear in the following propositions and write down a well-formed formula for each one.
+
+(a) If it rains then I am going to get wet.
+Atomic Propositions:
+	It rains
+	I am going to get wet
+Connectives:
+	If
+	Then
+Formula: p => q
+
+(b) Increased spending overheats the economy.
+Atomic Propositions:
+	Increased spending 
+	Overheats the economy
+Connectives: 
+	None, implied non-linguistic
+Formula: p => q
+
+(c) Increased spending coupled with tax cuts overheats the economy.
+Atomic Propositions:
+	Increased spending
+	There are tax cuts 
+	Overheated economy
+Connectives:
+	Coupled with
+Formula: p ^ q => r
+
+(d) Overheating economy is a synonym for rise in excess demand.
+Atomic Propositions:
+	Overheating economy
+	Rise in excess demand
+Connectives:
+	is a synonym for
+Formula: p <=> q
+
+(e) Inflation either rises or does not.
+Atomic Propositions:
+	Inflation rises
+	Inflation does not rise
+Connectives:
+	either / or
+Formula: p 
+
+1. Remove as many brackets as possible from the following propositions without altering their meaning (i.e. the truth table).
+
+(a) ((q ⇔((¬r) ∨(s ∧p))) ⇔(q ⇒p))
+(b) (((p ∧(¬q)) ∧r) ∨s)
+(c) ((p ⇒(q ∨r)) ∧(¬(r ⇒s)))
+(d) ((¬(¬(¬(q ∨r)))) ⇔(q ⇔r))
+(e) (p ∨(q ∨r))
+
+1. Decide using truth tables whether each of the following is a tautology, contradiction or contingency.
+
+(a) p ⇒¬p
+
+(b) p ∧q ⇒p
+
+(c) (p ⇒¬p) ∧(¬p ⇒p)

AI & Data Mining/Week 20/Week 20 - Intro to Propositional Logic.md

@@ -0,0 +1,126 @@
+# Propositions
+
+  - Declarative sentences with truth values (T or F)
+  - Atomic propositions (basic building blocks)
+  - Compound propositions (combinations of atomic propositions)
+
+### Argument Form: Modus Ponens (Affirming the Antecedent)
+
+- Content: If it’s raining, then the ground is wet. The ground is wet. Therefore, it was raining.
+
+### Argument Form: Disjunctive Syllogism
+
+- Content: Either it’s raining or the plants need water. It’s not raining. Therefore, the plants need water.
+
+## Propositional Connectives
+
+  - Negation (¬): p is true if and only if ¬p is false
+  - Conjunction (∧): p ∧ q is true if and only if both p and q are true
+  - Disjunction (∨): p ∨ q is true if and only if at least one of p or q is true
+  - Implication (⇒): p ⇒ q is false if and only if p is true and q is false
+  - Equivalence (⇔): p ⇔ q is true if and only if p and q have the same truth value
+## Precedence Order of Connectives
+1. Negation (¬)
+2. Conjunction (∧)
+3. Disjunction (∨)
+4. Implication (⇒)
+5. Equivalence (⇔)
+
+This means that in a formula without parentheses, ¬ takes precedence over ∧ and ∨, ∧ and ∨ have the same precedence but associativity to the left, and ⇒ and ⇔ also have the same precedence but associativity to the right. For example, p ∧ q ⇒ r is equivalent to (p ∧ q) ⇒ r, not p ∧ (q ⇒ r).
+### Propositions and Connectives (Examples)
+
+#### Atomic Propositions:
+
+- p: The cat is on the mat.
+- q: The dog is sleeping.
+
+#### Compound Propositions Using Connectives:
+
+- p ∧ q: The cat is on the mat and the dog is sleeping.
+- ¬p: It’s not the case that the cat is on the mat.
+- p ∨ q: Either the cat is on the mat or the dog is sleeping (or both).
+- p ⇒ q: If the cat is on the mat, then the dog is sleeping.
+- p ⇔ q: The cat is on the mat if and only if the dog is sleeping.
+
+#### Natural Language Statements
+
+- Natural language statement: If you study hard, then you will pass the exam.
+	- Formalized as: p ⇒ q
+- Natural language statement: Either you will go to the party or stay home and study.
+	- Formalized as: p ∨ ¬q
+
+#### Logic Formulae
+
+- Formula: (p ∧ q) ⇒ ¬r
+    - Interpretation: If both p and q are true, then r is false.
+- Formula: ¬(p ∨ ¬q)
+    - Interpretation: It’s not the case that either p is true or q is false.
+
+## Truth Tables for Connectives
+
+  - Negation: T|F, F|T
+  - Conjunction: T&T|TT, F&F|FT, TT|T
+  - Disjunction: T∨T|TT, F∨F|FF, TF|TF
+  - Implication: T⇒T|TT, F⇒T|FT, TT|F
+  - Equivalence: T⇔T|TT, F⇔F|FF, TT|T
+
+#### Truth Table for P ⇒ Q:
+
+| P   | Q   | P ⇒ Q |
+| --- | --- | ----- |
+| T   | T   | T     |
+| T   | F   | F     |
+| F   | T   | T     |
+| F   | F   | T     |
+
+## Classes of Propositions
+
+  - Tautologies: Always true (e.g., p ∨ ¬p)
+  - Contradictions: Always false (e.g., p ∧ ¬p)
+  - Contingent propositions: Neither tautology nor contradiction
+
+### Logical Equivalence (≡)
+
+- Two formulae are logically equivalent if their equivalence is a tautology
+
+#### Examples
+
+- p ∧ q ≡ q ∧ p
+- ¬(p ∨ q) ≡ ¬p ∧ ¬q
+
+### Logical Implication or Entailment (|=)
+
+- Formula p entails q if and only if the implication p ⇒ q is a tautology
+
+#### Examples
+
+- p ∧ q |= q
+- ¬(p ∨ ¬q) |= ¬p ⇒ q
+
+# Ambiguous and Vague Sentences
+
+- Ambiguity: A sentence with multiple distinct meanings.
+	- Ambiguous sentence: “I want to have dinner with you or your friend.”
+	    - Interpretation 1: You can choose between having dinner with me or my friend.
+	    - Interpretation 2: I want to have dinner with you and your friend together.
+- Vagueness: A sentence with only one meaning, but the distinction between truth and falsity is unclear.
+	- Vague sentence: “The book is heavy.”
+	    - Vague because no quantitative measure of heaviness is provided.
+
+# Logic as a Formal Language
+
+ - Alphabet: Symbols for denoting propositions, identifiers, punctuation symbols ((), propositional connectives).
+ - Syntax: Rules defining the order of symbols in sentences, precedence order of connectives.
+ - Semantics: Assignment of meaning to correctly written sentences.
+
+### Examples of Logical Structures
+
+- Argument: If the train has six carriages and serves a rural community, then it is not overcrowded.
+	- Formalized as: p ∧ q ⇒ ¬r
+- Argument: If Bob eats carrots, then he will be able to see in the dark. Therefore, if Bob can’t see in the dark, then he hasn’t eaten carrots.
+	- Formalized as: p ⇒ q ≡ ¬q ⇒ ¬p
+# Summary
+
+  - Logicians focus on argument form
+  - Deduction involves justifying conclusions based solely on premises
+  - Connectives join atomic propositions to form compound propositions