diff --git a/roles/linroom/tasks/GNS3.yml b/roles/linroom/tasks/GNS3.yml
index 221d86a..f78a551 100644
--- a/roles/linroom/tasks/GNS3.yml
+++ b/roles/linroom/tasks/GNS3.yml
@@ -1,15 +1,15 @@
 # TODO popravi url
 - name: Add GNS3 repository
-  block:
-    - name: GNS repo - apt key
-      ansible.builtin.get_url:
-        url: https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc
-        dest: /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc
-    - name: GNS repo - url
-      ansible.builtin.apt_repository:
-      repo: "deb https://cloud.r-project.org/bin/linux/ubuntu {{ansible_distribution_release}}-cran40/"
-      state: present
-- name: Install R
+  apt_repository:
+    repo: ppa:gns3/ppa
+    state: present
+    update_cache: True
+    validate_certs: False
+- name: Install gns3 server
   ansible.builtin.apt:
-    name: r-base
+    name: gns3-server
+    state: latest
+- name: Install gns3 GUI
+  ansible.builtin.apt:
+    name: gns3-gui
     state: latest
diff --git a/roles/linroom/tasks/GO-63715.yml b/roles/linroom/tasks/GO-63715.yml
index 6b608f4..926fc4a 100644
--- a/roles/linroom/tasks/GO-63715.yml
+++ b/roles/linroom/tasks/GO-63715.yml
@@ -2,8 +2,8 @@
 # Blaz.Meden@fri.uni-lj.si, ilb@fri.uni-lj.si
 # Blender, Adobe paket (Illustrator, Photoshop, After Effects, Premiere), Processing (orodje za vizualno in interaktivno grafično programiranje), Inkscape (zastonjsko orodje za vektorsko risanje), GIMP (program za urejanje slik in rastrsko risanje)
 #
-- include_tasks: blender
-- include_tasks: adobe_cs
-- include_tasks: inkscape
-- include_tasks: gimp
+- include_tasks: blender.yml
+- include_tasks: adobe_cs.yml
+- include_tasks: inkscape.yml
+- include_tasks: gimp.yml
 
diff --git a/roles/linroom/tasks/GUI_development.yml b/roles/linroom/tasks/GUI_development.yml
new file mode 100644
index 0000000..ab38cc8
--- /dev/null
+++ b/roles/linroom/tasks/GUI_development.yml
@@ -0,0 +1 @@
+# TODO install X11 development, Wayland development, gtk+ development, glade, python
diff --git a/roles/linroom/tasks/IS-63714.yml b/roles/linroom/tasks/IS-63714.yml
index b4f36eb..2b00db5 100644
--- a/roles/linroom/tasks/IS-63714.yml
+++ b/roles/linroom/tasks/IS-63714.yml
@@ -3,7 +3,7 @@
 # Windows, GNU/Linux, Docker, VS Code, dotnet6 SDK, GIT, Android Studio
 
 - include_tasks: docker.yml
-- include_tasks: vscode.yml
+- include_tasks: VSCode.yml
 - include_tasks: dotnet6.yml
 - include_tasks: git.yml
 - include_tasks: Android_Studio.yml
diff --git a/roles/linroom/tasks/KRV-63528.yml b/roles/linroom/tasks/KRV-63528.yml
index 3ee6556..3d5690e 100644
--- a/roles/linroom/tasks/KRV-63528.yml
+++ b/roles/linroom/tasks/KRV-63528.yml
@@ -2,4 +2,6 @@
 # Klemen.Klanjscek@fri.uni-lj.si, Janos.Vidali@fri.uni-lj.si
 # GNU/Linux, SageMath, Python 3, Jupyter Notebook, OpenSSL, OpenSSH client
 
-
+- include_tasks: sagemath.yml
+- include_tasks: jupyter.yml
+- include_tasks: openssl.yml
diff --git a/roles/linroom/tasks/MRO-63257.yml b/roles/linroom/tasks/MRO-63257.yml
index e4b5eaa..617f9e2 100644
--- a/roles/linroom/tasks/MRO-63257.yml
+++ b/roles/linroom/tasks/MRO-63257.yml
@@ -1,3 +1,4 @@
 # Modeliranje računalniških omrežij
 # Miha.Janez@fri.uni-lj.si
 # OMNeT++, INET Framework
+- include_tasks: omnetpp.yml
diff --git a/roles/linroom/tasks/MV-63288.yml b/roles/linroom/tasks/MV-63288.yml
index 34e80e2..288fc10 100644
--- a/roles/linroom/tasks/MV-63288.yml
+++ b/roles/linroom/tasks/MV-63288.yml
@@ -1,3 +1,9 @@
 # Multimedijske vsebine
 # Blaz.Meden@fri.uni-lj.si
 # Blender, Adobe paket (Illustrator, Photoshop, After Effects, Premiere), Processing (orodje za vizualno in interaktivno grafično programiranje), Inkscape (zastonjsko orodje za vektorsko risanje), GIMP (program za urejanje slik in rastrsko risanje)
+
+- include_tasks: blender.yml
+- include_tasks: adobe_cs.yml
+- include_tasks: processing.yml
+- include_tasks: inkscape.yml
+- include_tasks: gimp.yml
diff --git a/roles/linroom/tasks/NDN-63729.yml b/roles/linroom/tasks/NDN-63729.yml
index 809aef5..c4c5ed3 100644
--- a/roles/linroom/tasks/NDN-63729.yml
+++ b/roles/linroom/tasks/NDN-63729.yml
@@ -4,3 +4,4 @@
 # Načrtovanje digitalnih naprav
 # Miha.Moskon@fri.uni-lj.si
 # Windows, Vivado 2022.1
