diff --git a/admin/survey/modules/mod_NIJZ/R/Nijz_report.R b/admin/survey/modules/mod_NIJZ/R/Nijz_report.R
index 7bf00d25b..eb4481655 100644
--- a/admin/survey/modules/mod_NIJZ/R/Nijz_report.R
+++ b/admin/survey/modules/mod_NIJZ/R/Nijz_report.R
@@ -21,13 +21,16 @@ Sys.setlocale(category = "LC_ALL", locale = "slovenian")
 params <- commandArgs(trailingOnly=TRUE)
 ID <- params[1]
 #ID <- "26155472"
+# Update za barvanje html in extract
+library(rvest)
 #------------- PASSING ARGUMENTS FROM CMD LINE ----------------#
 
 
 #-------------------------- USER DEFINED FUNCTION ---------------------#
 # Za potrebe pravilnega prikaza teksta v posameznih poglavjih
-lxTranslate <- function(x, color = "NE", pisava = TRUE, pikaklicaj = FALSE) {
+lxTranslate <- function(x, color = "NE", pisava = TRUE) {
   x <- gsub("<strong>", "\\\\\\\\textbf{", x)
+  x <- gsub("<strong >", "\\\\\\\\textbf{", x)
   x <- gsub("</strong>", "}", x)
   x <-
     gsub("<br /> <br />", "\\\\\\\\newline \\\\\\\\newline", x)
@@ -38,24 +41,28 @@ lxTranslate <- function(x, color = "NE", pisava = TRUE, pikaklicaj = FALSE) {
   
   x <- gsub("%", "\\\\\\\\%", x)
   
-  #x <- gsub("…", "\\\\\\\\dots", x)
-  #x <- gsub("…", "", x)
+
+
 
   # ALI BNARVAMO?
   if (color == "DA") {
   # Update, Potem pa želi NIJZ, da se prvi odstavek
   # vedno obarva z "zeleno barvo, zaot moramo to
   # utrezno ločiti
-    if (pikaklicaj == FALSE) {
-  obarvajX <- stringr::str_extract(x, "[^.|!]+")
-    } else {
-  obarvajX <- stringr::str_extract(x, "[^!]+")
-      
-    }
+
+    # Najdi text z obravnajem zeleno
+    obarvajX <-  read_html(x) %>%
+      html_nodes("span") %>%
+      html_text()
+    
   # DOdamo barvanje
-  obarvajX_1 <- paste0("{\\\\color{zelena}", obarvajX, "}")
+  obarvajX_1 <- paste0("{\\\\color{zelena}",obarvajX , "}")
   # Nadomestimo
-  x <- gsub(obarvajX, obarvajX_1, x, fixed=TRUE)    
+  # zamenja
+  
+  x <-  strsplit(x, "</span>", fixed =T)
+  x <-  paste0(obarvajX_1, x[[1]][2])
+
   }
   if (pisava == TRUE) {
   val <- strsplit(x, "\\\\newline ", fixed =T)[[1]]
@@ -410,7 +417,7 @@ oblacila <- lxTranslate(oblacila, color = "DA")
 #------------------------  Poletni urnik za izvajanje aktivnosti na prostem ------------------------#
 
 solarij <- data %>% filter(str_detect(V1, "SOLARIJ")) %>% select(V2)
-solarij <- lxTranslate(solarij, color = "DA", pikaklicaj = TRUE)
+solarij <- lxTranslate(solarij, color = "DA")
 
 #---