diff --git a/.github/workflows/generate-readme.yml b/.github/workflows/generate-readme.yml
index f8cd3fb..88b3224 100644
--- a/.github/workflows/generate-readme.yml
+++ b/.github/workflows/generate-readme.yml
@@ -4,8 +4,8 @@ on:
branches: ['main']
paths:
- '**.user.js'
- - 'generate-readme.ps1'
- - 'ReadmeTemplate.md'
+ - 'doc/generate-readme.ps1'
+ - 'doc/ReadmeTemplate.md'
- 'doc/**'
name: Generate Readme
@@ -20,7 +20,7 @@ jobs:
- name: Generate Readme
shell: pwsh
run: |
- ./generate-readme.ps1 | Out-File -filePath README.md -Encoding UTF8
+ ./doc/generate-readme.ps1 | Out-File -filePath README.md -Encoding UTF8
git config user.email "m365-bot@ntnu.no"
git config user.name "github-actions[bot]"
diff --git a/README.md b/README.md
index 3f9a223..dd499b5 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ TamperMonkey scripts to improve sites (Fuglane, Innsida etc.)
### BAS - Modern Style Toggle
- - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/modern-bas.user.js)
+ - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main//home/ubuntu/actions-runner/_work/MonkeyMagic/MonkeyMagic/scripts/modern-bas/modern-bas.user.js)
- **Author:** Øyvind Nilsen (on@ntnu.no)
- **Match:** `https://bas.ntnu.no/*`
- **Exclude:**
@@ -41,7 +41,7 @@ TamperMonkey scripts to improve sites (Fuglane, Innsida etc.)
- **Description:** Apply modern styling to BAS/Cereweb with toggle between modern and classic
### BAS - Quick Search
- - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/bas-search.user.js)
+ - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main//home/ubuntu/actions-runner/_work/MonkeyMagic/MonkeyMagic/scripts/bas-search/bas-search.user.js)
- **Author:** Øyvind Nilsen (on@ntnu.no)
- **Match:** `https://bas.ntnu.no/*`
- **Description:** Quick search using `Ctrl` + `Shift` + `F` hotkey, group search with "g:" and person search with "p:" prefix. Navigate tabs with Ctrl + Left/Right keys. Navigate search results with up and down keys.
@@ -57,22 +57,22 @@ TamperMonkey scripts to improve sites (Fuglane, Innsida etc.)
- On the login page, the username field is automatically focused.
#### Video:
-
+
### Diri.ai - Remove blur
- - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/diri.user.js)
+ - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main//home/ubuntu/actions-runner/_work/MonkeyMagic/MonkeyMagic/scripts/diri/diri.user.js)
- **Author:** Øyvind Nilsen (on@ntnu.no)
- **Match:** `https://diri.ai/*`
- **Description:** Sets --blur-xs to 0px instead of 4px for diri.ai
### Feide - Auto-Press Microsoft Sign-In.
- - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/feide-microsoft.user.js)
+ - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main//home/ubuntu/actions-runner/_work/MonkeyMagic/MonkeyMagic/scripts/feide-microsoft/feide-microsoft.user.js)
- **Author:** Øyvind Nilsen (on@ntnu.no)
- **Match:** `https://idp.feide.no/simplesaml/module.php/*`
- **Description:** Automatically press the Microsoft sign-in button.
### Fuglane - Issue links
- - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/fuglane.user.js)
+ - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main//home/ubuntu/actions-runner/_work/MonkeyMagic/MonkeyMagic/scripts/fuglane/fuglane.user.js)
- **Author:** Øyvind Nilsen (on@ntnu.no)
- **Match:**
- `https://fuglane.it.ntnu.no/display/*`
@@ -82,63 +82,90 @@ TamperMonkey scripts to improve sites (Fuglane, Innsida etc.)
- **Description:** Replace NTNU issue numbers, change numbers and upn's with clickable links to TopDesk
### Innsida - Custom CSS
- - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/innsida-custom-css.user.js)
+ - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main//home/ubuntu/actions-runner/_work/MonkeyMagic/MonkeyMagic/scripts/innsida-custom-css/innsida-custom-css.user.js)
- **Author:** Magnus Børnes (magnborn@ntnu.no)
- **Match:** `https://innsida.ntnu.no/*`
- **Description:** Custom CSS and Text Removal for innsida.ntnu.no
### Innsida - Quick Search
- - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/innsida-search.user.js)
+ - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main//home/ubuntu/actions-runner/_work/MonkeyMagic/MonkeyMagic/scripts/innsida-search/innsida-search.user.js)
- **Author:** Øyvind Nilsen (on@ntnu.no)
- **Match:** `https://innsida.ntnu.no/*`
- **Description:** `Ctrl` + `Shift` + `F` to search on Innsida
### M365 Admin - PIM Activate Hotkey
- - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/m365-admin.user.js)
+ - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main//home/ubuntu/actions-runner/_work/MonkeyMagic/MonkeyMagic/scripts/m365-admin/m365-admin.user.js)
- **Author:** Øyvind Nilsen (on@ntnu.no)
- **Match:** `https://portal.azure.com/*`
- **Description:** `Ctrl` + `Enter` to Activate PIM role instead of having to manually click the `Activate` button.
### TopDesk - Copy Issuenumber
- - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/topdesk.user.js)
+ - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main//home/ubuntu/actions-runner/_work/MonkeyMagic/MonkeyMagic/scripts/topdesk/topdesk.user.js)
- **Author:** Øyvind Nilsen (on@ntnu.no)
- **Match:** `https://hjelp.ntnu.no/tas/secure/mango/window/*`
- **Description:** Copies the issue number if you click it in TopDesk or with the hotkey `ctrl` + `alt` + `c`. It copies plain text and a clickable HTML version. So if the place you paste supports HTML, you can paste a clickable link to the issue.
-
+
### TOPdesk - Highlight Summary
- - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/topdesk-highlight-summary.user.js)
+ - **Install:** [](https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main//home/ubuntu/actions-runner/_work/MonkeyMagic/MonkeyMagic/scripts/topdesk-highlight-summary/topdesk-highlight-summary.user.js)
- **Author:** Magnus Børnes (magnborn@ntnu.no)
- **Match:** `https://hjelp.ntnu.no/tas/secure/mango/window/*`
- **Description:** Highlight the summary section in a box with a slightly yellow-orange background
# Contribute
-## Basic Contribution
+
+## Getting Started
1. Clone the repository
```bash
git clone git@git.ntnu.no:M365-Drift/MonkeyMagic.git
cd MonkeyMagic
```
-2. Pull the latest changes. (Important since the README.md is generated)
+2. If there have been made changes in the repository after you cloned it you should pull the latest changes. (Important since the README.md is auto generated)
```bash
git pull
```
-3. Add your script to the repository
-```bash
- git add myscript.user.js
- git commit -m "Added my script"
- git push
- ```
-4. A Github Action will be automatically triggered and generate a new README.md file.
-## Advanced Contribution
+## Creating Your UserScript
+
+### Hello World Example
+Here's a simple hello world UserScript to get you started:
-### Auto Update
-To enable auto update of your UserScript, you need to add the following lines (change the filename to your filename) to the top of your script. This will make TamperMonkey check for updates every 24 hours.
```javascript
-// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/bas-search.user.js
-// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/bas-search.user.js
+// ==UserScript==
+// @name Hello World Example
+// @namespace https://git.ntnu.no/M365-Drift/MonkeyMagic/
+// @version 1.0.0
+// @description A simple hello world example
+// @author Your Name (your.email@ntnu.no)
+// @match https://example.com/*
+// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/hello-world/hello-world.user.js
+// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/hello-world/hello-world.user.js
+// @grant none
+// ==/UserScript==
+
+(function() {
+ 'use strict';
+ console.log('Hello World from MonkeyMagic!');
+ alert('Hello World!');
+})();
+```
+
+### Important Guidelines
+- **Namespace**: Always use `https://git.ntnu.no/M365-Drift/MonkeyMagic/` as your namespace
+- **Folder Structure**: Create a subfolder under `scripts/` for your script (e.g., `scripts/hello-world/`)
+- **Auto Update**: Include `@updateURL` and `@downloadURL` pointing to your script's location in the repository. This enables automatic updates every 24 hours in TamperMonkey.
+
+### Adding Your Script
+1. Create a new folder under `scripts/` with your script name
+2. Place your `.user.js` file in that folder
+3. Add any documentation or media files to the same folder
+4. Commit and push your changes:
+```bash
+ git add scripts/your-script-name/
+ git commit -m "Added your-script-name userscript"
+ git push
```
+5. A GitHub Action will automatically update the README.md file with your script information.
diff --git a/ReadmeTemplate.md b/ReadmeTemplate.md
deleted file mode 100644
index 0dc109b..0000000
--- a/ReadmeTemplate.md
+++ /dev/null
@@ -1,49 +0,0 @@
-
-

-
-
-# Monkey Magic 🐒🪄
-
-TamperMonkey scripts to improve sites (Fuglane, Innsida etc.)
-
-# How to use
-1. Install the TamperMonkey extension for your browser
-2. Enable permission to use User Scripts.
- - Open extension settings by right-clicking the Tampermonkey icon (1) and selecting **"Manage Extension"** (2).
- 
- - Locate and enable the **"Allow User Scripts"** toggle.
- 
-3. Click on the  for the script you want to install (in the list below)
-4. TamperMonkey should open and ask you to install the script
-
-# Scripts
-{content_list}
-{scriptlist}
-
-# Contribute
-## Basic Contribution
-1. Clone the repository
-```bash
-git clone git@git.ntnu.no:M365-Drift/MonkeyMagic.git
-cd MonkeyMagic
-```
-2. Pull the latest changes. (Important since the README.md is generated)
-```bash
-git pull
-```
-3. Add your script to the repository
-```bash
- git add myscript.user.js
- git commit -m "Added my script"
- git push
- ```
-4. A Github Action will be automatically triggered and generate a new README.md file.
-
-## Advanced Contribution
-
-### Auto Update
-To enable auto update of your UserScript, you need to add the following lines (change the filename to your filename) to the top of your script. This will make TamperMonkey check for updates every 24 hours.
-```javascript
-// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/bas-search.user.js
-// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/bas-search.user.js
-```
\ No newline at end of file
diff --git a/doc/ReadmeTemplate.md b/doc/ReadmeTemplate.md
new file mode 100644
index 0000000..999b436
--- /dev/null
+++ b/doc/ReadmeTemplate.md
@@ -0,0 +1,76 @@
+
+

+
+
+# Monkey Magic 🐒🪄
+
+TamperMonkey scripts to improve sites (Fuglane, Innsida etc.)
+
+# How to use
+1. Install the TamperMonkey extension for your browser
+2. Enable permission to use User Scripts.
+ - Open extension settings by right-clicking the Tampermonkey icon (1) and selecting **"Manage Extension"** (2).
+ 
+ - Locate and enable the **"Allow User Scripts"** toggle.
+ 
+3. Click on the  for the script you want to install (in the list below)
+4. TamperMonkey should open and ask you to install the script
+
+# Scripts
+{content_list}
+{scriptlist}
+
+# Contribute
+
+## Getting Started
+1. Clone the repository
+```bash
+git clone git@git.ntnu.no:M365-Drift/MonkeyMagic.git
+cd MonkeyMagic
+```
+2. If there have been made changes in the repository after you cloned it you should pull the latest changes. (Important since the README.md is auto generated)
+```bash
+git pull
+```
+
+## Creating Your UserScript
+
+### Hello World Example
+Here's a simple hello world UserScript to get you started:
+
+```javascript
+// ==UserScript==
+// @name Hello World Example
+// @namespace https://git.ntnu.no/M365-Drift/MonkeyMagic/
+// @version 1.0.0
+// @description A simple hello world example
+// @author Your Name (your.email@ntnu.no)
+// @match https://example.com/*
+// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/hello-world/hello-world.user.js
+// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/hello-world/hello-world.user.js
+// @grant none
+// ==/UserScript==
+
+(function() {
+ 'use strict';
+ console.log('Hello World from MonkeyMagic!');
+ alert('Hello World!');
+})();
+```
+
+### Important Guidelines
+- **Namespace**: Always use `https://git.ntnu.no/M365-Drift/MonkeyMagic/` as your namespace
+- **Folder Structure**: Create a subfolder under `scripts/` for your script (e.g., `scripts/hello-world/`)
+- **Auto Update**: Include `@updateURL` and `@downloadURL` pointing to your script's location in the repository. This enables automatic updates every 24 hours in TamperMonkey.
+
+### Adding Your Script
+1. Create a new folder under `scripts/` with your script name
+2. Place your `.user.js` file in that folder
+3. Add any documentation or media files to the same folder
+4. Commit and push your changes:
+```bash
+ git add scripts/your-script-name/
+ git commit -m "Added your-script-name userscript"
+ git push
+```
+5. A GitHub Action will automatically update the README.md file with your script information.
\ No newline at end of file
diff --git a/generate-readme.ps1 b/doc/generate-readme.ps1
similarity index 76%
rename from generate-readme.ps1
rename to doc/generate-readme.ps1
index 466007a..22c1f5b 100644
--- a/generate-readme.ps1
+++ b/doc/generate-readme.ps1
@@ -1,9 +1,10 @@
# Define the directory containing the user scripts
-$UserScripts = "."
+$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+$rootDir = Split-Path -Parent $scriptDir
+$UserScripts = Join-Path $rootDir "scripts"
-# Get all .user.js files in the specified directory
-#$userJsFiles = Get-ChildItem -Path $UserScripts -Filter "*.user.js" | Sort-Object Name
-$userJsFiles = Get-ChildItem -Path $UserScripts -Filter "*.user.js" | Select-Object fullname, name, @{ Name = 'NameTag'; Expression = { $name_tag = ([regex]"@name\s+(.+)").Match((Get-Content $_.fullname -Raw)).Groups[1].value; if ($name_tag -eq "") { $_.name} else { $name_tag } }} | sort NameTag
+# Get all .user.js files in the scripts subdirectories
+$userJsFiles = Get-ChildItem -Path $UserScripts -Filter "*.user.js" -Recurse | Select-Object fullname, name, @{ Name = 'NameTag'; Expression = { $name_tag = ([regex]"@name\s+(.+)").Match((Get-Content $_.fullname -Raw)).Groups[1].value; if ($name_tag -eq "") { $_.name} else { $name_tag } }} | sort NameTag
$regEx = [regex]'\/\/\s+@(\w+)\s+(.+)'
@@ -103,7 +104,9 @@ foreach ($file in $userJsFiles) {
$scriptList += "$script_heading`n`n"
$scriptList += " - **Install:** "
if ($autoUpdate) { $color = "green" } else { $color = "blue" }
- $scriptList += New-MDImage -Subject "$($file.Name)" -Status "$version" -Color $color -Link "https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/$($file.Name)"
+ # Get the relative path from the root, replacing backslashes with forward slashes for URLs
+ $relativePath = $file.FullName.Replace($rootDir + "\", "").Replace("\", "/")
+ $scriptList += New-MDImage -Subject "$($file.Name)" -Status "$version" -Color $color -Link "https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/$relativePath"
if ($author) {
$scriptList += "`n - **Author:** $author`n"
}
@@ -129,13 +132,17 @@ foreach ($file in $userJsFiles) {
$scriptList += " - **Description:** $description`n"
$baseName = $file.Name -replace '\.user\.js$', ''
+ $currentScriptDir = Split-Path $file.FullName -Parent
+ $docFile = Join-Path $currentScriptDir "$baseName.md"
- if (Test-Path "doc/$baseName.md") {
+ if (Test-Path $docFile) {
$scriptList += "`n"
- $extraDoc = Get-Content "doc/$baseName.md" -Raw
+ $extraDoc = Get-Content $docFile -Raw
- # Replace relative image links with absolute links
- $extraDoc = $extraDoc | % { $_ -replace '\!\[(.+)\]\((?!doc\/)(.+)\)', "" }
+ # Replace relative image links with absolute links from the script's subfolder
+ $relativeScriptPath = $currentScriptDir.Replace($rootDir + "\", "").Replace("\", "/")
+ # Replace relative image links (simple filenames with common image extensions)
+ $extraDoc = $extraDoc -replace '\!\[([^\]]+)\]\(([^/)]+\.(gif|png|jpg|jpeg|webp|svg))\)', ""
$scriptList += "`n"
$scriptList += $extraDoc
@@ -144,6 +151,6 @@ foreach ($file in $userJsFiles) {
}
-$template = Get-Content .\ReadmeTemplate.md
+$template = Get-Content (Join-Path $scriptDir "ReadmeTemplate.md")
$template = $template -replace '{content_list}', $content_list
$template -replace '{scriptlist}', $scriptList
\ No newline at end of file
diff --git a/doc/bas-search-lowres.gif b/scripts/bas-search/bas-search-lowres.gif
similarity index 100%
rename from doc/bas-search-lowres.gif
rename to scripts/bas-search/bas-search-lowres.gif
diff --git a/doc/bas-search.md b/scripts/bas-search/bas-search.md
similarity index 100%
rename from doc/bas-search.md
rename to scripts/bas-search/bas-search.md
diff --git a/bas-search.user.js b/scripts/bas-search/bas-search.user.js
similarity index 99%
rename from bas-search.user.js
rename to scripts/bas-search/bas-search.user.js
index 2ad16d3..7a0238d 100644
--- a/bas-search.user.js
+++ b/scripts/bas-search/bas-search.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name BAS - Quick Search
-// @namespace http://tampermonkey.net/
+// @namespace https://git.ntnu.no/M365-Drift/MonkeyMagic/
// @version 1.8.5
// @description Quick search using `Ctrl` + `Shift` + `F` hotkey, group search with "g:" and person search with "p:" prefix. Navigate tabs with Ctrl + Left/Right keys. Navigate search results with up and down keys.
// @author Øyvind Nilsen (on@ntnu.no)
@@ -8,8 +8,8 @@
// @grant none
// @run-at document-end
// @icon https://www.google.com/s2/favicons?sz=64&domain=ntnu.no
-// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/bas-search.user.js
-// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/bas-search.user.js
+// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/bas-search/bas-search.user.js
+// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/bas-search/bas-search.user.js
// ==/UserScript==
(function() {
diff --git a/diri.user.js b/scripts/diri/diri.user.js
similarity index 94%
rename from diri.user.js
rename to scripts/diri/diri.user.js
index 40d08da..2a875c4 100644
--- a/diri.user.js
+++ b/scripts/diri/diri.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name Diri.ai - Remove blur
-// @namespace https://git.ntnu.no/M365-Drift/MonkeyMagic
+// @namespace https://git.ntnu.no/M365-Drift/MonkeyMagic/
// @version 0.1.1
// @description Sets --blur-xs to 0px instead of 4px for diri.ai
// @author Øyvind Nilsen (on@ntnu.no)
@@ -8,8 +8,8 @@
// @icon https://www.google.com/s2/favicons?sz=64&domain=diri.ai
// @grant none
// @run-at document-start
-// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/diri.user.js
-// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/diri.user.js
+// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/diri/diri.user.js
+// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/diri/diri.user.js
// ==/UserScript==
(function() {
diff --git a/feide-microsoft.user.js b/scripts/feide-microsoft/feide-microsoft.user.js
similarity index 81%
rename from feide-microsoft.user.js
rename to scripts/feide-microsoft/feide-microsoft.user.js
index 4ce6257..28f03cf 100644
--- a/feide-microsoft.user.js
+++ b/scripts/feide-microsoft/feide-microsoft.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name Feide - Auto-Press Microsoft Sign-In.
-// @namespace https://git.ntnu.no/M365-Drift/MonkeyMagic
+// @namespace https://git.ntnu.no/M365-Drift/MonkeyMagic/
// @version 1.1.3
// @description Automatically press the Microsoft sign-in button.
// @author Øyvind Nilsen (on@ntnu.no)
@@ -8,8 +8,8 @@
// @icon https://www.google.com/s2/favicons?sz=64&domain=feide.no
// @grant none
// @run-at document-end
-// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/feide-microsoft.user.js
-// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/feide-microsoft.user.js
+// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/feide-microsoft/feide-microsoft.user.js
+// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/feide-microsoft/feide-microsoft.user.js
// ==/UserScript==
(function() {
diff --git a/fuglane.user.js b/scripts/fuglane/fuglane.user.js
similarity index 95%
rename from fuglane.user.js
rename to scripts/fuglane/fuglane.user.js
index 8d76caf..20495ea 100644
--- a/fuglane.user.js
+++ b/scripts/fuglane/fuglane.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name Fuglane - Issue links
-// @namespace http://tampermonkey.net/
+// @namespace https://git.ntnu.no/M365-Drift/MonkeyMagic/
// @version 1.3.6
// @description Replace NTNU issue numbers, change numbers and upn's with clickable links to TopDesk
// @author Øyvind Nilsen (on@ntnu.no)
@@ -11,8 +11,8 @@
// @grant none
// @run-at document-end
// @icon https://www.google.com/s2/favicons?sz=64&domain=ntnu.no
-// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/fuglane.user.js
-// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/fuglane.user.js
+// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/fuglane/fuglane.user.js
+// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/fuglane/fuglane.user.js
// ==/UserScript==
(function() {
diff --git a/innsida-custom-css.user.js b/scripts/innsida-custom-css/innsida-custom-css.user.js
similarity index 94%
rename from innsida-custom-css.user.js
rename to scripts/innsida-custom-css/innsida-custom-css.user.js
index 650cf21..599228a 100644
--- a/innsida-custom-css.user.js
+++ b/scripts/innsida-custom-css/innsida-custom-css.user.js
@@ -1,14 +1,14 @@
// ==UserScript==
// @name Innsida - Custom CSS
-// @namespace http://tampermonkey.net/
+// @namespace https://git.ntnu.no/M365-Drift/MonkeyMagic/
// @version 1.2
// @description Custom CSS and Text Removal for innsida.ntnu.no
// @author Magnus Børnes (magnborn@ntnu.no)
// @match https://innsida.ntnu.no/*
// @icon https://www.google.com/s2/favicons?sz=64&domain=ntnu.no
// @grant none
-// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/innsida-custom-css.user.js
-// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/innsida-custom-css.user.js
+// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/innsida-custom-css/innsida-custom-css.user.js
+// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/innsida-custom-css/innsida-custom-css.user.js
// ==/UserScript==
(function() {
diff --git a/innsida-search.user.js b/scripts/innsida-search/innsida-search.user.js
similarity index 98%
rename from innsida-search.user.js
rename to scripts/innsida-search/innsida-search.user.js
index 4fe033b..ac89e76 100644
--- a/innsida-search.user.js
+++ b/scripts/innsida-search/innsida-search.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name Innsida - Quick Search
-// @namespace http://tampermonkey.net/
+// @namespace https://git.ntnu.no/M365-Drift/MonkeyMagic/
// @version 1.2.0
// @description `Ctrl` + `Shift` + `F` to search on Innsida
// @author Øyvind Nilsen (on@ntnu.no)
@@ -8,8 +8,8 @@
// @grant none
// @run-at document-end
// @icon https://www.google.com/s2/favicons?sz=64&domain=ntnu.no
-// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/innsida-search.user.js
-// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/innsida-search.user.js
+// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/innsida-search/innsida-search.user.js
+// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/innsida-search/innsida-search.user.js
// ==/UserScript==
(function() {
diff --git a/m365-admin.user.js b/scripts/m365-admin/m365-admin.user.js
similarity index 86%
rename from m365-admin.user.js
rename to scripts/m365-admin/m365-admin.user.js
index 276aca3..49cc73f 100644
--- a/m365-admin.user.js
+++ b/scripts/m365-admin/m365-admin.user.js
@@ -1,14 +1,14 @@
// ==UserScript==
// @name M365 Admin - PIM Activate Hotkey
-// @namespace https://git.ntnu.no/M365-Drift/MonkeyMagic
+// @namespace https://git.ntnu.no/M365-Drift/MonkeyMagic/
// @version 1.0.0
// @description `Ctrl` + `Enter` to Activate PIM role instead of having to manually click the `Activate` button.
// @author Øyvind Nilsen (on@ntnu.no)
// @match https://portal.azure.com/*
// @icon https://www.google.com/s2/favicons?sz=64&domain=microsoft.com
// @grant none
-// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/m365-admin.user.js
-// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/m365-admin.user.js
+// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/m365-admin/m365-admin.user.js
+// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/m365-admin/m365-admin.user.js
// ==/UserScript==
(function() {
diff --git a/modern-bas-login.css b/scripts/modern-bas/modern-bas-login.css
similarity index 100%
rename from modern-bas-login.css
rename to scripts/modern-bas/modern-bas-login.css
diff --git a/modern-bas.css b/scripts/modern-bas/modern-bas.css
similarity index 100%
rename from modern-bas.css
rename to scripts/modern-bas/modern-bas.css
diff --git a/modern-bas.user.js b/scripts/modern-bas/modern-bas.user.js
similarity index 95%
rename from modern-bas.user.js
rename to scripts/modern-bas/modern-bas.user.js
index 8b51ff9..b1a9a86 100644
--- a/modern-bas.user.js
+++ b/scripts/modern-bas/modern-bas.user.js
@@ -1,20 +1,20 @@
// ==UserScript==
// @name BAS - Modern Style Toggle
-// @namespace https://git.ntnu.no/M365-Drift/MonkeyMagic
+// @namespace https://git.ntnu.no/M365-Drift/MonkeyMagic/
// @version 1.0.13
// @description Apply modern styling to BAS/Cereweb with toggle between modern and classic
// @author Øyvind Nilsen (on@ntnu.no)
// @match https://bas.ntnu.no/*
// @exclude https://bas.ntnu.no/groupadmin/*
// @exclude https://bas.ntnu.no/userclient/*
-// @resource modernCSS https://raw.git.ntnu.no/M365-Drift/MonkeyMagic/main/modern-bas.css
-// @resource modernLoginCSS https://raw.git.ntnu.no/M365-Drift/MonkeyMagic/main/modern-bas-login.css
+// @resource modernCSS https://raw.git.ntnu.no/M365-Drift/MonkeyMagic/main/scripts/modern-bas/modern-bas.css
+// @resource modernLoginCSS https://raw.git.ntnu.no/M365-Drift/MonkeyMagic/main/scripts/modern-bas/modern-bas-login.css
// @grant GM_addStyle
// @grant GM_getResourceText
// @grant GM_setValue
// @grant GM_getValue
-// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/modern-bas.user.js
-// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/modern-bas.user.js
+// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/modern-bas/modern-bas.user.js
+// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/modern-bas/modern-bas.user.js
// ==/UserScript==
(function() {
diff --git a/topdesk-highlight-summary.user.js b/scripts/topdesk-highlight-summary/topdesk-highlight-summary.user.js
similarity index 94%
rename from topdesk-highlight-summary.user.js
rename to scripts/topdesk-highlight-summary/topdesk-highlight-summary.user.js
index cbd5ef3..feb0d9c 100644
--- a/topdesk-highlight-summary.user.js
+++ b/scripts/topdesk-highlight-summary/topdesk-highlight-summary.user.js
@@ -1,14 +1,14 @@
// ==UserScript==
// @name TOPdesk - Highlight Summary
-// @namespace http://tampermonkey.net/
+// @namespace https://git.ntnu.no/M365-Drift/MonkeyMagic/
// @version 1.6
// @description Highlight the summary section in a box with a slightly yellow-orange background
// @author Magnus Børnes (magnborn@ntnu.no)
// @match https://hjelp.ntnu.no/tas/secure/mango/window/*
// @icon https://www.google.com/s2/favicons?sz=64&domain=topdesk.com
// @grant none
-// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/topdesk-highlight-summary.user.js
-// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/topdesk-highlight-summary.user.js
+// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/topdesk-highlight-summary/topdesk-highlight-summary.user.js
+// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/topdesk-highlight-summary/topdesk-highlight-summary.user.js
// ==/UserScript==
(function() {
diff --git a/doc/topdesk.gif b/scripts/topdesk/topdesk.gif
similarity index 100%
rename from doc/topdesk.gif
rename to scripts/topdesk/topdesk.gif
diff --git a/doc/topdesk.md b/scripts/topdesk/topdesk.md
similarity index 100%
rename from doc/topdesk.md
rename to scripts/topdesk/topdesk.md
diff --git a/topdesk.user.js b/scripts/topdesk/topdesk.user.js
similarity index 98%
rename from topdesk.user.js
rename to scripts/topdesk/topdesk.user.js
index 00228f9..6778513 100644
--- a/topdesk.user.js
+++ b/scripts/topdesk/topdesk.user.js
@@ -8,8 +8,8 @@
// @grant none
// @run-at document-end
// @icon https://www.google.com/s2/favicons?sz=64&domain=topdesk.com
-// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/topdesk.user.js
-// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/topdesk.user.js
+// @updateURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/topdesk/topdesk.user.js
+// @downloadURL https://git.ntnu.no/M365-Drift/MonkeyMagic/raw/main/scripts/topdesk/topdesk.user.js
// ==/UserScript==
(function() {