+- include_tasks: vivado.yml
diff --git a/roles/linroom/tasks/NM-63522.yml b/roles/linroom/tasks/NM-63522.yml
index 7b4c125..b067e25 100644
--- a/roles/linroom/tasks/NM-63522.yml
+++ b/roles/linroom/tasks/NM-63522.yml
@@ -1,3 +1,5 @@
 # Numerična matematika
 # Martin.Vuk@fri.uni-lj.si
 # VS Code, Julia
+- include_tasks: VSCode.yml
+- include_tasks: julia.yml
diff --git a/roles/linroom/tasks/NPMP-63512.yml b/roles/linroom/tasks/NPMP-63512.yml
index 654507b..caa3040 100644
--- a/roles/linroom/tasks/NPMP-63512.yml
+++ b/roles/linroom/tasks/NPMP-63512.yml
@@ -1,3 +1,5 @@
 # Nekonvencionalne platforme in metode procesiranja
 # Miha.Janez@fri.uni-lj.si, Miha.Moskon@fri.uni-lj.si
 # QCADesigner-E
+
+- include_tasks: qcadesigner-e.yml
diff --git a/roles/linroom/tasks/NRG-63553.yml b/roles/linroom/tasks/NRG-63553.yml
index 4c774e0..2533fca 100644
--- a/roles/linroom/tasks/NRG-63553.yml
+++ b/roles/linroom/tasks/NRG-63553.yml
@@ -1,3 +1,5 @@
 # Napredna računalniška grafika
 # Ziga.Lesar@fri.uni-lj.si
 # Windows, Build Tools for Visual Studio 2022
+
+- include_tasks: visual_studio.yml
diff --git a/roles/linroom/tasks/NetBeans.yml b/roles/linroom/tasks/NetBeans.yml
new file mode 100644
index 0000000..2b874a8
--- /dev/null
+++ b/roles/linroom/tasks/NetBeans.yml
@@ -0,0 +1 @@
+# TODO install NetBeans
diff --git a/roles/linroom/tasks/OBSS-63514.yml b/roles/linroom/tasks/OBSS-63514.yml
index 7d946c7..daaa24c 100644
--- a/roles/linroom/tasks/OBSS-63514.yml
+++ b/roles/linroom/tasks/OBSS-63514.yml
@@ -1,3 +1,5 @@
 # Obdelava biomedicinskih signalov in slik
 # Ziga.Pirnar@fri.uni-lj.si
 # GNU/Linux, Matlab, wfdb
+- include_tasks: matlab.yml
+- include_tasks: wfdb.yml
diff --git a/roles/linroom/tasks/ODV-63204.yml b/roles/linroom/tasks/ODV-63204.yml
index 3ae428e..401665b 100644
--- a/roles/linroom/tasks/ODV-63204.yml
+++ b/roles/linroom/tasks/ODV-63204.yml
@@ -1,3 +1,4 @@
 # Osnove digitalnih vezij
 # Ziga.Pusnik@fri.uni-lj.si, Miran.Koprivec@fri.uni-lj.si
 # Windows, Logisim, Logisim Evolution
+- include_tasks: logisim.yml
diff --git a/roles/linroom/tasks/OO-63271.yml b/roles/linroom/tasks/OO-63271.yml
index 78a0741..50cdbdb 100644
--- a/roles/linroom/tasks/OO-63271.yml
+++ b/roles/linroom/tasks/OO-63271.yml
@@ -1,3 +1,8 @@
 # Osnove oblikovanja
 # Blaz.Meden@fri.uni-lj.si, Narvika.Bovcon@fri.uni-lj.si
 # Blender, Adobe paket (Illustrator, Photoshop, After Effects, Premiere), Processing (orodje za vizualno in interaktivno grafično programiranje), Inkscape (zastonjsko orodje za vektorsko risanje), GIMP (program za urejanje slik in rastrsko risanje)
+- include_tasks: blender.yml
+- include_tasks: adobe_cs.yml
+- include_tasks: inkscape.yml
+- include_tasks: gimp.yml
+
diff --git a/roles/linroom/tasks/OR-63717.yml b/roles/linroom/tasks/OR-63717.yml
index e07e76f..7bac823 100644
--- a/roles/linroom/tasks/OR-63717.yml
+++ b/roles/linroom/tasks/OR-63717.yml
@@ -1,3 +1,9 @@
 # Organizacija računalnikov
 # Robert.Rozman@fri.uni-lj.si
 # Windows, Logisim, Logisim Evolution, RAVINOR, CubeIDE + QEMU Embedded plugin
+- include_tasks: logisim.yml
+- include_tasks: stm32cube.yml
+- include_tasks: ninja.yml
+- include_tasks: cmake.yml
+- include_tasks: gcc-arm.yml
+# TODO: RAVINOR, CubeIDE
diff --git a/roles/linroom/tasks/OS-63709.yml b/roles/linroom/tasks/OS-63709.yml
index 1670fed..f4351d7 100644
--- a/roles/linroom/tasks/OS-63709.yml
+++ b/roles/linroom/tasks/OS-63709.yml
@@ -1,3 +1,4 @@
 # Operacijski sistemi
 # Borut.Batagelj@fri.uni-lj.si, Ziga.Emersic@fri.uni-lj.si, Bojan.Klemenc@fri.uni-lj.si, Matej.Vitek@fri.uni-lj.si
 # VirtualBox
+include_tasks: virtualbox.yml
diff --git a/roles/linroom/tasks/OUI-63214.yml b/roles/linroom/tasks/OUI-63214.yml
index 48d8293..10db320 100644
--- a/roles/linroom/tasks/OUI-63214.yml
+++ b/roles/linroom/tasks/OUI-63214.yml
@@ -1,3 +1,7 @@
 # Osnove umetne inteligence
 # Jure.Zabkar@fri.uni-lj.si, Ales.Papic@fri.uni-lj.si, matej.piculin@fri.uni-lj.si, Marko.Zeman@fri.uni-lj.si, bojan.zunkovic@fri.uni-lj.si
 # Orange, Weka 3, BayesFusion
