diff --git a/.config/ags/assets/themes/sourceviewtheme-light.xml b/.config/ags/assets/themes/sourceviewtheme-light.xml
index bf39bfb58..c880404dc 100644
--- a/.config/ags/assets/themes/sourceviewtheme-light.xml
+++ b/.config/ags/assets/themes/sourceviewtheme-light.xml
@@ -3,13 +3,13 @@
   <author>end_4</author>
   <_description>Catppuccin port but very random</_description>
 
-  <style name="bracket-match"  background="#E3E6EB" bold="true"/>
+  <style name="bracket-match"  background="#FDC2A6" foreground="#653D28" bold="true"/>
   <style name="bracket-mismatch"  background="#E3E6EB" underline="true"/>
   <style name="c:preprocessor" foreground="#DF8E1D"/>
   <style name="css:at-rules" foreground="#8839EF"/>
   <style name="css:color" foreground="#DF8E1D"/>
   <style name="css:keyword" foreground="#256BF5"/>
-  <style name="current-line"  background="#E3E6EB"/>
+  <style name="current-line"  background="#F9DCD8"/>
   <style name="cursor" foreground="#DC8A78"/>
   <style name="def:base-n-integer" foreground="#DF8E1D"/>
   <style name="def:boolean" foreground="#DF8E1D"/>
diff --git a/.config/ags/assets/themes/sourceviewtheme.xml b/.config/ags/assets/themes/sourceviewtheme.xml
index 248d7afac..ef76a7414 100644
--- a/.config/ags/assets/themes/sourceviewtheme.xml
+++ b/.config/ags/assets/themes/sourceviewtheme.xml
@@ -27,13 +27,13 @@
   <author>Leo Iannacone</author>
   <_description>Based on SublimeText Monokai Extended - Generated with tm2gtksw2</_description>
 
-  <style name="bracket-match"  background="#333333" bold="true"/>
+  <style name="bracket-match"  background="#FDC2A6" foreground="#653D28" bold="true"/>
   <style name="bracket-mismatch"  background="#333333" underline="true"/>
   <style name="c:preprocessor" foreground="#be84ff"/>
   <style name="css:at-rules" foreground="#f92672"/>
   <style name="css:color" foreground="#be84ff"/>
   <style name="css:keyword" foreground="#66d9ef"/>
-  <style name="current-line"  background="#333333"/>
+  <style name="current-line"  background="#F9DCD8"/>
   <style name="cursor" foreground="#f8f8f0"/>
   <style name="def:base-n-integer" foreground="#be84ff"/>
   <style name="def:boolean" foreground="#be84ff"/>