+
+- include_tasks: orange.yml
+- include_tasks: weka.yml
+- include_tasks: bayesfusion.yml
diff --git a/roles/linroom/tasks/P2-63706.yml b/roles/linroom/tasks/P2-63706.yml
index 3974a4a..ba0b049 100644
--- a/roles/linroom/tasks/P2-63706.yml
+++ b/roles/linroom/tasks/P2-63706.yml
@@ -1,3 +1,7 @@
 # Programiranje 2
 # Tomaz.Dobravec@fri.uni-lj.si
 # Windows, Java JDK, IntelliJ IDEA, Apache NetBeans
+
+- include_tasks: JDK.yml
+- include_tasks: IDEA.yml
+- include_tasks: NetBeans.yml
diff --git a/roles/linroom/tasks/PA-63737.yml b/roles/linroom/tasks/PA-63737.yml
index 8c17447..27258be 100644
--- a/roles/linroom/tasks/PA-63737.yml
+++ b/roles/linroom/tasks/PA-63737.yml
@@ -1,3 +1,5 @@
 # Procesna avtomatika
 # Nejc.Ilc@fri.uni-lj.si
 # Windows, VMware Workstation 16.2.4 Player
+
+- include_tasks: vmware_player.yml
diff --git a/roles/linroom/tasks/PB-63707.yml b/roles/linroom/tasks/PB-63707.yml
index 847663e..1c7d97f 100644
--- a/roles/linroom/tasks/PB-63707.yml
+++ b/roles/linroom/tasks/PB-63707.yml
@@ -1,3 +1,11 @@
 # Podatkovne baze
 # Ales.Jaklic@fri.uni-lj.si, matej.piculin@fri.uni-lj.si, Luka.Sajn@fri.uni-lj.si
 # Windows, Power designer 12.5, Java JDK, Python 3, dotnet6 SDK, Jupyter Notebook, Eclipse, MySql Workbench, MySQL ODBC Connector, Notepad++
+- include_tasks: Eclipse.yml
+- include_tasks: dotnet6.yml
+- include_tasks: jupyter.yml
+- include_tasks: JDK.yml
+- include_tasks: powerdesigner.yml
+- include_tasks: mysql_workbench.yml
+- include_tasks: mysql_odbc.yml
+- include_tasks: notepadpp.yml
diff --git a/roles/linroom/tasks/PB2-63713.yml b/roles/linroom/tasks/PB2-63713.yml
index 955900e..4959d52 100644
--- a/roles/linroom/tasks/PB2-63713.yml
+++ b/roles/linroom/tasks/PB2-63713.yml
@@ -4,3 +4,4 @@
 # Podatkovne baze 2
 # Aljaz.Zrnec@fri.uni-lj.si
 # Power designer 12.5
+- include_tasks: powerdesigner.yml
diff --git a/roles/linroom/tasks/PJC-63769.yml b/roles/linroom/tasks/PJC-63769.yml
index 667f813..9b510ac 100644
--- a/roles/linroom/tasks/PJC-63769.yml
+++ b/roles/linroom/tasks/PJC-63769.yml
@@ -1,3 +1,5 @@
 # Programski jezik C
 # Tomaz.Dobravec@fri.uni-lj.si
 # Windows, Pelles C
+
+- include_tasks: pelles.yml
diff --git a/roles/linroom/tasks/PPJ-63220.yml b/roles/linroom/tasks/PPJ-63220.yml
index 283f2ce..c33b9ab 100644
--- a/roles/linroom/tasks/PPJ-63220.yml
+++ b/roles/linroom/tasks/PPJ-63220.yml
@@ -1,3 +1,11 @@
 # Principi programskih jezikov
 # Klemen.Klanjscek@fri.uni-lj.si
 # Windows, GNU/Linux, VS Code, Ocaml, Eclipse, Haskell, SWI-Prolog, rlwrap
+
+- include_tasks: VSCode.yml
+- include_tasks: ocaml.yml
+- include_tasks: Eclipse.yml
+- include_tasks: haskell.yml
+- include_tasks: swi-prolog.yml
+- include_tasks: rlwrap.yml
+
diff --git a/roles/linroom/tasks/PS-63261.yml b/roles/linroom/tasks/PS-63261.yml
index 30e2e4a..39ba5c8 100644
--- a/roles/linroom/tasks/PS-63261.yml
+++ b/roles/linroom/tasks/PS-63261.yml
@@ -1,3 +1,4 @@
 # Porazdeljeni sistemi
 # Davor.Sluga@fri.uni-lj.si
 # Windows, VS Code
+- include_tasks: VSCode.yml
diff --git a/roles/linroom/tasks/PSP-63287.yml b/roles/linroom/tasks/PSP-63287.yml
index 908e804..7a9c97c 100644
--- a/roles/linroom/tasks/PSP-63287.yml
+++ b/roles/linroom/tasks/PSP-63287.yml
@@ -1,3 +1,6 @@
 # Programiranje specifičnih platform
 # Veljko.Pejovic@fri.uni-lj.si
 # Android Studio, Arduino IDE
+
+- include_tasks: Android_Studio.yml
+- include_tasks: arduino.yml
diff --git a/roles/linroom/tasks/PUI-63768.yml b/roles/linroom/tasks/PUI-63768.yml
index 0ac394a..be36b17 100644
--- a/roles/linroom/tasks/PUI-63768.yml
+++ b/roles/linroom/tasks/PUI-63768.yml
@@ -1,3 +1,4 @@
 # Planiranje in upravljanje informatike
 # damjan.fujs@fri.uni-lj.si
 # Planiranje in upravljanje informatike (VS)
+- include_tasks: projectlibre.yml
diff --git a/roles/linroom/tasks/RA-63703.yml b/roles/linroom/tasks/RA-63703.yml
index 8b7767c..b0292f7 100644
--- a/roles/linroom/tasks/RA-63703.yml
+++ b/roles/linroom/tasks/RA-63703.yml
@@ -1,3 +1,6 @@
 # Računalniška arhitektura
 # Ziga.Pusnik@fri.uni-lj.si, Rok.Cesnovar@fri.uni-lj.si, Robert.Rozman@fri.uni-lj.si, Mira.Trebar@fri.uni-lj.si
 # Windows, RAVINOR, CubeIDE + QEMU Embedded plugin, WinIdea 9.21 + GCC + QEMU, WinIdea 9.12.256 (FRISMS kompatibilna), Visual2
+
+- include_tasks: stm32cube.yml
+- include_tasks: winidea.yml
diff --git a/roles/linroom/tasks/RGTI-63269.yml b/roles/linroom/tasks/RGTI-63269.yml
index 006a8e0..099919c 100644
--- a/roles/linroom/tasks/RGTI-63269.yml
+++ b/roles/linroom/tasks/RGTI-63269.yml
@@ -1,3 +1,4 @@
 # Računalniška grafika in tehnologija iger
 # Ziga.Lesar@fri.uni-lj.si
 # Windows, Unity
+- include_tasks: unity.yml
diff --git a/roles/linroom/tasks/RIS-63252.yml b/roles/linroom/tasks/RIS-63252.yml
index 954429d..698f7ce 100644
--- a/roles/linroom/tasks/RIS-63252.yml
+++ b/roles/linroom/tasks/RIS-63252.yml
@@ -1,3 +1,4 @@
 # Razvoj informacijskih sistemov
 # Aljaz.Zrnec@fri.uni-lj.si
 # Power designer 12.5
+- include_tasks: powerdesigner.yml
diff --git a/roles/linroom/tasks/RK-63209.yml b/roles/linroom/tasks/RK-63209.yml
index 4ca1d4b..87103e2 100644
--- a/roles/linroom/tasks/RK-63209.yml
+++ b/roles/linroom/tasks/RK-63209.yml
@@ -1,3 +1,9 @@
 # Računalniške komunikacije
 # Ales.Jaklic@fri.uni-lj.si, Matjaz.Pancur@fri.uni-lj.si, Jure.Tuta@fri.uni-lj.si, Domen.Kosir@fri.uni-lj.si
 # GNU/Linux, GNS3, Docker, VS Code, Wireshark, Java JDK, Python 3
+- include_tasks: docker.yml
+- include_tasks: GNS3.yml
+- include_tasks: VSCode.yml
+- include_tasks: Wireshark.yml
+- include_tasks: JDK.yml
+
diff --git a/roles/linroom/tasks/RK-63708.yml b/roles/linroom/tasks/RK-63708.yml
index 97d2bb6..f16e787 100644
--- a/roles/linroom/tasks/RK-63708.yml
+++ b/roles/linroom/tasks/RK-63708.yml
@@ -1,3 +1,9 @@
 # Računalniške komunikacije
 # Matjaz.Pancur@fri.uni-lj.si, Miha.Grohar@fri.uni-lj.si
 # GNU/Linux, GNS3, Docker, VS Code, Wireshark, Java JDK, Python 3
+- include_tasks: docker.yml
+- include_tasks: GNS3.yml
+- include_tasks: VSCode.yml
+- include_tasks: Wireshark.yml
+- include_tasks: JDK.yml
+
diff --git a/roles/linroom/tasks/RZP-63523.yml b/roles/linroom/tasks/RZP-63523.yml
index e187620..ecaf941 100644
--- a/roles/linroom/tasks/RZP-63523.yml
+++ b/roles/linroom/tasks/RZP-63523.yml
@@ -1,3 +1,7 @@
 # Računalniška zvočna produkcija
 # Aleks.Huc@fri.uni-lj.si
 # IntelliJ IDEA, Audacity, GIT
+- include_tasks: git.yml
+- include_tasks: audacity.yml
+- include_tasks: IDEA.yml
+
diff --git a/roles/linroom/tasks/SML_NJ.yml b/roles/linroom/tasks/SML_NJ.yml
index 1ff5b9b..9354511 100644
--- a/roles/linroom/tasks/SML_NJ.yml
+++ b/roles/linroom/tasks/SML_NJ.yml
@@ -1 +1,13 @@
-# TODO poglej, kako se namesti SML_NJ
+name: Install SML/NJ
+apt:
+  name: smlnj
+  state: latest
+name: Install SML/NJ
+apt:
+  name: smlnj
+  state: latest
+name: Install Emacs extension for SML
+apt:
+  name: elpa-sml-mode
+  state: latest
+
diff --git a/roles/linroom/tasks/ST-63727.yml b/roles/linroom/tasks/ST-63727.yml
index ab15afa..6d82580 100644
--- a/roles/linroom/tasks/ST-63727.yml
+++ b/roles/linroom/tasks/ST-63727.yml
@@ -1,3 +1,5 @@
 # Spletne tehnologije
 # David.Jelenc@fri.uni-lj.si
 # Windows, VS Code, XAMPP
+- include_tasks: VSCode.yml
+- include_tasks: XAMPP.yml
diff --git a/roles/linroom/tasks/SU-63519.yml b/roles/linroom/tasks/SU-63519.yml
index 194c9eb..ac213b2 100644
--- a/roles/linroom/tasks/SU-63519.yml
+++ b/roles/linroom/tasks/SU-63519.yml
@@ -1,3 +1,4 @@
 # Strojno učenje
 # matej.piculin@fri.uni-lj.si, Petar.Vracar@fri.uni-lj.si
 # Windows, R, RStudio