diff --git a/.config/ags/modules/.miscutils/md2pango.js b/.config/ags/modules/.miscutils/md2pango.js
index f688fc003..19999bd3a 100644
--- a/.config/ags/modules/.miscutils/md2pango.js
+++ b/.config/ags/modules/.miscutils/md2pango.js
@@ -68,8 +68,10 @@ export const markdownTest = `## Inline formatting
 ## Code block
 \`\`\`cpp
 #include <bits/stdc++.h>
-const std::string GREETING="UwU";
-int main() { std::cout << GREETING; }
+const std::string GREETING = "UwU";
+int main(int argc, char* argv[]) {
+    std::cout << GREETING; 
+}
 \`\`\`
 ## LaTeX
 \`\`\`latex
diff --git a/.config/ags/scripts/color_generation/applycolor.sh b/.config/ags/scripts/color_generation/applycolor.sh
index 6c371f40c..9bf56d392 100755
--- a/.config/ags/scripts/color_generation/applycolor.sh
+++ b/.config/ags/scripts/color_generation/applycolor.sh
@@ -48,7 +48,7 @@ get_light_dark() {
 }
 
 apply_fuzzel() {
-  # Check if scripts/templates/fuzzel/fuzzel.ini exists
+  # Check if template exists
   if [ ! -f "scripts/templates/fuzzel/fuzzel.ini" ]; then
     echo "Template file not found for Fuzzel. Skipping that."
     return
@@ -88,7 +88,7 @@ apply_term() {
 }
 
 apply_hyprland() {
-  # Check if scripts/templates/hypr/hyprland/colors.conf exists
+  # Check if template exists
   if [ ! -f "scripts/templates/hypr/hyprland/colors.conf" ]; then
     echo "Template file not found for Hyprland colors. Skipping that."
     return
@@ -105,7 +105,7 @@ apply_hyprland() {
 }
 
 apply_hyprlock() {
-  # Check if scripts/templates/hypr/hyprlock.conf exists
+  # Check if template exists
   if [ ! -f "scripts/templates/hypr/hyprlock.conf" ]; then
     echo "Template file not found for hyprlock. Skipping that."
     return
@@ -122,6 +122,26 @@ apply_hyprlock() {
   cp "$CACHE_DIR"/user/generated/hypr/hyprlock.conf "$XDG_CONFIG_HOME"/hypr/hyprlock.conf
 }
 
+apply_ags_sourceview() {
+  # Check if template file exists
+  if [ ! -f "scripts/templates/ags/sourceviewtheme.xml" ]; then
+    echo "Template file not found for ags sourceview. Skipping that."
+    return
+  fi
+  # Copy template
+  mkdir -p "$CACHE_DIR"/user/generated/ags
+  cp "scripts/templates/ags/sourceviewtheme.xml" "$CACHE_DIR"/user/generated/ags/sourceviewtheme.xml
+  cp "scripts/templates/ags/sourceviewtheme-light.xml" "$CACHE_DIR"/user/generated/ags/sourceviewtheme-light.xml
+  # Apply colors
+  for i in "${!colorlist[@]}"; do
+    sed -i "s/{{ ${colorlist[$i]} }}/#${colorvalues[$i]#\#}/g" "$CACHE_DIR"/user/generated/ags/sourceviewtheme.xml
+    sed -i "s/{{ ${colorlist[$i]} }}/#${colorvalues[$i]#\#}/g" "$CACHE_DIR"/user/generated/ags/sourceviewtheme-light.xml
+  done
+
+  cp "$CACHE_DIR"/user/generated/ags/sourceviewtheme.xml "$XDG_CONFIG_HOME"/ags/assets/themes/sourceviewtheme.xml
+  cp "$CACHE_DIR"/user/generated/ags/sourceviewtheme-light.xml "$XDG_CONFIG_HOME"/ags/assets/themes/sourceviewtheme-light.xml
+}
+
 apply_lightdark() {
   lightdark=$(get_light_dark)
   if [ "$lightdark" = "light" ]; then
@@ -180,6 +200,7 @@ colorlist=($colornames)     # Array of color names
 colorvalues=($colorstrings) # Array of color values
 
 apply_ags &
+apply_ags_sourceview &
 apply_hyprland &
 apply_hyprlock &
 apply_lightdark &
diff --git a/.config/ags/scripts/templates/ags/sourceviewtheme-light.xml b/.config/ags/scripts/templates/ags/sourceviewtheme-light.xml
new file mode 100644
index 000000000..eca04bf3b
--- /dev/null
+++ b/.config/ags/scripts/templates/ags/sourceviewtheme-light.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<style-scheme id="custom-light" _name="Custom" version="1.0">
+  <author>end_4</author>
+  <_description>Catppuccin port but very random</_description>
+
+  <style name="bracket-match"  background="{{ $secondaryContainer }}" foreground="{{ $onSecondaryContainer }}" bold="true"/>
+  <style name="bracket-mismatch"  background="#E3E6EB" underline="true"/>
+  <style name="c:preprocessor" foreground="#DF8E1D"/>
+  <style name="css:at-rules" foreground="#8839EF"/>
+  <style name="css:color" foreground="#DF8E1D"/>
+  <style name="css:keyword" foreground="#256BF5"/>
+  <style name="current-line"  background="{{ $surfaceContainerHighest }}"/>
+  <style name="cursor" foreground="#DC8A78"/>
+  <style name="def:base-n-integer" foreground="#DF8E1D"/>
+  <style name="def:boolean" foreground="#DF8E1D"/>
+  <style name="def:builtin" foreground="#DF8E1D"/>
+  <style name="def:character" foreground="#DF8E1D"/>
+  <style name="def:comment" foreground="#9DA1B1"/>
+  <style name="def:complex" foreground="#DF8E1D"/>
+  <style name="def:decimal" foreground="#DF8E1D"/>
+  <style name="def:doc-comment" foreground="#9DA1B1"/>
+  <style name="def:doc-comment-element" foreground="#9DA1B1"/>
+  <style name="def:error" foreground="#D53055" background="#EAEDF2"/>
+  <style name="def:floating-point" foreground="#DF8E1D"/>
+  <style name="def:function" foreground="#256BF5"/>
+  <style name="def:identifier" foreground="#000000"/>
+  <style name="def:keyword" foreground="#8839EF"/>
+  <style name="def:note" foreground="#9DA1B1"/>
+  <style name="def:number" foreground="#FE640B"/>
+  <style name="def:operator" foreground="#8839EF"/>
+  <style name="def:preprocessor" foreground="#256BF5"/>
+  <style name="def:reserved" foreground="#8839EF"/>
+  <style name="def:shebang" foreground="#9DA1B1"/>
+  <style name="def:special-char" foreground="#256BF5"/>
+  <style name="def:special-constant" foreground="#DF8E1D"/>
+  <style name="def:statement" foreground="#8839EF"/>
+  <style name="def:string" foreground="#4AA537"/>
+  <style name="def:type" foreground="#256BF5" italic="true"/>
+  <style name="diff:added-line" foreground="#282D32" background="#ACF2BD"/>
+  <style name="diff:changed-line" foreground="#282D32" background="#F1F2C3"/>
+  <style name="diff:location" foreground="#9DA1B1"/>
+  <style name="diff:removed-line" foreground="#282D32" background="#FFEEF0"/>
+  <style name="draw-spaces" foreground="#3b3a32"/>
+  <style name="html:dtd" foreground="#4AA537"/>
+  <style name="html:tag" foreground="#8839EF"/>
+  <style name="js:function" foreground="#256BF5"/>
+  <style name="line-numbers" foreground="#9699AA" background="#EAEDF2"/>
+  <style name="perl:builtin" foreground="#256BF5"/>
+  <style name="perl:include-statement" foreground="#8839EF"/>
+  <style name="perl:special-variable" foreground="#DF8E1D"/>
+  <style name="perl:variable" foreground="#000000"/>
+  <style name="php:string" foreground="#4AA537"/>
+  <style name="python:builtin-constant" foreground="#8839EF"/>
+  <style name="python:builtin-function" foreground="#256BF5"/>
+  <style name="python:module-handler" foreground="#8839EF"/>
+  <style name="python:special-variable" foreground="#8839EF"/>
+  <style name="ruby:attribute-definition" foreground="#8839EF"/>
+  <style name="ruby:builtin" foreground="#000000"/>
+  <style name="ruby:class-variable" foreground="#000000"/>
+  <style name="ruby:constant" foreground="#000000"/>
+  <style name="ruby:global-variable" foreground="#256BF5"/>
+  <style name="ruby:instance-variable" foreground="#000000"/>
+  <style name="ruby:module-handler" foreground="#8839EF"/>
+  <style name="ruby:predefined-variable" foreground="#DF8E1D"/>
+  <style name="ruby:regex" foreground="#f6aa11"/>
+  <style name="ruby:special-variable" foreground="#8839EF"/>
+  <style name="ruby:symbol" foreground="#DF8E1D"/>
+  <style name="rubyonrails:attribute-definition" foreground="#8839EF"/>
+  <style name="rubyonrails:block-parameter" foreground="#fd971f" italic="true"/>
+  <style name="rubyonrails:builtin" foreground="#000000"/>
+  <style name="rubyonrails:class-inherit" foreground="#256BF5" underline="true" italic="true"/>
+  <style name="rubyonrails:class-name" foreground="#256BF5"/>
+  <style name="rubyonrails:class-variable" foreground="#000000"/>
+  <style name="rubyonrails:complex-interpolation" foreground="#DF8E1D"/>
+  <style name="rubyonrails:constant" foreground="#000000"/>
+  <style name="rubyonrails:global-variable" foreground="#256BF5"/>
+  <style name="rubyonrails:instance-variable" foreground="#000000"/>
+  <style name="rubyonrails:module-handler" foreground="#8839EF"/>
+  <style name="rubyonrails:module-name" foreground="#256BF5"/>
+  <style name="rubyonrails:predefined-variable" foreground="#DF8E1D"/>
+  <style name="rubyonrails:rails" foreground="#000000"/>
+  <style name="rubyonrails:regex" foreground="#f6aa11"/>
+  <style name="rubyonrails:simple-interpolation" foreground="#DF8E1D"/>
+  <style name="rubyonrails:special-variable" foreground="#8839EF"/>
+  <style name="rubyonrails:symbol" foreground="#DF8E1D"/>
+  <style name="search-match"  background="#E3E6EB" bold="true" underline="true"/>
+  <style name="selection" foreground="#f8f8f2" background="#444444"/>
+  <style name="text" foreground="#f8f8f2" background="#222222"/>
+  <style name="xml:attribute-name" foreground="#256BF5"/>
+  <style name="xml:element-name" foreground="#8839EF"/>
+  <style name="xml:entity" foreground="#c8cecc"/>
+  <style name="xml:namespace" foreground="#8839EF"/>
+  <style name="xml:tag" foreground="#8839EF"/>
+
+</style-scheme>
diff --git a/.config/ags/scripts/templates/ags/sourceviewtheme.xml b/.config/ags/scripts/templates/ags/sourceviewtheme.xml
new file mode 100644
index 000000000..e2e5fe9a4
--- /dev/null
+++ b/.config/ags/scripts/templates/ags/sourceviewtheme.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2014 Leo Iannacone <info@leoiannacone.com>
+
+ This file was generated from a textmate theme named Monokai Extended
+ with tm2gtksw2 tool. (Alexandre da Silva)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+-->
+
+<!-- MODIFIED -->
+
+<style-scheme id="custom" _name="Custom" version="1.0">
+  <author>Leo Iannacone</author>
+  <_description>Based on SublimeText Monokai Extended - Generated with tm2gtksw2</_description>
+
+  <style name="bracket-match"  background="{{ $secondaryContainer }}" foreground="{{ $onSecondaryContainer }}" bold="true"/>
+  <style name="bracket-mismatch"  background="#333333" underline="true"/>
+  <style name="c:preprocessor" foreground="#be84ff"/>
+  <style name="css:at-rules" foreground="#f92672"/>
+  <style name="css:color" foreground="#be84ff"/>
+  <style name="css:keyword" foreground="#66d9ef"/>
+  <style name="current-line"  background="{{ $surfaceContainerHighest }}"/>
+  <style name="cursor" foreground="#f8f8f0"/>
+  <style name="def:base-n-integer" foreground="#be84ff"/>
+  <style name="def:boolean" foreground="#be84ff"/>
+  <style name="def:builtin" foreground="#be84ff"/>
+  <style name="def:character" foreground="#be84ff"/>
+  <style name="def:comment" foreground="#75715e"/>
+  <style name="def:complex" foreground="#be84ff"/>
+  <style name="def:decimal" foreground="#be84ff"/>
+  <style name="def:doc-comment" foreground="#75715e"/>
+  <style name="def:doc-comment-element" foreground="#75715e"/>
+  <style name="def:error" foreground="#f8f8f0" background="#f92672"/>
+  <style name="def:floating-point" foreground="#be84ff"/>
+  <style name="def:function" foreground="#a6e22e"/>
+  <style name="def:identifier" foreground="#ffffff"/>
+  <style name="def:keyword" foreground="#f92672"/>
+  <style name="def:note" foreground="#75715e"/>
+  <style name="def:number" foreground="#be84ff"/>
+  <style name="def:operator" foreground="#f92672"/>
+  <style name="def:preprocessor" foreground="#66d9ef"/>
+  <style name="def:reserved" foreground="#f92672"/>
+  <style name="def:shebang" foreground="#75715e"/>
+  <style name="def:special-char" foreground="#66d9ef"/>
+  <style name="def:special-constant" foreground="#be84ff"/>
+  <style name="def:statement" foreground="#f92672"/>
+  <style name="def:string" foreground="#e6db74"/>
+  <style name="def:type" foreground="#66d9ef" italic="true"/>
+  <style name="diff:added-line" foreground="#a6e22e"/>
+  <style name="diff:changed-line" foreground="#e6db74"/>
+  <style name="diff:location" foreground="#75715e"/>
+  <style name="diff:removed-line" foreground="#f92672"/>
+  <style name="draw-spaces" foreground="#3b3a32"/>
+  <style name="html:dtd" foreground="#e6db74"/>
+  <style name="html:tag" foreground="#f92672"/>
+  <style name="js:function" foreground="#66d9ef"/>
+  <style name="line-numbers" foreground="#bebeba" background="#333333"/>
+  <style name="perl:builtin" foreground="#a6e22e"/>
+  <style name="perl:include-statement" foreground="#f92672"/>
+  <style name="perl:special-variable" foreground="#be84ff"/>
+  <style name="perl:variable" foreground="#ffffff"/>
+  <style name="php:string" foreground="#e6db74"/>
+  <style name="python:builtin-constant" foreground="#f92672"/>
+  <style name="python:builtin-function" foreground="#a6e22e"/>
+  <style name="python:module-handler" foreground="#f92672"/>
+  <style name="python:special-variable" foreground="#f92672"/>
+  <style name="ruby:attribute-definition" foreground="#f92672"/>
+  <style name="ruby:builtin" foreground="#ffffff"/>
+  <style name="ruby:class-variable" foreground="#ffffff"/>
+  <style name="ruby:constant" foreground="#ffffff"/>
+  <style name="ruby:global-variable" foreground="#a6e22e"/>
+  <style name="ruby:instance-variable" foreground="#ffffff"/>
+  <style name="ruby:module-handler" foreground="#f92672"/>
+  <style name="ruby:predefined-variable" foreground="#be84ff"/>
+  <style name="ruby:regex" foreground="#f6aa11"/>
+  <style name="ruby:special-variable" foreground="#f92672"/>
+  <style name="ruby:symbol" foreground="#be84ff"/>
+  <style name="rubyonrails:attribute-definition" foreground="#f92672"/>
+  <style name="rubyonrails:block-parameter" foreground="#fd971f" italic="true"/>
+  <style name="rubyonrails:builtin" foreground="#ffffff"/>
+  <style name="rubyonrails:class-inherit" foreground="#a6e22e" underline="true" italic="true"/>
+  <style name="rubyonrails:class-name" foreground="#66d9ef"/>
+  <style name="rubyonrails:class-variable" foreground="#ffffff"/>
+  <style name="rubyonrails:complex-interpolation" foreground="#be84ff"/>
+  <style name="rubyonrails:constant" foreground="#ffffff"/>
+  <style name="rubyonrails:global-variable" foreground="#a6e22e"/>
+  <style name="rubyonrails:instance-variable" foreground="#ffffff"/>
+  <style name="rubyonrails:module-handler" foreground="#f92672"/>
+  <style name="rubyonrails:module-name" foreground="#66d9ef"/>
+  <style name="rubyonrails:predefined-variable" foreground="#be84ff"/>
+  <style name="rubyonrails:rails" foreground="#ffffff"/>
+  <style name="rubyonrails:regex" foreground="#f6aa11"/>
+  <style name="rubyonrails:simple-interpolation" foreground="#be84ff"/>
+  <style name="rubyonrails:special-variable" foreground="#f92672"/>
+  <style name="rubyonrails:symbol" foreground="#be84ff"/>
+  <style name="search-match"  background="#333333" bold="true" underline="true"/>
+  <style name="selection" foreground="#f8f8f2" background="#444444"/>
+  <style name="text" foreground="#f8f8f2" background="#222222"/>
+  <style name="xml:attribute-name" foreground="#a6e22e"/>
+  <style name="xml:element-name" foreground="#f92672"/>
+  <style name="xml:entity" foreground="#c8cecc"/>
+  <style name="xml:namespace" foreground="#f92672"/>
+  <style name="xml:tag" foreground="#f92672"/>
+
+
+</style-scheme>
+