+- include_tasks: RStudio.yml
diff --git a/roles/linroom/tasks/SceneBuilder.yml b/roles/linroom/tasks/SceneBuilder.yml
new file mode 100644
index 0000000..861edcd
--- /dev/null
+++ b/roles/linroom/tasks/SceneBuilder.yml
@@ -0,0 +1 @@
+# TODO install SceneBuilder 
diff --git a/roles/linroom/tasks/TIS-63216.yml b/roles/linroom/tasks/TIS-63216.yml
index 95337c0..773a7e4 100644
--- a/roles/linroom/tasks/TIS-63216.yml
+++ b/roles/linroom/tasks/TIS-63216.yml
@@ -1,3 +1,4 @@
 # Teorija informacij in sistemov
 # Davor.Sluga@fri.uni-lj.si
 # Windows, VS Code, Python 3
+- include_tasks: VSCode.yml
diff --git a/roles/linroom/tasks/TUP-63226.yml b/roles/linroom/tasks/TUP-63226.yml
index 183837c..4042e84 100644
--- a/roles/linroom/tasks/TUP-63226.yml
+++ b/roles/linroom/tasks/TUP-63226.yml
@@ -1,3 +1,12 @@
 # Tehnologija upravljanja podatkov
 # Luka.Sajn@fri.uni-lj.si
 # Windows, Power designer 12.5, Java JDK, Python 3, dotnet6 SDK, Jupyter Notebook, Eclipse, MySql Workbench, MySQL ODBC Connector, Notepad++
+- include_tasks: Eclipse.yml
+- include_tasks: dotnet6.yml
+- include_tasks: jupyter.yml
+- include_tasks: JDK.yml
+- include_tasks: powerdesigner.yml
+- include_tasks: mysql_workbench.yml
+- include_tasks: mysql_odbc.yml
+- include_tasks: notepadpp.yml
+
diff --git a/roles/linroom/tasks/UI-63720.yml b/roles/linroom/tasks/UI-63720.yml
index 1f57ecd..ccf27fc 100644
--- a/roles/linroom/tasks/UI-63720.yml
+++ b/roles/linroom/tasks/UI-63720.yml
@@ -1,3 +1,4 @@
 # Umetna inteligenca
 # Petar.Vracar@fri.uni-lj.si
 # Windows, R, RStudio
+- include_tasks: RStudio.yml
diff --git a/roles/linroom/tasks/UV-63721.yml b/roles/linroom/tasks/UV-63721.yml
index bc33707..cf15c53 100644
--- a/roles/linroom/tasks/UV-63721.yml
+++ b/roles/linroom/tasks/UV-63721.yml
@@ -1,3 +1,7 @@
 # Uporabniški vmesniki
 # Ales.Smrdel@fri.uni-lj.si
 # Windows, GNU/Linux, Java JDK, IntelliJ IDEA, javafx, SceneBuilder, X11 development, Wayland development, gtk+ development, glade, python
+- include_tasks: JDK.yml
+- include_tasks: IDEA.yml
+- include_tasks: javafx.yml
+- include_tasks: GUI_development.yml
diff --git a/roles/linroom/tasks/VN-63728.yml b/roles/linroom/tasks/VN-63728.yml
index be1b73f..e486355 100644
--- a/roles/linroom/tasks/VN-63728.yml
+++ b/roles/linroom/tasks/VN-63728.yml
@@ -1,3 +1,7 @@
 # Vhodno-izhodne naprave
 # Robert.Rozman@fri.uni-lj.si
 # Windows, Logisim Evolution, RAVINOR, WinIdea 9.12.256 (FRISMS kompatibilna), LTSpice
+
+- include_tasks: logisim.yml
+- include_tasks: winidea.yml
+- include_tasks: ltspice.yml
diff --git a/roles/linroom/tasks/VPSA-63735.yml b/roles/linroom/tasks/VPSA-63735.yml
index 6f6acbf..1b3557a 100644
--- a/roles/linroom/tasks/VPSA-63735.yml
+++ b/roles/linroom/tasks/VPSA-63735.yml
@@ -1,3 +1,5 @@
 # Vzporedni in porazdeljeni sistemi in algoritmi
 # Davor.Sluga@fri.uni-lj.si, Rok.Cesnovar@fri.uni-lj.si
 # Windows, VS Code, Build Tools for Visual Studio 2022
+- include_tasks: VSCode.yml
+- include_tasks: visual_studio.yml
diff --git a/roles/linroom/tasks/VSCode.yml b/roles/linroom/tasks/VSCode.yml
index 6cbcece..885a65e 100644
--- a/roles/linroom/tasks/VSCode.yml
+++ b/roles/linroom/tasks/VSCode.yml
@@ -1 +1,15 @@
-# TODO namesti VSCode
+- name: Add VS repository
+  block:
+    - name: VS repo - apt key
+      ansible.builtin.get_url:
+        url: https://packages.microsoft.com/keys/microsoft.asc
+        dest: /etc/apt/trusted.gpg.d/microsoft_key.asc
+    - name: VS repo - url
+      ansible.builtin.apt_repository:
+      repo: "deb https://packages.microsoft.com/repos/vscode stable main"
+      state: present
+- name: Install VSCode
+  ansible.builtin.apt:
+    name: code
+    state: latest
+# TODO: dodaj potrebne plugine
diff --git a/roles/linroom/tasks/VZR-63543.yml b/roles/linroom/tasks/VZR-63543.yml
index 17c649f..0744b22 100644
--- a/roles/linroom/tasks/VZR-63543.yml
+++ b/roles/linroom/tasks/VZR-63543.yml
@@ -1,3 +1,4 @@
 # Visoko zmogljivo računanje
 # Davor.Sluga@fri.uni-lj.si
 # Windows, VS Code
+- include_tasks: VSCode.yml
diff --git a/roles/linroom/tasks/XAMPP.yml b/roles/linroom/tasks/XAMPP.yml
new file mode 100644
index 0000000..e17e8c0
--- /dev/null
+++ b/roles/linroom/tasks/XAMPP.yml
@@ -0,0 +1 @@
+# TODO install XAMPP
diff --git a/roles/linroom/tasks/adobe_cs.yml b/roles/linroom/tasks/adobe_cs.yml
new file mode 100644
index 0000000..a033864
--- /dev/null
+++ b/roles/linroom/tasks/adobe_cs.yml
@@ -0,0 +1 @@
+# TODO ugotovi, kaj narediti z Adobe CS
diff --git a/roles/linroom/tasks/arduino.yml b/roles/linroom/tasks/arduino.yml
new file mode 100644
index 0000000..d2b7952
--- /dev/null
+++ b/roles/linroom/tasks/arduino.yml
@@ -0,0 +1 @@
+# TODO install Arduino IDE
diff --git a/roles/linroom/tasks/bayesfusion.yml b/roles/linroom/tasks/bayesfusion.yml
new file mode 100644
index 0000000..e6a0129
--- /dev/null
+++ b/roles/linroom/tasks/bayesfusion.yml
@@ -0,0 +1 @@
+# TODO install BayesFusion.yml
diff --git a/roles/linroom/tasks/blender.yml b/roles/linroom/tasks/blender.yml
index bc07b42..0b98742 100644
--- a/roles/linroom/tasks/blender.yml
+++ b/roles/linroom/tasks/blender.yml
@@ -1,4 +1,3 @@
-# TODO poglej, kateri točno paket bi
 name: Install blender
 apt:
   name: blender
diff --git a/roles/linroom/tasks/docker.yml b/roles/linroom/tasks/docker.yml
index ba38a27..650ccd0 100644
--- a/roles/linroom/tasks/docker.yml
+++ b/roles/linroom/tasks/docker.yml
@@ -1 +1,23 @@
-# TODO izmisli si, kaj bomo z dockerjem
+
+name: "Install Podman"
+apt:
+  name: podman
+  state: latest
+
+name: "Install containerd"
+apt:
+  name: containerd
+  state: latest
+
+name: "Install docker"
+apt:
+  name: docker
+  state: latest
+
+name: "Install docker-compose"
+apt:
+  name: docker-compose
+  state: latest
+
+
+# TODO uredi skupine, da bodo studentje lahko docker tudi uporabljali
diff --git a/roles/linroom/tasks/dotnet6.yml b/roles/linroom/tasks/dotnet6.yml
index 8e6b307..aac0510 100644
--- a/roles/linroom/tasks/dotnet6.yml
+++ b/roles/linroom/tasks/dotnet6.yml
@@ -1 +1,5 @@
 # TODO namesti dotnet6
+name: "Install Dotnet 6.0"
+apt:
+  name: dotnet6
+  state: latest
diff --git a/roles/linroom/tasks/emacs.yml b/roles/linroom/tasks/emacs.yml
index c307948..3947e3c 100644
--- a/roles/linroom/tasks/emacs.yml
+++ b/roles/linroom/tasks/emacs.yml
@@ -1,5 +1,12 @@
-# TODO poglej, kateri točno paket bi
 name: Install emacs
 apt:
   name: emacs
   state: latest
+name: Install emacs-nox
+apt:
+  name: emacs-nox
+  state: latest
+name: Install emacs-gtk
+apt:
+  name: emacs-gtk
+  state: latest
diff --git a/roles/linroom/tasks/gcc-arm.yml b/roles/linroom/tasks/gcc-arm.yml
new file mode 100644
index 0000000..fe8c316
--- /dev/null
+++ b/roles/linroom/tasks/gcc-arm.yml
@@ -0,0 +1,4 @@
+- name: install GCC for ARM
+  apt:
+    name: gcc-12-arm-linux-gnueabi
+    state: latest
diff --git a/roles/linroom/tasks/gimp.yml b/roles/linroom/tasks/gimp.yml
index 445868a..315836a 100644
--- a/roles/linroom/tasks/gimp.yml
+++ b/roles/linroom/tasks/gimp.yml
@@ -1,4 +1,3 @@
-# TODO poglej, kateri točno paket bi
 name: Install GIMP
 apt:
   name: gimp
diff --git a/roles/linroom/tasks/haskell.yml b/roles/linroom/tasks/haskell.yml
new file mode 100644
index 0000000..610d80d
--- /dev/null
+++ b/roles/linroom/tasks/haskell.yml
@@ -0,0 +1 @@
+# TODO install Haskell
diff --git a/roles/linroom/tasks/inkscape.yml b/roles/linroom/tasks/inkscape.yml
index 807b9fe..522600a 100644
--- a/roles/linroom/tasks/inkscape.yml
+++ b/roles/linroom/tasks/inkscape.yml
@@ -1,4 +1,3 @@
-# TODO poglej, kateri točno paket bi
 name: Install Inkscape
 apt:
   name: inkscape
diff --git a/roles/linroom/tasks/javafx.yml b/roles/linroom/tasks/javafx.yml
new file mode 100644
index 0000000..8b811c3
--- /dev/null
+++ b/roles/linroom/tasks/javafx.yml
@@ -0,0 +1 @@
+# TODO install JavaFX
diff --git a/roles/linroom/tasks/julia.yml b/roles/linroom/tasks/julia.yml
new file mode 100644
index 0000000..3c7b9ec
--- /dev/null
+++ b/roles/linroom/tasks/julia.yml
@@ -0,0 +1,12 @@
+- name: Install Julia from tarball
+  block:
+  - name: Create destination for Julia
+    file:
+      path: /opt/Julia
+      state: directory
+  - name: Download and unpack Eclipse
+    unarchive:
+      src: https://julialang-s3.julialang.org/bin/linux/x64/1.6/julia-1.6.7-linux-x86_64.tar.gz
+      dest: /opt/Julia
+      remote_src: yes
+
diff --git a/roles/linroom/tasks/jupyter.yml b/roles/linroom/tasks/jupyter.yml
new file mode 100644
index 0000000..552e731
--- /dev/null
+++ b/roles/linroom/tasks/jupyter.yml
@@ -0,0 +1,16 @@
+name: Install Jupyter
+apt:
+  name: jupyter
+  state: latest
+name: Install Jupyter Console
+apt:
+  name: jupyter-console
+  state: latest
+name: Install Jupyter QT Console
+apt:
+  name: jupyter-qtconsole
+  state: latest
+name: Install Jupyter Notebook
+apt:
+  name: jupyter-notebook
+  state: latest
diff --git a/roles/linroom/tasks/logisim.yml b/roles/linroom/tasks/logisim.yml
new file mode 100644
index 0000000..124a3ee
--- /dev/null
+++ b/roles/linroom/tasks/logisim.yml
@@ -0,0 +1 @@
+# TODO install logisim for linux
diff --git a/roles/linroom/tasks/ltspice.yml b/roles/linroom/tasks/ltspice.yml
new file mode 100644
index 0000000..dec3a3f
--- /dev/null
+++ b/roles/linroom/tasks/ltspice.yml
@@ -0,0 +1 @@
+# TODO install LTSPice
diff --git a/roles/linroom/tasks/mysql_odbc.yml b/roles/linroom/tasks/mysql_odbc.yml
new file mode 100644
index 0000000..b9c0b29
--- /dev/null
+++ b/roles/linroom/tasks/mysql_odbc.yml
@@ -0,0 +1 @@
+# TODO install MySQL ODBC adapter
diff --git a/roles/linroom/tasks/mysql_workbench.yml b/roles/linroom/tasks/mysql_workbench.yml
new file mode 100644
index 0000000..41267ff
--- /dev/null
+++ b/roles/linroom/tasks/mysql_workbench.yml
@@ -0,0 +1 @@
+# TODO install MySQL Workbench
diff --git a/roles/linroom/tasks/notepadpp.yml b/roles/linroom/tasks/notepadpp.yml
new file mode 100644
index 0000000..583351f
--- /dev/null
+++ b/roles/linroom/tasks/notepadpp.yml
@@ -0,0 +1 @@
+# TODO install Notepad++
diff --git a/roles/linroom/tasks/ocaml.yml b/roles/linroom/tasks/ocaml.yml
new file mode 100644
index 0000000..ebfedef
--- /dev/null
+++ b/roles/linroom/tasks/ocaml.yml
@@ -0,0 +1 @@
+# TODO install Ocaml
diff --git a/roles/linroom/tasks/omnetpp.yml b/roles/linroom/tasks/omnetpp.yml
new file mode 100644
index 0000000..45892b0
--- /dev/null
+++ b/roles/linroom/tasks/omnetpp.yml
@@ -0,0 +1,22 @@
+name: Install OMNet++
+  block:
+  - name: Create destination for Omnet++  
+    file:
+      path: /opt/omnetpp
+  - name: Download and unpack Omnet++
+    unarchive:
+      src: https://github.com/omnetpp/omnetpp/releases/download/omnetpp-6.0.1/omnetpp-6.0.1-linux-x86_64.tgz
+      dest: /opt/omnetpp
+      remote_src: yes
+
+# TODO install inet system-wide
+name: Install INET Framework
+block:
+  - name: Create destination for INET Framework
+    file:
+      path: /opt/omnetpp-inet
+  - name: Download and unpack INET Framework
+    unarchive:
+      src: https://github.com/inet-framework/inet/releases/download/v4.4.1/inet-4.4.1-src.tgz
+      dest: /opt/omnetpp-inet
+      remote_src: yes
diff --git a/roles/linroom/tasks/openssl.yml b/roles/linroom/tasks/openssl.yml
new file mode 100644
index 0000000..a9a6bde
--- /dev/null
+++ b/roles/linroom/tasks/openssl.yml
@@ -0,0 +1,4 @@
+name: Install OpenSSL
+apt:
+  name: openssl
+  state: latest
diff --git a/roles/linroom/tasks/orange.yml b/roles/linroom/tasks/orange.yml
new file mode 100644
index 0000000..df27b52
--- /dev/null
+++ b/roles/linroom/tasks/orange.yml
@@ -0,0 +1 @@
+# TODO install orange
diff --git a/roles/linroom/tasks/pelles.yml b/roles/linroom/tasks/pelles.yml
new file mode 100644
index 0000000..3cb827b
--- /dev/null
+++ b/roles/linroom/tasks/pelles.yml
@@ -0,0 +1 @@
+# TODO install Pelles
diff --git a/roles/linroom/tasks/powerdesigner.yml b/roles/linroom/tasks/powerdesigner.yml
new file mode 100644
index 0000000..906ad02
--- /dev/null
+++ b/roles/linroom/tasks/powerdesigner.yml
@@ -0,0 +1 @@
+# TODO install PowerDesigner
diff --git a/roles/linroom/tasks/processing.yml b/roles/linroom/tasks/processing.yml
new file mode 100644
index 0000000..7ef2847
--- /dev/null
+++ b/roles/linroom/tasks/processing.yml
@@ -0,0 +1,12 @@
+- name: Install Processing
+  block:
+  - name: Create destination for Processing
+    file:
+      path: /opt/processing
+      state: directory
+  - name: Download and unpack processing
+    unarchive:
+      src: https://github.com/processing/processing4/releases/download/processing-1286-4.0.1/processing-4.0.1-linux-x64.tgz 
+      dest: /opt/processing
+      remote_src: yes
+
diff --git a/roles/linroom/tasks/projectlibre.yml b/roles/linroom/tasks/projectlibre.yml
new file mode 100644
index 0000000..ef2ab5c
--- /dev/null
+++ b/roles/linroom/tasks/projectlibre.yml
@@ -0,0 +1,2 @@
+# TODO install Project Libre
+# https://www.projectlibre.com/product/1-alternative-microsoft-project-open-source
diff --git a/roles/linroom/tasks/qcadesigner-e.yml b/roles/linroom/tasks/qcadesigner-e.yml
new file mode 100644
index 0000000..fa8a736
--- /dev/null
+++ b/roles/linroom/tasks/qcadesigner-e.yml
@@ -0,0 +1,19 @@
+- name: Create QCADesigner-e destination
+  file:
+    path: /opt/QCADEsigner-E
+    state: directory
+- name: Clone QCADesigner-E repo
+  #  
+  ansible.builtin.git:
+    repo: https://github.com/FSillT/QCADesigner-E
+    dest: /opt/QCADEsigner-E
+- name: Build QCADesigner-E
+  shell:
+    cmd: cd /opt/QCADEsigner-E/QCADEsigner-E && ./autogen.sh && make
+- name: Create QCADesigner-e symlink
+  file:
+    src: /opt/QCADEsigner-E/QCADesignerE/src/QCADesigner
+    dest: /usr/local/bin/QCADesigner
+    state: link
+# TODO create .desktop file
+
diff --git a/roles/linroom/tasks/racket.yml b/roles/linroom/tasks/racket.yml
index cb29100..adf9db1 100644
--- a/roles/linroom/tasks/racket.yml
+++ b/roles/linroom/tasks/racket.yml
@@ -1 +1,6 @@
 # TODO poglej, kako se namesti racket
+name: Install racket
+apt:
+  name: racket
+  state: latest
+
diff --git a/roles/linroom/tasks/rlwrap.yml b/roles/linroom/tasks/rlwrap.yml
new file mode 100644
index 0000000..35a6431
--- /dev/null
+++ b/roles/linroom/tasks/rlwrap.yml
@@ -0,0 +1 @@
+# TODO install rlwrap
diff --git a/roles/linroom/tasks/sagemath.yml b/roles/linroom/tasks/sagemath.yml
new file mode 100644
index 0000000..1716b5b
--- /dev/null
+++ b/roles/linroom/tasks/sagemath.yml
@@ -0,0 +1,8 @@
+name: Install SageMath
+apt:
+  name: sagemath
+  state: latest
+name: Install SageMath - Jupyter
+apt:
+  name: sagemath-jupyter
+  state: latest
diff --git a/roles/linroom/tasks/stm32cube.yml b/roles/linroom/tasks/stm32cube.yml
new file mode 100644
index 0000000..05a9768
--- /dev/null
+++ b/roles/linroom/tasks/stm32cube.yml
@@ -0,0 +1,3 @@
+# TODO download stm32; deb install
+# https://www.st.com/en/development-tools/stm32cubeide.html#get-software
+
diff --git a/roles/linroom/tasks/swi-prolog.yml b/roles/linroom/tasks/swi-prolog.yml
new file mode 100644
index 0000000..e31571a
--- /dev/null
+++ b/roles/linroom/tasks/swi-prolog.yml
@@ -0,0 +1 @@
+# TODO install SWI-Prolog
diff --git a/roles/linroom/tasks/unity.yml b/roles/linroom/tasks/unity.yml
new file mode 100644
index 0000000..24988f7
--- /dev/null
+++ b/roles/linroom/tasks/unity.yml
@@ -0,0 +1 @@
+# TODO install Unity
diff --git a/roles/linroom/tasks/virtualbox.yml b/roles/linroom/tasks/virtualbox.yml
index bf1ee48..4ee58e4 100644
--- a/roles/linroom/tasks/virtualbox.yml
+++ b/roles/linroom/tasks/virtualbox.yml
@@ -2,3 +2,11 @@
   apt:
     name: virtualbox
     state: latest
+- name: "Install VirtualBox GUI"
+  apt:
+    name: virtualbox-qt
+    state: latest
+- name: "Install VirtualBox kernel module"
+  apt:
+    name: virtualbox-dkms
+    state: latest
diff --git a/roles/linroom/tasks/visual_studio.yml b/roles/linroom/tasks/visual_studio.yml
new file mode 100644
index 0000000..b62bc89
--- /dev/null
+++ b/roles/linroom/tasks/visual_studio.yml
@@ -0,0 +1,2 @@
+# TODO kako namestiti Visual Studio + build tools
+#
diff --git a/roles/linroom/tasks/weka3.yml b/roles/linroom/tasks/weka3.yml
new file mode 100644
index 0000000..1a90f90
--- /dev/null
+++ b/roles/linroom/tasks/weka3.yml
@@ -0,0 +1 @@
+# TODO install Weka 3
diff --git a/roles/linroom/tasks/wfdb.yml b/roles/linroom/tasks/wfdb.yml
index 9df3aca..c115129 100644
--- a/roles/linroom/tasks/wfdb.yml
+++ b/roles/linroom/tasks/wfdb.yml
@@ -1 +1,28 @@
 # TODO spiši skripto za install
+# Dobi se jo na: https://www.physionet.org/content/wfdb/10.7.0/ 1. razpakiraj arhiv 2. pojdi v direktorij. 3. poženi .-configure lahko z dodatnimi parametri glede na željeno lokacijo knjižnice 4. poženi make 5. poženi sudo make install 
+name: Install libFLAC    
+  apt:
+    name: libflac-dev
+    state: latest
+name: Install libcurl
+  apt:
+    name: libcurl-dev
+name: Install GCC
+  apt:
+    name: gcc
+name: Install make
+  apt:
+    name: make
+name: Create WFDB destination
+  file:
+    path: /opt/wfdb
+    state: directory
+name: Download WFDB
+  unarchive:
+    src: https://www.physionet.org/physiotools/archives/wfdb-10.7/wfdb-10.7.0.tar.gz
+    dest: /opt/wfdb
+    remote_src: yes
+name: Build and install WFDB
+  shell:
+    cmd: cd /opt/wfdb && ./configure && make && make install
+
diff --git a/roles/linroom/tasks/winidea.yml b/roles/linroom/tasks/winidea.yml
new file mode 100644
index 0000000..b5d0827
--- /dev/null
+++ b/roles/linroom/tasks/winidea.yml
@@ -0,0 +1 @@
+# TODO install WinIDEA